patch-2.3.99-pre6 linux/net/core/netfilter.c

Next file: linux/net/core/skbuff.c
Previous file: linux/net/core/neighbour.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/net/core/netfilter.c linux/net/core/netfilter.c
@@ -186,18 +186,10 @@
 			dst_port = ntohs(tcp->dest);
 		}
 	
-		printk("PROTO=%d %d.%d.%d.%d:%hu %d.%d.%d.%d:%hu"
+		printk("PROTO=%d %u.%u.%u.%u:%hu %u.%u.%u.%u:%hu"
 		       " L=%hu S=0x%2.2hX I=%hu F=0x%4.4hX T=%hu",
-		       ip->protocol,
-		       (ntohl(ip->saddr)>>24)&0xFF,
-		       (ntohl(ip->saddr)>>16)&0xFF,
-		       (ntohl(ip->saddr)>>8)&0xFF,
-		       (ntohl(ip->saddr))&0xFF,
-		       src_port,
-		       (ntohl(ip->daddr)>>24)&0xFF,
-		       (ntohl(ip->daddr)>>16)&0xFF,
-		       (ntohl(ip->daddr)>>8)&0xFF,
-		       (ntohl(ip->daddr))&0xFF,
+		       ip->protocol, NIPQUAD(ip->saddr),
+		       src_port, NIPQUAD(ip->daddr),
 		       dst_port,
 		       ntohs(ip->tot_len), ip->tos, ntohs(ip->id),
 		       ntohs(ip->frag_off), ip->ttl);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)