diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-17 04:58:27 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-17 05:01:50 +0200 |
| commit | 3fea7a3c1b59733f3e3dd154d4a976f91e6d7e73 (patch) | |
| tree | 49194f585259a4b76a85ac35e12421e6cfcace64 | |
| parent | wg-quick: darwin: networksetup does not like missing stdio (diff) | |
| download | wireguard-monolithic-historical-3fea7a3c1b59733f3e3dd154d4a976f91e6d7e73.tar.xz wireguard-monolithic-historical-3fea7a3c1b59733f3e3dd154d4a976f91e6d7e73.zip | |
wg-quick: darwin: reorder functions
| -rwxr-xr-x | src/tools/wg-quick/darwin.bash | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/tools/wg-quick/darwin.bash b/src/tools/wg-quick/darwin.bash index c611877..d084191 100755 --- a/src/tools/wg-quick/darwin.bash +++ b/src/tools/wg-quick/darwin.bash @@ -159,7 +159,7 @@ set_mtu() { break fi done < <(netstat -nr -f inet) - [[ -n $defaultif && $(ifconfig "$defaultif") =~ mtu\ ([0-9]+) ]] && mtu="${BASH_REMATCH[1]}" + [[ -n $defaultif && $(ifconfig "$defaultif") =~ mtu\ ([0-9]+) ]] && mtu="${BASH_REMATCH[1]}" [[ $mtu -gt 0 ]] || mtu=1500 mtu=$(( mtu - 80 )) [[ $(ifconfig "$REAL_INTERFACE") =~ mtu\ ([0-9]+) ]] && current_mtu="${BASH_REMATCH[1]}" @@ -193,6 +193,24 @@ collect_endpoints() { done < <(wg show "$REAL_INTERFACE" endpoints) } +declare -A SERVICE_DNS +collect_new_service_dns() { + local service get_response + local -A found_services + { read -r _ && while read -r service; do + [[ $service == "*"* ]] && service="${service:1}" + found_services["$service"]=1 + [[ -n ${SERVICE_DNS["$service"]} ]] && continue + get_response="$(cmd networksetup -getdnsservers "$service")" + [[ $get_response == *" "* ]] && get_response="Empty" + [[ -n $get_response ]] && SERVICE_DNS["$service"]="$get_response" + done; } < <(networksetup -listallnetworkservices) + + for service in "${!SERVICE_DNS[@]}"; do + [[ ${found_services["$service"]} == 1 ]] || unset SERVICE_DNS["$service"] + done +} + set_endpoint_direct_route() { local old_endpoints endpoint old_gateway4 old_gateway6 remove_all_old=0 added=( ) old_endpoints=( "${ENDPOINTS[@]}" ) @@ -244,24 +262,6 @@ set_endpoint_direct_route() { ENDPOINTS=( "${added[@]}" ) } -declare -A SERVICE_DNS -collect_new_service_dns() { - local service get_response - local -A found_services - { read -r _ && while read -r service; do - [[ $service == "*"* ]] && service="${service:1}" - found_services["$service"]=1 - [[ -n ${SERVICE_DNS["$service"]} ]] && continue - get_response="$(cmd networksetup -getdnsservers "$service")" - [[ $get_response == *" "* ]] && get_response="Empty" - [[ -n $get_response ]] && SERVICE_DNS["$service"]="$get_response" - done; } < <(networksetup -listallnetworkservices) - - for service in "${!SERVICE_DNS[@]}"; do - [[ ${found_services["$service"]} == 1 ]] || unset SERVICE_DNS["$service"] - done -} - set_dns() { collect_new_service_dns local service response |