gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gre: add ipv6 parameter to gre interfaces

Browse Source 
IPv6 protocol is enabled on all gre interfaces, but gre(v6)tap
interfaces are usually added to a bridge interface, in which case
IPv6 should be enabled only on the bridge interface.

Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
This commit is contained in:
Alin Nastac 2019-11-12 15:11:00 +01:00 committed by Hans Dedecker
parent 806339a4cc
commit 416d2cc71e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/config/gre/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gre PKG_NAME:=gre
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=11 PKG_RELEASE:=12
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

6
package/network/config/gre/files/gre.sh
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 tos zone ikey okey icsum ocsum iseqno oseqno multicast local mtu ipv6 ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
json_get_vars mtu ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast json_get_vars mtu ipv6 ttl tos zone ikey okey icsum ocsum iseqno oseqno multicast
[ -z "$multicast" ] && multicast=1 [ -z "$multicast" ] && multicast=1
@ -23,6 +23,7 @@ gre_generic_setup() {
proto_add_tunnel proto_add_tunnel
json_add_string mode "$mode" json_add_string mode "$mode"
json_add_int mtu "${mtu:-1280}" json_add_int mtu "${mtu:-1280}"
json_add_boolean ipv6 "${ipv6:-1}"
[ -n "$df" ] && json_add_boolean df "$df" [ -n "$df" ] && json_add_boolean df "$df"
[ -n "$ttl" ] && json_add_int ttl "$ttl" [ -n "$ttl" ] && json_add_int ttl "$ttl"
[ -n "$tos" ] && json_add_string tos "$tos" [ -n "$tos" ] && json_add_string tos "$tos"
@ -248,6 +249,7 @@ gre_generic_init_config() {
available=1 available=1
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_boolean "ipv6"
proto_config_add_int "ttl" proto_config_add_int "ttl"
proto_config_add_string "tos" proto_config_add_string "tos"
proto_config_add_string "tunlink" proto_config_add_string "tunlink"