Author: cyrus Date: 2014-10-02 21:16:17 +0200 (Thu, 02 Oct 2014) New Revision: 42742
Modified: branches/barrier_breaker/package/network/ipv6/map/Makefile branches/barrier_breaker/package/network/ipv6/map/files/map.sh branches/barrier_breaker/package/network/ipv6/map/src/mapcalc.c Log: map: fix portsets starting with 0 and use regular NAT for 1:1 MAP Signed-off-by: Steven Barth <[email protected]> Modified: branches/barrier_breaker/package/network/ipv6/map/Makefile =================================================================== --- branches/barrier_breaker/package/network/ipv6/map/Makefile 2014-10-02 19:15:38 UTC (rev 42741) +++ branches/barrier_breaker/package/network/ipv6/map/Makefile 2014-10-02 19:16:17 UTC (rev 42742) @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map -PKG_VERSION:=1 -PKG_RELEASE:=2 +PKG_VERSION:=2 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk Modified: branches/barrier_breaker/package/network/ipv6/map/files/map.sh =================================================================== --- branches/barrier_breaker/package/network/ipv6/map/files/map.sh 2014-10-02 19:15:38 UTC (rev 42741) +++ branches/barrier_breaker/package/network/ipv6/map/files/map.sh 2014-10-02 19:16:17 UTC (rev 42742) @@ -122,19 +122,28 @@ [ "$zone" != "-" ] && json_add_string zone "$zone" json_add_array firewall - for portset in $(eval "echo \$RULE_${k}_PORTSETS"); do - for proto in icmp tcp udp; do - json_add_object "" - json_add_string type nat - json_add_string target SNAT - json_add_string family inet - json_add_string proto "$proto" - json_add_boolean connlimit_ports 1 - json_add_string snat_ip $(eval "echo \$RULE_${k}_IPV4ADDR") - json_add_string snat_port "$portset" - json_close_object - done - done + if [ -z "$(eval "echo \$RULE_${k}_PORTSETS")" ]; then + json_add_object "" + json_add_string type nat + json_add_string target SNAT + json_add_string family inet + json_add_string snat_ip $(eval "echo \$RULE_${k}_IPV4ADDR") + json_close_object + else + for portset in $(eval "echo \$RULE_${k}_PORTSETS"); do + for proto in icmp tcp udp; do + json_add_object "" + json_add_string type nat + json_add_string target SNAT + json_add_string family inet + json_add_string proto "$proto" + json_add_boolean connlimit_ports 1 + json_add_string snat_ip $(eval "echo \$RULE_${k}_IPV4ADDR") + json_add_string snat_port "$portset" + json_close_object + done + done + fi if [ "$type" = "map-t" ]; then json_add_object "" json_add_string type rule Modified: branches/barrier_breaker/package/network/ipv6/map/src/mapcalc.c =================================================================== --- branches/barrier_breaker/package/network/ipv6/map/src/mapcalc.c 2014-10-02 19:15:38 UTC (rev 42741) +++ branches/barrier_breaker/package/network/ipv6/map/src/mapcalc.c 2014-10-02 19:16:17 UTC (rev 42742) @@ -343,14 +343,17 @@ } - 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"); } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
