starred/pia-wg
1
0
Fork 0
mirror of https://github.com/triffid/pia-wg.git synced 2026-04-05 00:43:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

pia-portfoward: use cache if available, otherwise fall back to matching ip in data json as before

Browse Source
This commit is contained in:
Michael Moon
2021-01-26 22:05:14 +08:00
parent bbc6f0502e
commit ca643c6b69
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pia-portforward.sh
View File

@@ -69,13 +69,35 @@ then
PF_BINDFILE="$CONFIGDIR/pf-bind" PF_BINDFILE="$CONFIGDIR/pf-bind"
fi fi
if [ -z "$CONNCACHE" ]
then
CONNCACHE="$CONFIGDIR/cache.json"
fi
if [ -r "$CONNCACHE" ]
then
WG_INFO="$(jq -r . "$CONNCACHE")"
WG_NAME="$(jq -r ".name" "$CONNCACHE")"
WG_DNS="$(jq -r ".dns" "$CONNCACHE")"
WG_HOST="$(jq -r ".servers.wg[0].ip" "$CONNCACHE")"
WG_CN="$(jq -r ".servers.wg[0].cn" "$CONNCACHE")"
WG_PORT="$(jq -r '.groups.wg[0].ports[]' "$DATAFILE_NEW" | sort -r | head -n1)"
WG_SN="$(cut -d. -f1 <<< "$WG_DNS")"
fi
PEER_IP="$(jq -r .peer_ip "$REMOTEINFO")" PEER_IP="$(jq -r .peer_ip "$REMOTEINFO")"
SERVER_PUBLIC_KEY="$(jq -r .server_key "$REMOTEINFO")" SERVER_PUBLIC_KEY="$(jq -r .server_key "$REMOTEINFO")"
SERVER_IP="$(jq -r .server_ip "$REMOTEINFO")" SERVER_IP="$(jq -r .server_ip "$REMOTEINFO")"
SERVER_PORT="$(jq -r .server_port "$REMOTEINFO")" SERVER_PORT="$(jq -r .server_port "$REMOTEINFO")"
SERVER_VIP="$(jq -r .server_vip "$REMOTEINFO")" SERVER_VIP="$(jq -r .server_vip "$REMOTEINFO")"
WG_INFO="$(jq '.regions | .[] | select(.servers.wg[0].ip == "'"$SERVER_IP"'")' "$DATAFILE_NEW")" if [ -z "$WG_INFO" ]
then
WG_INFO="$(jq '.regions | .[] | select(.servers.wg[0].ip == "'"$SERVER_IP"'")' "$DATAFILE_NEW")"
fi
if [ -z "$WG_INFO" ] if [ -z "$WG_INFO" ]
then then