From: Steven Barth <cyrus@openwrt.org>
Date: Thu, 2 Oct 2014 19:38:04 +0000 (+0000)
Subject: 6to4: Tos support
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e7e54ef6725464abf110fbcab334bed3b6705c7c;p=openwrt%2Fstaging%2Fjow.git

6to4: 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: 42748
---

diff --git a/package/network/ipv6/6to4/files/6to4.sh b/package/network/ipv6/6to4/files/6to4.sh
index 2a9b26292c..ce1de53ea8 100755
--- 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 sourcerouting
+	json_get_vars mtu ttl tos ipaddr sourcerouting
 
 	( proto_add_host_dependency "$cfg" 0.0.0.0 )
 
@@ -77,6 +77,7 @@ proto_6to4_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"
 	proto_close_tunnel
 
@@ -94,6 +95,7 @@ proto_6to4_init_config() {
 	proto_config_add_string "ipaddr"
 	proto_config_add_int "mtu"
 	proto_config_add_int "ttl"
+	proto_config_add_string "tos"
 	proto_config_add_boolean "sourcerouting"
 }