map: fix portsets starting with 0 and use regular NAT for 1:1 MAP

[openwrt/openwrt.git] / package / network / ipv6 / map / src / mapcalc.c

diff --git a/package/network/ipv6/map/src/mapcalc.c b/package/network/ipv6/map/src/mapcalc.c
index 03f8165be0bbe743a8fb39797f956b41be63e929..afce6d24d7007059fea8735d81a755fdc2457c82 100644 (file)
--- a/package/network/ipv6/map/src/mapcalc.c
+++ b/package/network/ipv6/map/src/mapcalc.c
@@ -343,14 +343,17 @@ int main(int argc, char *argv[])
                }
 
 
-               if (psidlen == 0) {
-                       printf("RULE_%d_PORTSETS=0-65535\n", rulecnt);
-               } else if (psid >= 0) {
+               if (psidlen > 0 && psid >= 0) {
                        printf("RULE_%d_PORTSETS='", rulecnt);
                        for (int k = (offset) ? 1 : 0; k < (1 << offset); ++k) {
                                int start = (k << (16 - offset)) | (psid >> offset);
                                int end = start + (1 << (16 - offset - psidlen)) - 1;
-                               printf("%d-%d ", start, end);
+
+                               if (start == 0)
+                                       start = 1;
+
+                               if (start <= end)
+                                       printf("%d-%d ", start, end);
                        }
                        printf("'\n");
                }