From: Marc Boucher <marc@mbsi.ca>
Date: Fri, 7 Apr 2000 17:30:28 +0000 (+0000)
Subject: Fixed save() to properly interpret ports in host byte order and use ':'
X-Git-Tag: v1.1.0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f2009cbfda7a4e341258322a7c8b462605990af;p=thirdparty%2Fiptables.git

Fixed save() to properly interpret ports in host byte order and use ':'
as range separator.
---

diff --git a/extensions/libipt_tcp.c b/extensions/libipt_tcp.c
index 94285a09..2febc28c 100644
--- a/extensions/libipt_tcp.c
+++ b/extensions/libipt_tcp.c
@@ -377,12 +377,12 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 			printf("! ");
 		if (tcpinfo->spts[0]
 		    != tcpinfo->spts[1])
-			printf("--sport %u-%u ",
-			       ntohs(tcpinfo->spts[0]),
-			       ntohs(tcpinfo->spts[1]));
+			printf("--sport %u:%u ",
+			       tcpinfo->spts[0],
+			       tcpinfo->spts[1]);
 		else
 			printf("--sport %u ",
-			       ntohs(tcpinfo->spts[0]));
+			       tcpinfo->spts[0]);
 	}
 
 	if (tcpinfo->dpts[0] != 0
@@ -391,12 +391,12 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 			printf("! ");
 		if (tcpinfo->dpts[0]
 		    != tcpinfo->dpts[1])
-			printf("--dport %u-%u ",
-			       ntohs(tcpinfo->dpts[0]),
-			       ntohs(tcpinfo->dpts[1]));
+			printf("--dport %u:%u ",
+			       tcpinfo->dpts[0],
+			       tcpinfo->dpts[1]);
 		else
 			printf("--dport %u ",
-			       ntohs(tcpinfo->dpts[0]));
+			       tcpinfo->dpts[0]);
 	}
 
 	if (tcpinfo->option
diff --git a/extensions/libipt_udp.c b/extensions/libipt_udp.c
index e3593579..a569c64c 100644
--- a/extensions/libipt_udp.c
+++ b/extensions/libipt_udp.c
@@ -208,12 +208,12 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 			printf("! ");
 		if (udpinfo->spts[0]
 		    != udpinfo->spts[1])
-			printf("--sport %u-%u ",
-			       ntohs(udpinfo->spts[0]),
-			       ntohs(udpinfo->spts[1]));
+			printf("--sport %u:%u ",
+			       udpinfo->spts[0],
+			       (udpinfo->spts[1]);
 		else
 			printf("--sport %u ",
-			       ntohs(udpinfo->spts[0]));
+			       udpinfo->spts[0]);
 	}
 
 	if (udpinfo->dpts[0] != 0
@@ -222,12 +222,12 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 			printf("! ");
 		if (udpinfo->dpts[0]
 		    != udpinfo->dpts[1])
-			printf("--dport %u-%u ",
-			       ntohs(udpinfo->dpts[0]),
-			       ntohs(udpinfo->dpts[1]));
+			printf("--dport %u:%u ",
+			       udpinfo->dpts[0],
+			       udpinfo->dpts[1]);
 		else
 			printf("--dport %u ",
-			       ntohs(udpinfo->dpts[0]));
+			       udpinfo->dpts[0]);
 	}
 }