GRE: Tos support

Tos support is added as a generic grev4/grev6 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: 42700
owl
Steven Barth 2014-09-29 18:00:02 +00:00
parent 30912c5d81
commit 6e2262898f
2 changed files with 5 additions and 3 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gre PKG_NAME:=gre
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=2 PKG_RELEASE:=3
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View File

@ -13,8 +13,8 @@ gre_generic_setup() {
local local="$3" local local="$3"
local remote="$4" local remote="$4"
local link="$5" local link="$5"
local mtu ttl zone ikey okey icsum ocsum iseqno oseqno local mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
json_get_vars mtu ttl zone ikey okey icsum ocsum iseqno oseqno json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno
[ -z "$zone" ] && zone="wan" [ -z "$zone" ] && zone="wan"
@ -25,6 +25,7 @@ gre_generic_setup() {
json_add_int mtu "${mtu:-1280}" json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df" [ -n "$df" ] && json_add_boolean df "$df"
json_add_int ttl "${ttl:-64}" json_add_int ttl "${ttl:-64}"
[ -n "$tos" ] && json_add_string tos "$tos"
json_add_string local "$local" json_add_string local "$local"
json_add_string remote "$remote" json_add_string remote "$remote"
[ -n "$tunlink" ] && json_add_string link "$tunlink" [ -n "$tunlink" ] && json_add_string link "$tunlink"
@ -193,6 +194,7 @@ gre_generic_init_config() {
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_int "ttl" proto_config_add_int "ttl"
proto_config_add_string "tos"
proto_config_add_string "tunlink" proto_config_add_string "tunlink"
proto_config_add_string "zone" proto_config_add_string "zone"
proto_config_add_int "ikey" proto_config_add_int "ikey"