diff options
| author | Steven Barth <steven@midlink.org> | 2014-10-02 19:15:38 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-10-02 19:15:38 +0000 |
| commit | 332585be143449caa5ba6ce3296fe84b97bbc845 (patch) | |
| tree | c160780a0e73d395b9a2bd202c8d1a0e9da88cb6 /package/network/ipv6/map/files/map.sh | |
| parent | e2ca113a8d988e6ce79a364b503e7ed9ebf63499 (diff) | |
| download | master-187ad058-332585be143449caa5ba6ce3296fe84b97bbc845.tar.gz master-187ad058-332585be143449caa5ba6ce3296fe84b97bbc845.tar.bz2 master-187ad058-332585be143449caa5ba6ce3296fe84b97bbc845.zip | |
map: fix portsets starting with 0 and use regular NAT for 1:1 MAP
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42741 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/map/files/map.sh')
| -rwxr-xr-x | package/network/ipv6/map/files/map.sh | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/package/network/ipv6/map/files/map.sh b/package/network/ipv6/map/files/map.sh index fceeb8a641..83de4cc4dc 100755 --- a/package/network/ipv6/map/files/map.sh +++ b/package/network/ipv6/map/files/map.sh @@ -122,19 +122,28 @@ proto_map_setup() { [ "$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 |