aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-10-02 19:38:15 +0000
committerSteven Barth <cyrus@openwrt.org>2014-10-02 19:38:15 +0000
commit75572d0d313e894a49d30e1730c81b42cae0fdf3 (patch)
treeb98626b7f10757d962b5e42afcc8a938bde76f01
parente7e54ef6725464abf110fbcab334bed3b6705c7c (diff)
downloadupstream-75572d0d313e894a49d30e1730c81b42cae0fdf3.tar.gz
upstream-75572d0d313e894a49d30e1730c81b42cae0fdf3.tar.bz2
upstream-75572d0d313e894a49d30e1730c81b42cae0fdf3.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> SVN-Revision: 42749
-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"
}