From 332585be143449caa5ba6ce3296fe84b97bbc845 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 2 Oct 2014 19:15:38 +0000 Subject: map: fix portsets starting with 0 and use regular NAT for 1:1 MAP Signed-off-by: Steven Barth git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42741 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/ipv6/map/src/mapcalc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'package/network/ipv6/map/src') diff --git a/package/network/ipv6/map/src/mapcalc.c b/package/network/ipv6/map/src/mapcalc.c index 03f8165be0..afce6d24d7 100644 --- 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"); } -- cgit v1.2.3