6in4: Tos support

Tos support is added as a string parameter which can have the following values :
   -inherit (outer header inherits the tos value of the inner header)
   -hex value

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
SVN-Revision: 42749

diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
index 5309cc4a5fd90cd27e77452294730c458b46a6e9..714d6294169de3466253489567f8871b0654d54a 100755 (executable)
--- a/package/network/ipv6/6in4/files/6in4.sh
+++ b/package/network/ipv6/6in4/files/6in4.sh
@@ -14,8 +14,8 @@ proto_6in4_setup() {
        local iface="$2"
        local link="6in4-$cfg"
 
        local iface="$2"
        local link="6in4-$cfg"
 

-       local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
-       json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
+       local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
+       json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting

 
        [ -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"
 
        [ -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"


@@ -56,6 +56,7 @@ proto_6in4_setup() {
        json_add_string mode sit
        json_add_int mtu "${mtu:-1280}"
        json_add_int ttl "${ttl:-64}"
        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"
        json_add_string remote "$peeraddr"
        proto_close_tunnel
        json_add_string local "$ipaddr"
        json_add_string remote "$peeraddr"
        proto_close_tunnel


@@ -96,6 +97,7 @@ proto_6in4_init_config() {
        proto_config_add_string "updatekey"
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"
        proto_config_add_string "updatekey"
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"

+       proto_config_add_string "tos"

        proto_config_add_boolean "sourcerouting"
 }
 
        proto_config_add_boolean "sourcerouting"
 }