Explorar o código

netfilter: xt_LOG: do print MAC header on FORWARD

I am observing consistent behavior even with bridges, so let's unlock
this. xt_mac is already usable in FORWARD, too. Section 9 of
http://ebtables.sourceforge.net/br_fw_ia/br_fw_ia.html#section9 says
the MAC source address is changed, but my observation does not match
that claim -- the MAC header is retained.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
[Patrick; code inspection seems to confirm this]
Signed-off-by: Patrick McHardy <kaber@trash.net>
Jan Engelhardt %!s(int64=14) %!d(string=hai) anos
pai
achega
b468645d72
Modificáronse 2 ficheiros con 2 adicións e 4 borrados
  1. 1 2
      net/ipv4/netfilter/ipt_LOG.c
  2. 1 2
      net/ipv6/netfilter/ip6t_LOG.c

+ 1 - 2
net/ipv4/netfilter/ipt_LOG.c

@@ -442,8 +442,7 @@ ipt_log_packet(u_int8_t pf,
 	}
 	}
 #endif
 #endif
 
 
-	/* MAC logging for input path only. */
-	if (in && !out)
+	if (in != NULL)
 		dump_mac_header(m, loginfo, skb);
 		dump_mac_header(m, loginfo, skb);
 
 
 	dump_packet(m, loginfo, skb, 0);
 	dump_packet(m, loginfo, skb, 0);

+ 1 - 2
net/ipv6/netfilter/ip6t_LOG.c

@@ -452,8 +452,7 @@ ip6t_log_packet(u_int8_t pf,
 	       in ? in->name : "",
 	       in ? in->name : "",
 	       out ? out->name : "");
 	       out ? out->name : "");
 
 
-	/* MAC logging for input path only. */
-	if (in && !out)
+	if (in != NULL)
 		dump_mac_header(m, loginfo, skb);
 		dump_mac_header(m, loginfo, skb);
 
 
 	dump_packet(m, loginfo, skb, skb_network_offset(skb), 1);
 	dump_packet(m, loginfo, skb, skb_network_offset(skb), 1);