patch-1.3.81 linux/net/ipv4/ip_input.c

Next file: linux/net/ipv4/ip_masq.c
Previous file: linux/net/ipv4/ip_fw.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.80/linux/net/ipv4/ip_input.c linux/net/ipv4/ip_input.c
@@ -149,6 +149,9 @@
 #include <net/checksum.h>
 #include <linux/igmp.h>
 #include <linux/ip_fw.h>
+#ifdef CONFIG_IP_MASQUERADE
+#include <net/ip_masq.h>
+#endif
 #include <linux/firewall.h>
 #include <linux/mroute.h>
 #include <net/netlink.h>
@@ -423,7 +426,7 @@
 		/*
 		 * Do we need to de-masquerade this fragment?
 		 */
-		if (ip_fw_demasquerade(skb)) 
+		if (ip_fw_demasquerade(&skb,dev)) 
 		{
 			struct iphdr *iph=skb->h.iph;
 			if (ip_forward(skb, dev, is_frag|IPFWD_MASQUERADED, iph->daddr))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this