Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gre: Support fqdn as remote tunnel endpoint

Browse source 
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2016-10-03 10:56:45 +02:00 committed by John Crispin
parent 52974da2bb
commit a79f3d11b3
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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:=3 PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -32,7 +32,7 @@ endef
define Package/grev4 define Package/grev4
$(call Package/gre/Default) $(call Package/gre/Default)
TITLE:=Generic Routing Encapsulation (IPv4) config support TITLE:=Generic Routing Encapsulation (IPv4) config support
DEPENDS:=@(PACKAGE_gre) +kmod-gre DEPENDS:=@(PACKAGE_gre) +kmod-gre +resolveip
endef endef
define Package/grev4/description define Package/grev4/description
@ -42,7 +42,7 @@ endef
define Package/grev6 define Package/grev6
$(call Package/gre/Default) $(call Package/gre/Default)
TITLE:=Generic Routing Encapsulation (IPv6) config support TITLE:=Generic Routing Encapsulation (IPv6) config support
DEPENDS:=@(PACKAGE_gre) @IPV6 +kmod-gre6 DEPENDS:=@(PACKAGE_gre) @IPV6 +kmod-gre6 +resolveip
endef endef
define Package/grev6/description define Package/grev6/description

30
package/network/config/gre/files/gre.sh
View file

@ -44,16 +44,29 @@ gre_generic_setup() {
gre_setup() { gre_setup() {
local cfg="$1" local cfg="$1"
local mode="$2" local mode="$2"
local remoteip
local ipaddr peeraddr local ipaddr peeraddr
json_get_vars df ipaddr peeraddr tunlink json_get_vars df ipaddr peeraddr tunlink
[ -z "$peeraddr" ] && { [ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
proto_block_restart "$cfg" proto_block_restart "$cfg"
exit exit
} }
remoteip=$(resolveip -t 10 -4 "$peeraddr")
if [ -z "$remoteip" ]; then
proto_notify_error "$cfg" "PEER_RESOLVE_FAIL"
exit
fi
for ip in $remoteip; do
peeraddr=$ip
break
done
( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
[ -z "$ipaddr" ] && { [ -z "$ipaddr" ] && {
@ -101,16 +114,29 @@ proto_gretap_setup() {
grev6_setup() { grev6_setup() {
local cfg="$1" local cfg="$1"
local mode="$2" local mode="$2"
local remoteip6
local ip6addr peer6addr weakif local ip6addr peer6addr weakif
json_get_vars ip6addr peer6addr tunlink weakif json_get_vars ip6addr peer6addr tunlink weakif
[ -z "$peer6addr" ] && { [ -z "$peer6addr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
proto_block_restart "$cfg" proto_block_restart "$cfg"
exit exit
} }
remoteip6=$(resolveip -t 10 -6 "$peer6addr")
if [ -z "$remoteip6" ]; then
proto_notify_error "$cfg" "PEER_RESOLVE_FAIL"
exit
fi
for ip6 in $remoteip6; do
peer6addr=$ip6
break
done
( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" ) ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
[ -z "$ip6addr" ] && { [ -z "$ip6addr" ] && {