X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Fconfig%2Fgre%2Ffiles%2Fgre.sh;h=3f472c447388998b9fdff8eb5ac5281c20cef7e8;hp=cab52d30f261ba8c03121e87bf048b80560151ed;hb=a79f3d11b3d7e4441544a2401f129bd055e84034;hpb=52974da2bb17ad53596944f58066c08e1af89574

diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh
index cab52d30f2..3f472c4473 100755
--- 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"
+	local remoteip
 
 	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
 	}
 
+	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" ] && {
@@ -101,16 +114,29 @@ proto_gretap_setup() {
 grev6_setup() {
 	local cfg="$1"
 	local mode="$2"
+	local remoteip6
 
 	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
 	}
 
+	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" ] && {