nfnetlink_log mac address for 6in4 tunnels
PATCH 1/1 nfnetlink_log mac address for 6in4 tunnels
For tunneled 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.
Here are before and after log lines. The kernel: lines are with the LOG target, the ulogd lines are with NFLOG, ulogd and its SYSLOG plugin:
Log lines for the same packet, before patch:
Dec 3 09:07:22 gateway kernel: [ 69.268396] INVALID IN=he-ipv6 OUT=eth1 MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29: 64:c2:42:dc:12:2a:18:31:ae:7f TUNNEL=66.220.18.42->w.x.y.z SRC= ... Dec 3 09:07:22 gateway ulogd[1628]: INVALID IN=he-ipv6 OUT=eth1
MAC=45:00:00:5c:00:00:40:00:fa:29:64:c2:42:dc:12:2a:18:31:ae:7f:68:00:00:00:
00:20:06:35:2a:03:28:80:00:10 SRC= ...
Log lines after patch:
Dec 3 09:08:44 gateway kernel: [ 32.998288] INVALID IN=he-ipv6 OUT=eth1 MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29: 64:c2:42:dc:12:2a:18:31:ae:7f TUNNEL=66.220.18.42->w.x.y.z SRC= ... Dec 3 09:08:45 gateway ulogd[1488]: INVALID IN=he-ipv6 OUT=eth1
MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29:
64:c2:42:dc:12:2a:18:31:ae:7f SRC= ...
===
--- 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;
}Quoted 18 lines · Bob Hockney
For tunneled 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 fromxt_LOG.c.Here are before and after log lines. The kernel: lines are with the LOG target, the ulogd lines are with NFLOG, ulogd and its SYSLOG plugin:
Log lines for the same packet, before patch:
Dec 3 09:07:22 gateway kernel: [ 69.268396] INVALID IN=he-ipv6 OUT=eth1 MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29: 64:c2:42:dc:12:2a:18:31:ae:7f TUNNEL=66.220.18.42->w.x.y.z SRC= ... Dec 3 09:07:22 gateway ulogd[1628]: INVALID IN=he-ipv6 OUT=eth1MAC=45:00:00:5c:00:00:40:00:fa:29:64:c2:42:dc:12:2a:18:31:ae:7f:68:00:00:00:
00:20:06:35:2a:03:28:80:00:10 SRC= ...
Quoted 8 lines
Log lines after patch:
Dec 3 09:08:44 gateway kernel: [ 32.998288] INVALID IN=he-ipv6 OUT=eth1 MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29: 64:c2:42:dc:12:2a:18:31:ae:7f TUNNEL=66.220.18.42->w.x.y.z SRC= ... Dec 3 09:08:45 gateway ulogd[1488]: INVALID IN=he-ipv6 OUT=eth1MAC=00:50:8d:bf:02:01:68:ef:bd:f0:7d:d9:08:00:45:00:00:5c:00:00:40:00:fa:29:
64:c2:42:dc:12:2a:18:31:ae:7f SRC= ...
Applied.
Please, next time you have to base your patch on some recent linux kernel tree. You can get it via git or just some snapshot via kernel.org, I'm telling this because I had to rebase this patch upon current.
Thanks Bob.
Quoted 4 lines
Applied.
Please, next time you have to base your patch on some recent linux kernel
tree.
Quoted 1 line
You can get it via git or just some snapshot via kernel.org, I'm telling
this
Quoted 1 line
because I had to rebase this patch upon current.
OK, I will. Thanks Pablo.