From e9d15da0dae95e54b7dab7ff49173c842c7ccf34 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 2 Oct 2014 19:37:58 +0000 Subject: [PATCH] 6rd: 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 SVN-Revision: 42747 --- package/network/ipv6/6rd/files/6rd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh index db70b5a6c1..042d98559f 100644 --- a/package/network/ipv6/6rd/files/6rd.sh +++ b/package/network/ipv6/6rd/files/6rd.sh @@ -14,8 +14,8 @@ proto_6rd_setup() { local iface="$2" local link="6rd-$cfg" - local mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone - json_get_vars mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone + local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone + json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone [ -z "$ip6prefix" -o -z "$peeraddr" ] && { proto_notify_error "$cfg" "MISSING_ADDRESS" @@ -67,6 +67,7 @@ proto_6rd_setup() { json_add_int mtu "${mtu:-1280}" json_add_boolean df "${df:-1}" json_add_int ttl "${ttl:-64}" + [ -n "$tos" ] && json_add_string tos "$tos" json_add_string local "$ipaddr" json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen" json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen" @@ -91,6 +92,7 @@ proto_6rd_init_config() { proto_config_add_int "mtu" proto_config_add_boolean "df" proto_config_add_int "ttl" + proto_config_add_string "tos" proto_config_add_string "ipaddr" proto_config_add_string "peeraddr" proto_config_add_string "ip6prefix"