From 3d1dfc3af949f4102f6f4aa7b92a79ece68043c0 Mon Sep 17 00:00:00 2001
From: Jake Lee <jakelee8@icloud.com>
Date: Thu, 9 Feb 2017 20:36:26 -0800
Subject: [PATCH] Use new PIA port forwarding API (2017)

---
 transmission/periodicUpdates.sh | 10 ----------
 transmission/start.sh           |  4 ++--
 transmission/updatePort.sh      |  5 ++---
 3 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100755 transmission/periodicUpdates.sh

diff --git a/transmission/periodicUpdates.sh b/transmission/periodicUpdates.sh
deleted file mode 100755
index ac41d703a..000000000
--- a/transmission/periodicUpdates.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCAL_VPN_IP=$1
-
-while [ 1 ]
-do
-    sleep 1m
-    /etc/transmission/updatePort.sh $LOCAL_VPN_IP
-    sleep 1h
-done
diff --git a/transmission/start.sh b/transmission/start.sh
index d1ad73110..2a9cd36a8 100755
--- a/transmission/start.sh
+++ b/transmission/start.sh
@@ -26,8 +26,8 @@ exec sudo -u ${RUN_AS} /usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --lo
 
 if [ "$OPENVPN_PROVIDER" = "PIA" ]
 then
-    echo "STARTING PORT UPDATER"
-    exec /etc/transmission/periodicUpdates.sh $4 &
+    echo "CONFIGURING PORT FORWARDING"
+    exec /etc/transmission/updatePort.sh &
 else
     echo "NO PORT UPDATER FOR THIS PROVIDER"
 fi
diff --git a/transmission/updatePort.sh b/transmission/updatePort.sh
index 1af6b15e3..3d8026331 100755
--- a/transmission/updatePort.sh
+++ b/transmission/updatePort.sh
@@ -11,10 +11,8 @@ pia_username=$(head -1 $PIA_PASSWD_FILE)
 pia_passwd=$(tail -1 $PIA_PASSWD_FILE)
 transmission_username=$(head -1 $TRANSMISSION_PASSWD_FILE)
 transmission_passwd=$(tail -1 $TRANSMISSION_PASSWD_FILE)
-local_vpn_ip=$1 # Passed as parameter from periodicUpdates.sh
 pia_client_id_file=/etc/transmission/pia_client_id
 transmission_settings_file=${TRANSMISSION_HOME}/settings.json
-port_assignment_url=https://www.privateinternetaccess.com/vpninfo/port_forward_assignment
 
 #
 # First get a port from PIA
@@ -31,7 +29,8 @@ if [ -z ${pia_client_id} ]; then
 fi
 
 # Get the port
-pia_response=$(curl -s -f -d "user=$pia_username&pass=$pia_passwd&client_id=$pia_client_id&local_ip=$local_vpn_ip" $port_assignment_url)
+port_assignment_url="http://209.222.18.222:2000/?client_id=$pia_client_id"
+pia_response=$(curl -s -f $port_assignment_url)
 
 # Check for curl error (curl will fail on HTTP errors with -f flag)
 ret=$?