Skip to contentSkip to conversation

: Fix ip6t_LOG MAC format

PATCH Applied Patrick McHardy 2 participants 2 messages Jul 22, 2005

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Patrick McHardy

author
#0 lore raw

PATCH 5/5 : Fix ip6t_LOG MAC format

[NETFILTER]: Fix ip6t_LOG MAC format

I broke this in the patch that consolidated MAC logging.

Signed-off-by Patrick McHardy <[email protected]>

---
commit 3aa13776ac25163f546d52cc990d194bbbb9120c
tree d80cf2bd3faedff88fbd7e68f6638020cef38972
parent d778c0e9a5c2aa805b7c297b5712efb9c1ada2c6
author Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:24:42 +0200 committer Patrick McHardy <[email protected]> Fri, 22 Jul 2005 09:24:42 +0200

 net/ipv6/netfilter/ip6t_LOG.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
net/ipv6/netfilter/ip6t_LOG.c +7 -4
@@ -373,9 +373,10 @@ ip6t_log_packet(unsigned int hooknum,
 		in ? in->name : "",
 		out ? out->name : "");
 	if (in && !out) {
+		unsigned int len;
 		/* MAC logging for input chain only. */
 		printk("MAC=");
-		if (skb->dev && skb->dev->hard_header_len &&
+		if (skb->dev && (len = skb->dev->hard_header_len) &&
 		    skb->mac.raw != skb->nh.raw) {
 			unsigned char *p = skb->mac.raw;
 			int i;

@@ -384,9 +385,11 @@ ip6t_log_packet(unsigned int hooknum,
 			    (p -= ETH_HLEN) < skb->head)
 				p = NULL;
 
-			if (p != NULL)
-				for (i = 0; i < skb->dev->hard_header_len; i++)
-					printk("%02x", p[i]);
+			if (p != NULL) {
+				for (i = 0; i < len; i++)
+					printk("%02x%s", p[i],
+					       i == len - 1 ? "" : ":");
+			}
 			printk(" ");
 
 			if (skb->dev->type == ARPHRD_SIT) {