projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gre: Support fqdn as remote tunnel endpoint
[openwrt/staging/lynxis/omap.git]
/
package
/
network
/
config
/
gre
/
files
/
gre.sh
diff --git
a/package/network/config/gre/files/gre.sh
b/package/network/config/gre/files/gre.sh
index cab52d30f261ba8c03121e87bf048b80560151ed..3f472c447388998b9fdff8eb5ac5281c20cef7e8 100755
(executable)
--- a/
package/network/config/gre/files/gre.sh
+++ b/
package/network/config/gre/files/gre.sh
@@
-44,16
+44,29
@@
gre_generic_setup() {
gre_setup() {
local cfg="$1"
local mode="$2"
gre_setup() {
local cfg="$1"
local mode="$2"
+ local remoteip
local ipaddr peeraddr
json_get_vars df ipaddr peeraddr tunlink
[ -z "$peeraddr" ] && {
local ipaddr peeraddr
json_get_vars df ipaddr peeraddr tunlink
[ -z "$peeraddr" ] && {
- proto_notify_error "$cfg" "MISSING_ADDRESS"
+ proto_notify_error "$cfg" "MISSING_
PEER_
ADDRESS"
proto_block_restart "$cfg"
exit
}
proto_block_restart "$cfg"
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" )
[ -z "$ipaddr" ] && {
( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
[ -z "$ipaddr" ] && {
@@
-101,16
+114,29
@@
proto_gretap_setup() {
grev6_setup() {
local cfg="$1"
local mode="$2"
grev6_setup() {
local cfg="$1"
local mode="$2"
+ local remoteip6
local ip6addr peer6addr weakif
json_get_vars ip6addr peer6addr tunlink weakif
[ -z "$peer6addr" ] && {
local ip6addr peer6addr weakif
json_get_vars ip6addr peer6addr tunlink weakif
[ -z "$peer6addr" ] && {
- proto_notify_error "$cfg" "MISSING_ADDRESS"
+ proto_notify_error "$cfg" "MISSING_
PEER_
ADDRESS"
proto_block_restart "$cfg"
exit
}
proto_block_restart "$cfg"
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" )
[ -z "$ip6addr" ] && {
( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" )
[ -z "$ip6addr" ] && {