From patchwork Wed Dec 5 18:05:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Hockney X-Patchwork-Id: 203911 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 A5A4E2C009F for ; Thu, 6 Dec 2012 05:05:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550Ab2LESFX (ORCPT ); Wed, 5 Dec 2012 13:05:23 -0500 Received: from elasmtp-dupuy.atl.sa.earthlink.net ([209.86.89.62]:35534 "EHLO elasmtp-dupuy.atl.sa.earthlink.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193Ab2LESFW (ORCPT ); Wed, 5 Dec 2012 13:05:22 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=dk20050327; d=ix.netcom.com; b=dfUJ51P3yGnIA8cI4l2F0LZuopFVQKxTxW5HpQVNAS6fd5JuMahen3Hqu1TsuA6M; h=Message-ID:Date:From:Reply-To:To:Subject:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Mailer:X-ELNK-Trace:X-Originating-IP; Received: from [209.86.224.48] (helo=elwamui-rustique.atl.sa.earthlink.net) by elasmtp-dupuy.atl.sa.earthlink.net with esmtpa (Exim 4.67) (envelope-from ) id 1TgJLV-0003VF-TJ for netfilter-devel@vger.kernel.org; Wed, 05 Dec 2012 13:05:22 -0500 Received: from 24.49.174.127 by webmail.earthlink.net with HTTP; Wed, 5 Dec 2012 13:05:21 -0500 Message-ID: <5368964.1354730721679.JavaMail.root@elwamui-rustique.atl.sa.earthlink.net> Date: Wed, 5 Dec 2012 11:05:21 -0700 (GMT-07:00) From: Bob Hockney Reply-To: Bob Hockney To: netfilter-devel@vger.kernel.org Subject: [PATCH] nfnetlink_log mac address for 6in4 tunnels Mime-Version: 1.0 X-Mailer: EarthLink Zoo Mail 1.0 X-ELNK-Trace: c47df5abe2e808e474cfc7ce3b1ad11381c87f5e519606884b093995b286b5877327749f8b217d2a350badd9bab72f9c350badd9bab72f9c350badd9bab72f9c X-Originating-IP: 209.86.224.48 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org For tunnelled ipv6in4 packets, the LOG target (xt_LOG.c) adjusts the start of the mac field to start at the ethernet header instead of the ipv4 header for the tunnel. This patch conforms what is passed by the NFLOG target through nfnetlink to what the LOG target does. Code borrowed from xt_LOG.c. --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html === --- a/net/netfilter/nfnetlink_log.c 2012-11-28 17:11:02.285514325 -0700 +++ b/net/netfilter/nfnetlink_log.c 2012-11-28 17:10:38.551830948 -0700 @@ -382,6 +382,7 @@ struct nfgenmsg *nfmsg; sk_buff_data_t old_tail = inst->skb->tail; struct sock *sk; + const unsigned char *hwhdrp; nlh = nlmsg_put(inst->skb, 0, 0, NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET, @@ -483,9 +484,16 @@ if (indev && skb_mac_header_was_set(skb)) { if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) || nla_put_be16(inst->skb, NFULA_HWLEN, - htons(skb->dev->hard_header_len)) || - nla_put(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len, - skb_mac_header(skb))) + htons(skb->dev->hard_header_len))) + goto nla_put_failure; + + hwhdrp = skb_mac_header(skb); + + if (skb->dev->type == ARPHRD_SIT) + hwhdrp -= ETH_HLEN; + + if (!(hwhdrp < skb->head) && nla_put(inst->skb, NFULA_HWHEADER, + skb->dev->hard_header_len, hwhdrp)) goto nla_put_failure; }