mt76: update to the latest version

[openwrt/.git] / package / network / config / ipip / files / ipip.sh

diff --git a/package/network/config/ipip/files/ipip.sh b/package/network/config/ipip/files/ipip.sh
index 51c503f8950eedb9521c26a63866bd5d49acd2d4..15b1c978e31b1809021ce15aef4aa656b23886b7 100755 (executable)
--- a/package/network/config/ipip/files/ipip.sh
+++ b/package/network/config/ipip/files/ipip.sh
@@ -9,16 +9,29 @@
 
 proto_ipip_setup() {
        local cfg="$1"
+       local remoteip
 
        local df ipaddr peeraddr tunlink ttl tos zone mtu
        json_get_vars df ipaddr peeraddr tunlink ttl tos zone mtu
 
        [ -z "$peeraddr" ] && {
-               proto_notify_error "$cfg" "MISSING_ADDRESS"
+               proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
                proto_block_restart "$cfg"
                return
        }
 
+       remoteip=$(resolveip -t 10 -4 "$peeraddr")
+
+       if [ -z "$remoteip" ]; then
+               proto_notify_error "$cfg" "PEER_RESOLVE_FAIL"
+               return
+       fi
+
+       for ip in $remoteip; do
+               peeraddr=$ip
+               break
+       done
+
        ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
 
        [ -z "$ipaddr" ] && {
@@ -34,8 +47,6 @@ proto_ipip_setup() {
                fi
        }
 
-       [ -z "$zone" ] && zone="wan"
-
        proto_init_update "ipip-$cfg" 1
 
        proto_add_tunnel