6to4: Remove sourcerouting parameter registration

[openwrt.git] / package / network / ipv6 / 6to4 / files / 6to4.sh

diff --git a/package/network/ipv6/6to4/files/6to4.sh b/package/network/ipv6/6to4/files/6to4.sh
index 2a9b262..a5d0567 100755 (executable)
--- a/package/network/ipv6/6to4/files/6to4.sh
+++ b/package/network/ipv6/6to4/files/6to4.sh
@@ -34,8 +34,8 @@ proto_6to4_setup() {
        local iface="$2"
        local link="6to4-$cfg"
 
-       local mtu ttl ipaddr sourcerouting
-       json_get_vars mtu ttl ipaddr sourcerouting
+       local mtu ttl tos ipaddr
+       json_get_vars mtu ttl tos ipaddr
 
        ( proto_add_host_dependency "$cfg" 0.0.0.0 )
 
@@ -65,18 +65,14 @@ proto_6to4_setup() {
        proto_add_ipv6_address "$local6" 16
        proto_add_ipv6_prefix "$prefix6::/48"
 
-       if [ "$sourcerouting" != "0" ]; then
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128"
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
-       else
-               proto_add_ipv6_route "::" 0 "::192.88.99.1"
-       fi
+       proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
+       proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
 
        proto_add_tunnel
        json_add_string mode sit
        json_add_int mtu "${mtu:-1280}"
        json_add_int ttl "${ttl:-64}"
+       [ -n "$tos" ] && json_add_string tos "$tos"
        json_add_string local "$ipaddr"
        proto_close_tunnel
 
@@ -94,7 +90,7 @@ proto_6to4_init_config() {
        proto_config_add_string "ipaddr"
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"
-       proto_config_add_boolean "sourcerouting"
+       proto_config_add_string "tos"
 }
 
 [ -n "$INCLUDE_ONLY" ] || {