openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NETFILTER]: Fix ip6t_LOG MAC format 

I broke this in the patch that consolidated MAC logging.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2005-07-22 12:52:47 -07:00 committed by David S. Miller
parent 74bb421da7
commit d3984a6b6a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/ipv6/netfilter/ip6t_LOG.c
View File

@ -373,9 +373,10 @@ ip6t_log_packet(unsigned int hooknum,
in ? in->name : "", in ? in->name : "",
out ? out->name : ""); out ? out->name : "");
if (in && !out) { if (in && !out) {
unsigned int len;
/* MAC logging for input chain only. */ /* MAC logging for input chain only. */
printk("MAC="); 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) { skb->mac.raw != skb->nh.raw) {
unsigned char *p = skb->mac.raw; unsigned char *p = skb->mac.raw;
int i; int i;
@ -384,9 +385,11 @@ ip6t_log_packet(unsigned int hooknum,
(p -= ETH_HLEN) < skb->head) (p -= ETH_HLEN) < skb->head)
p = NULL; p = NULL;
if (p != NULL) if (p != NULL) {
for (i = 0; i < skb->dev->hard_header_len; i++) for (i = 0; i < len; i++)
printk("%02x", p[i]); printk("%02x%s", p[i],
i == len - 1 ? "" : ":");
}
printk(" "); printk(" ");
if (skb->dev->type == ARPHRD_SIT) { if (skb->dev->type == ARPHRD_SIT) {