GRE: Tos support

[openwrt/staging/chunkeey.git] / package / network / config / gre / files / gre.sh

diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index 38c0fc4841044ed0e66dadf8961b37e06ae9afed..4483a087871126c2a6e524e58f12871ea9ef6d28 100755 (executable)
--- a/package/network/config/gre/files/gre.sh
+++ b/package/network/config/gre/files/gre.sh
@@ -13,8 +13,8 @@ gre_generic_setup() {
        local local="$3"
        local remote="$4"
        local link="$5"
-       local mtu ttl zone ikey okey icsum ocsum iseqno oseqno
-       json_get_vars mtu ttl zone ikey okey icsum ocsum iseqno oseqno
+       local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
+       json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
 
        [ -z "$zone" ] && zone="wan"
 
@@ -25,6 +25,7 @@ gre_generic_setup() {
        json_add_int mtu "${mtu:-1280}"
        [ -n "$df" ] && json_add_boolean df "$df"
        json_add_int ttl "${ttl:-64}"
+       [ -n "$tos" ] && json_add_string tos "$tos"
        json_add_string local "$local"
        json_add_string remote "$remote"
        [ -n "$tunlink" ] && json_add_string link "$tunlink"
@@ -51,7 +52,7 @@ gre_setup() {
                exit
        }
 
-       ( proto_add_host_dependency "$cfg" "0.0.0.0" "$tunlink" )
+       ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
 
        [ -z "$ipaddr" ] && {
                local wanif="$tunlink"
@@ -108,7 +109,7 @@ grev6_setup() {
                exit
        }
 
-       ( proto_add_host_dependency "$cfg" "::" "$tunlink" )
+       ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
 
        [ -z "$ip6addr" ] && {
                local wanif="$tunlink"
@@ -193,6 +194,7 @@ gre_generic_init_config() {
 
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"
+       proto_config_add_string "tos"
        proto_config_add_string "tunlink"
        proto_config_add_string "zone"
        proto_config_add_int "ikey"