From patchwork Fri Dec 21 14:01:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 207818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8EFE82C0082 for ; Sat, 22 Dec 2012 01:02:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378Ab2LUOCx (ORCPT ); Fri, 21 Dec 2012 09:02:53 -0500 Received: from ks28632.kimsufi.com ([91.121.96.152]:46337 "EHLO ks28632.kimsufi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751363Ab2LUOCx (ORCPT ); Fri, 21 Dec 2012 09:02:53 -0500 Received: from ip-37-24-162-232.unitymediagroup.de ([37.24.162.232] helo=localhost.localdomain) by ks28632.kimsufi.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Tm3Bb-0000ou-W9; Fri, 21 Dec 2012 15:02:52 +0100 From: Eric Leblond To: netfilter-devel Cc: Bob Hockney , Eric Leblond Subject: [PATCH 1/3] Fix parsing of ipv6 flowlabel and tc fields Date: Fri, 21 Dec 2012 15:01:51 +0100 Message-Id: <1356098513-18684-2-git-send-email-eric@regit.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356098513-18684-1-git-send-email-eric@regit.org> References: <1356098513-18684-1-git-send-email-eric@regit.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Bob Hockney Mask should be applied after ntohl conversion. Signed-off-by: Eric Leblond --- filter/raw2packet/ulogd_raw2packet_BASE.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c index d0fcdfa..05141b8 100644 --- a/filter/raw2packet/ulogd_raw2packet_BASE.c +++ b/filter/raw2packet/ulogd_raw2packet_BASE.c @@ -784,9 +784,9 @@ static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len) okey_set_u128(&ret[KEY_IP_DADDR], &ipv6h->ip6_dst); okey_set_u16(&ret[KEY_IP6_PAYLOAD_LEN], ntohs(ipv6h->ip6_plen)); okey_set_u8(&ret[KEY_IP6_PRIORITY], - ntohl(ipv6h->ip6_flow & 0x0ff00000) >> 20); + (ntohl(ipv6h->ip6_flow) & 0x0ff00000) >> 20); okey_set_u32(&ret[KEY_IP6_FLOWLABEL], - ntohl(ipv6h->ip6_flow & 0x000fffff)); + ntohl(ipv6h->ip6_flow) & 0x000fffff); okey_set_u8(&ret[KEY_IP6_HOPLIMIT], ipv6h->ip6_hlim); curhdr = ipv6h->ip6_nxt;