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 94285a09e436d05e56b702b30e605043d0f403c3..2febc28cc14551d331bdec5c7b6b39541c762072 100644 (file)
--- 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 e359357947ec1ca0c24937329d827de5741b4611..a569c64c7892a1401df57ae03cda7d2033b08c4b 100644 (file)
--- 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]);
        }
 }