map: rename type to maptype (FS#3287)

"type" is already used as a common option for all protocols types, so
using the same option name for the map type makes the configuration
ambiguous. Luci in particular adds controls for both options and sees
errors when reading the resulting configuration.

Use "maptype" instead, but still fallback to "type" if "maptype" is not
set. This allows configurations to migrate without breaking old
configurations.

This addresses FS#3287.

Signed-off-by: Remi NGUYEN VAN <remi.nguyenvan+openwrt@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]

diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile
index 4bb29ee57b2684f8a09be4b3a257293866a473f2..f73b5eefb8474d6a52d9914c8d23d89f591a0f43 100644 (file)
--- a/package/network/ipv6/map/Makefile
+++ b/package/network/ipv6/map/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/map/files/map.sh b/package/network/ipv6/map/files/map.sh
index 61075bd244fedb81101a532bf7d31aac71261362..652c3065e3da10d917e182914b653babf09d8e3e 100755 (executable)
--- a/package/network/ipv6/map/files/map.sh
+++ b/package/network/ipv6/map/files/map.sh
@@ -25,27 +25,30 @@ proto_map_setup() {
        local iface="$2"
        local link="map-$cfg"
 
-       local type legacymap mtu ttl tunlink zone encaplimit
+       local maptype type legacymap mtu ttl tunlink zone encaplimit
        local rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
-       json_get_vars type legacymap mtu ttl tunlink zone encaplimit
+       json_get_vars maptype type legacymap mtu ttl tunlink zone encaplimit
        json_get_vars rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
 
        [ "$zone" = "-" ] && zone=""
-       [ -z "$type" ] && type="map-e"
+
+       # Compatibility with older config: use $type if $maptype is missing
+       [ -z "$maptype" ] && maptype="$type"
+       [ -z "$maptype" ] && maptype="map-e"
        [ -z "$ip4prefixlen" ] && ip4prefixlen=32
 
        ( proto_add_host_dependency "$cfg" "::" "$tunlink" )
 
        # fixme: handle RA/DHCPv6 address race for LW
-       [ "$type" = lw4o6 ] && sleep 5
+       [ "$maptype" = lw4o6 ] && sleep 5
 
        if [ -z "$rule" ]; then
-               rule="type=$type,ipv6prefix=$ip6prefix,prefix6len=$ip6prefixlen,ipv4prefix=$ipaddr,prefix4len=$ip4prefixlen"
+               rule="type=$maptype,ipv6prefix=$ip6prefix,prefix6len=$ip6prefixlen,ipv4prefix=$ipaddr,prefix4len=$ip4prefixlen"
                [ -n "$psid" ] && rule="$rule,psid=$psid"
                [ -n "$psidlen" ] && rule="$rule,psidlen=$psidlen"
                [ -n "$offset" ] && rule="$rule,offset=$offset"
                [ -n "$ealen" ] && rule="$rule,ealen=$ealen"
-               if [ "$type" = "map-t" ]; then
+               if [ "$maptype" = "map-t" ]; then
                        rule="$rule,dmr=$peeraddr"
                else
                        rule="$rule,br=$peeraddr"
@@ -70,7 +73,7 @@ proto_map_setup() {
        fi
 
        k=$RULE_BMR
-       if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
+       if [ "$maptype" = "lw4o6" -o "$maptype" = "map-e" ]; then
                proto_init_update "$link" 1
                proto_add_ipv4_address $(eval "echo \$RULE_${k}_IPV4ADDR") "" "" ""
 
@@ -83,7 +86,7 @@ proto_map_setup() {
                json_add_string link $(eval "echo \$RULE_${k}_PD6IFACE")
                json_add_object "data"
                        [ -n "$encaplimit" ] && json_add_string encaplimit "$encaplimit"
-                       if [ "$type" = "map-e" ]; then
+                       if [ "$maptype" = "map-e" ]; then
                                json_add_array "fmrs"
                                for i in $(seq $RULE_COUNT); do
                                        [ "$(eval "echo \$RULE_${i}_FMR")" != 1 ] && continue
@@ -100,7 +103,7 @@ proto_map_setup() {
 
 
                proto_close_tunnel
-       elif [ "$type" = "map-t" -a -f "/proc/net/nat46/control" ]; then
+       elif [ "$maptype" = "map-t" -a -f "/proc/net/nat46/control" ]; then
                proto_init_update "$link" 1
                local style="MAP"
                [ "$legacymap" = 1 ] && style="MAP0"
@@ -151,7 +154,7 @@ proto_map_setup() {
               done
            done
          fi
-         if [ "$type" = "map-t" ]; then
+         if [ "$maptype" = "map-t" ]; then
                [ -z "$zone" ] && zone=$(fw3 -q network $iface 2>/dev/null)
 
                [ -n "$zone" ] && {
@@ -183,7 +186,7 @@ proto_map_setup() {
 
        proto_send_update "$cfg"
 
-       if [ "$type" = "lw4o6" -o "$type" = "map-e" ]; then
+       if [ "$maptype" = "lw4o6" -o "$maptype" = "map-e" ]; then
                json_init
                json_add_string name "${cfg}_"
                json_add_string ifname "@$(eval "echo \$RULE_${k}_PD6IFACE")"
@@ -202,9 +205,10 @@ proto_map_teardown() {
 
        json_get_var type type
 
-       [ -z "$type" ] && type="map-e"
+       [ -z "$maptype" ] && maptype="$type"
+       [ -z "$maptype" ] && maptype="map-e"
 
-       case "$type" in
+       case "$maptype" in
                "map-e"|"lw4o6") ifdown "${cfg}_" ;;
                "map-t") [ -f "/proc/net/nat46/control" ] && echo del $link > /proc/net/nat46/control ;;
        esac
@@ -216,6 +220,7 @@ proto_map_init_config() {
        no_device=1
        available=1
 
+       proto_config_add_string "maptype"
        proto_config_add_string "rule"
        proto_config_add_string "ipaddr"
        proto_config_add_int "ip4prefixlen"