[netfilter-cvslog] r4146 - trunk/iptables/extensions

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-22 08:39:45 +0200 (Fri, 22 Jul 2005)
New Revision: 4146

Modified:
   trunk/iptables/extensions/libipt_DNAT.c
   trunk/iptables/extensions/libipt_MASQUERADE.c
   trunk/iptables/extensions/libipt_REDIRECT.c
   trunk/iptables/extensions/libipt_SNAT.c
Log:
Fix NAT of ICMP ID ranges (Patrick McHardy)


Modified: trunk/iptables/extensions/libipt_DNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_DNAT.c	2005-07-22 06:14:55 UTC (rev 4145)
+++ trunk/iptables/extensions/libipt_DNAT.c	2005-07-22 06:39:45 UTC (rev 4146)
@@ -143,7 +143,8 @@
 	int portok;
 
 	if (entry->ip.proto == IPPROTO_TCP
-	    || entry->ip.proto == IPPROTO_UDP)
+	    || entry->ip.proto == IPPROTO_UDP
+	    || entry->ip.proto == IPPROTO_ICMP)
 		portok = 1;
 	else
 		portok = 0;

Modified: trunk/iptables/extensions/libipt_MASQUERADE.c
===================================================================
--- trunk/iptables/extensions/libipt_MASQUERADE.c	2005-07-22 06:14:55 UTC (rev 4145)
+++ trunk/iptables/extensions/libipt_MASQUERADE.c	2005-07-22 06:39:45 UTC (rev 4146)
@@ -81,7 +81,8 @@
 		= (struct ip_nat_multi_range *)(*target)->data;
 
 	if (entry->ip.proto == IPPROTO_TCP
-	    || entry->ip.proto == IPPROTO_UDP)
+	    || entry->ip.proto == IPPROTO_UDP
+	    || entry->ip.proto == IPPROTO_ICMP)
 		portok = 1;
 	else
 		portok = 0;

Modified: trunk/iptables/extensions/libipt_REDIRECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REDIRECT.c	2005-07-22 06:14:55 UTC (rev 4145)
+++ trunk/iptables/extensions/libipt_REDIRECT.c	2005-07-22 06:39:45 UTC (rev 4146)
@@ -81,7 +81,8 @@
 	int portok;
 
 	if (entry->ip.proto == IPPROTO_TCP
-	    || entry->ip.proto == IPPROTO_UDP)
+	    || entry->ip.proto == IPPROTO_UDP
+	    || entry->ip.proto == IPPROTO_ICMP)
 		portok = 1;
 	else
 		portok = 0;

Modified: trunk/iptables/extensions/libipt_SNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_SNAT.c	2005-07-22 06:14:55 UTC (rev 4145)
+++ trunk/iptables/extensions/libipt_SNAT.c	2005-07-22 06:39:45 UTC (rev 4146)
@@ -143,7 +143,8 @@
 	int portok;
 
 	if (entry->ip.proto == IPPROTO_TCP
-	    || entry->ip.proto == IPPROTO_UDP)
+	    || entry->ip.proto == IPPROTO_UDP
+	    || entry->ip.proto == IPPROTO_ICMP)
 		portok = 1;
 	else
 		portok = 0;