Skip to content

Commit

Permalink
loop over array of pia prt fwd, log only on fail
Browse files Browse the repository at this point in the history
  • Loading branch information
binhex committed Jul 3, 2017
1 parent 7215a76 commit 298b54d
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions run/root/getvpnport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ if [[ "${VPN_PROV}" == "pia" ]]; then

else

echo "[info] Strict port forwarding enabled, attempting to configure an incoming port..."

if [[ "${DEBUG}" == "true" ]]; then
echo "[info] Strict port forwarding enabled, attempting to assign an incoming port..."
fi

# remove temp file from previous run
rm -f /tmp/VPN_INCOMING_PORT

Expand All @@ -34,24 +36,24 @@ if [[ "${VPN_PROV}" == "pia" ]]; then
curly.sh -rc 12 -rw 10 -of /tmp/VPN_INCOMING_PORT -url "${pia_api_url}/?client_id=${client_id}"
exit_code=$?

pia_domain_suffix="privateinternetaccess.com"
pia_port_forward_enabled_endpoints_array=("ca-toronto.${pia_domain_suffix} (CA Toronto)" "ca.${pia_domain_suffix} (CA Montreal)" "nl.${pia_domain_suffix} (Netherlands)" "swiss.${pia_domain_suffix} (Switzerland)" "sweden.${pia_domain_suffix} (Sweden)" "france.${pia_domain_suffix} (France)" "ro.${pia_domain_suffix} (Romania)" "israel.${pia_domain_suffix} (Israel)")

if [[ "${exit_code}" != 0 ]]; then

echo "[warn] Unable to assign incoming port, possible reasons for this:-"
echo "[info] PIA API currently down (script will auto retry)"
echo "[info] or"
echo "[info] PIA endpoint doesn't support port forwarding, a list of endpoints that do support port forwarding is as follows:-"
echo "[info] - ca-toronto.privateinternetaccess.com (CA Toronto)"
echo "[info] - ca.privateinternetaccess.com (CA Montreal)"
echo "[info] - nl.privateinternetaccess.com (Netherlands)"
echo "[info] - nl.privateinternetaccess.com (Switzerland)"
echo "[info] - sweden.privateinternetaccess.com (Sweden)"
echo "[info] - sweden.privateinternetaccess.com (France)"
echo "[info] - ro.privateinternetaccess.com (Romania)"
echo "[info] - israel.privateinternetaccess.com (Israel)"
echo "[info] Terminating OpenVPN process to force retry for incoming port..."

kill -2 $(cat /root/openvpn.pid)
exit 1
if [[ " ${pia_port_forward_enabled_endpoints_array[@]} " =~ " ${VPN_REMOTE} " ]]; then

echo "[warn] PIA API currently down, terminating OpenVPN process to force retry for incoming port..."
kill -2 $(cat /root/openvpn.pid)
exit 1

else

echo "[warn] PIA endpoint '${VPN_REMOTE}' doesn't support port forwarding, DL/UL speeds will be slow"
echo "[info] Please consider switching to an endpoint that does support port forwarding, shown below:-"
printf '[info] %s\n' "${pia_port_forward_enabled_endpoints_array[@]}"

fi

else

Expand All @@ -68,9 +70,7 @@ if [[ "${VPN_PROV}" == "pia" ]]; then

else

echo "[warn] PIA incoming port malformed"
echo "[info] Terminating OpenVPN process to force retry for incoming port..."

echo "[warn] PIA incoming port malformed, terminating OpenVPN process to force retry for incoming port..."
kill -2 $(cat /root/openvpn.pid)
exit 1

Expand Down

0 comments on commit 298b54d

Please sign in to comment.