Author: cyrus
Date: 2014-09-29 20:00:02 +0200 (Mon, 29 Sep 2014)
New Revision: 42700
Modified:
trunk/package/network/config/gre/Makefile
trunk/package/network/config/gre/files/gre.sh
Log:
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 <[email protected]>
Modified: trunk/package/network/config/gre/Makefile
===================================================================
--- trunk/package/network/config/gre/Makefile 2014-09-29 17:59:50 UTC (rev
42699)
+++ trunk/package/network/config/gre/Makefile 2014-09-29 18:00:02 UTC (rev
42700)
@@ -9,7 +9,7 @@
PKG_NAME:=gre
PKG_VERSION:=1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
include $(INCLUDE_DIR)/package.mk
Modified: trunk/package/network/config/gre/files/gre.sh
===================================================================
--- trunk/package/network/config/gre/files/gre.sh 2014-09-29 17:59:50 UTC
(rev 42699)
+++ trunk/package/network/config/gre/files/gre.sh 2014-09-29 18:00:02 UTC
(rev 42700)
@@ -13,8 +13,8 @@
local local="$3"
local remote="$4"
local link="$5"
- local mtu ttl zone ikey okey icsum ocsum iseqno oseqno
- json_get_vars 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 tos zone ikey okey icsum ocsum iseqno oseqno
[ -z "$zone" ] && zone="wan"
@@ -25,6 +25,7 @@
json_add_int mtu "${mtu:-1280}"
[ -n "$df" ] && json_add_boolean df "$df"
json_add_int ttl "${ttl:-64}"
+ [ -n "$tos" ] && json_add_string tos "$tos"
json_add_string local "$local"
json_add_string remote "$remote"
[ -n "$tunlink" ] && json_add_string link "$tunlink"
@@ -193,6 +194,7 @@
proto_config_add_int "mtu"
proto_config_add_int "ttl"
+ proto_config_add_string "tos"
proto_config_add_string "tunlink"
proto_config_add_string "zone"
proto_config_add_int "ikey"
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
