aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/ipv6
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-10-02 19:38:15 +0000
committerSteven Barth <steven@midlink.org>2014-10-02 19:38:15 +0000
commite3e254cd7e6842ae2a140124116c6391a374e1bf (patch)
treeb4012427c352d97bfd2e042e4073c98bf8cf290e /package/network/ipv6
parentb5cf0a125bac523ce9e819be8320467230b4d31b (diff)
downloadmaster-187ad058-e3e254cd7e6842ae2a140124116c6391a374e1bf.tar.gz
master-187ad058-e3e254cd7e6842ae2a140124116c6391a374e1bf.tar.bz2
master-187ad058-e3e254cd7e6842ae2a140124116c6391a374e1bf.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6')
-rwxr-xr-xpackage/network/ipv6/6in4/files/6in4.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
index 5309cc4a5f..714d629416 100755
--- 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 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"
@@ -56,6 +56,7 @@ proto_6in4_setup() {
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
@@ -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 "tos"
proto_config_add_boolean "sourcerouting"
}