From fa1452e663a6f53dcc8bf7095e3002f1aca3d889 Mon Sep 17 00:00:00 2001
From: "black.box (Unzoner) team@belodetek.io" <team@belodetek.io>
Date: Sat, 2 Dec 2023 18:14:00 -0800
Subject: [PATCH] feat: remove ping tests and refactor mixed mode status
 reporting

* re-encrypt secrets
* remove GeoIP
* bump OpenSSL to 3.0.12
* bump OpenVPN to 2.6.8
* bump sniproxy to 0.6.1
* deprecate WANPROXY
* despace-entab
---
 .github/workflows/balena.yml       |   5 +
 .gitsecret/paths/mapping.cfg       |   2 +-
 unzoner/.balena/balena.yml         |  19 +-
 unzoner/.balena/secrets/env.secret | Bin 1267 -> 1171 bytes
 unzoner/Dockerfile.template        | 292 ++++++++++++++---------------
 unzoner/functions                  |  19 +-
 unzoner/id_rsa.secret              | Bin 2295 -> 2292 bytes
 unzoner/mgmt.ovpn.secret           | Bin 4501 -> 4499 bytes
 unzoner/openvpn/client.key.secret  | Bin 2310 -> 2308 bytes
 unzoner/openvpn/dh2048.pem.secret  | Bin 1345 -> 1344 bytes
 unzoner/openvpn/server.key.secret  | Bin 2316 -> 2314 bytes
 unzoner/openvpn/ta.key.secret      | Bin 1381 -> 1380 bytes
 unzoner/src/config.py              |   4 -
 unzoner/src/main.py                | 145 ++++++--------
 unzoner/src/tests/run              |   2 +-
 unzoner/src/vpn.py                 | 160 +---------------
 unzoner/start                      |  75 --------
 17 files changed, 221 insertions(+), 502 deletions(-)

diff --git a/.github/workflows/balena.yml b/.github/workflows/balena.yml
index 4cd8954..ae94396 100644
--- a/.github/workflows/balena.yml
+++ b/.github/workflows/balena.yml
@@ -8,6 +8,11 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  # cancel jobs in progress for updated PRs, but not merge or tag events
+  cancel-in-progress: ${{ github.event.action == 'synchronize' }}
+
 env:
   ENVIRONMENT: balena-cloud.com
   BLOCK_PREFIX: belodetek/unzoner
diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
index fa32711..5284212 100644
--- a/.gitsecret/paths/mapping.cfg
+++ b/.gitsecret/paths/mapping.cfg
@@ -2,6 +2,6 @@ unzoner/openvpn/client.key:1f2e908d2eac66568e4d4cc2c37967684c0da9cb32a24c970ee82
 unzoner/openvpn/server.key:0817ed6b2ae19fdf1ddab8b507d70e7cbea29fa00674687eb845514539ad2c64
 unzoner/openvpn/ta.key:61a616ec66587848c1a43cc92aa21ad0305e804581f9c2a437929713c4f4edb6
 unzoner/id_rsa:7efaea18eedb4a1b9f9298e0f3d92ceb3f2adc4c29a5e818009a7d88f847296f
-unzoner/.balena/secrets/env:b581220016ab9a0e9bb870baa31c1407caac3ba674ad785d3bffc9cb407f756a
+unzoner/.balena/secrets/env:57af61f0f7fdb6afa4d15d7399358c00957b4358de192eb0d7b048f575e345a1
 unzoner/mgmt.ovpn:b81b41c4cf71cdd490feecadf4bb35c31ed8396ed0fdd61808d4efd73c3031de
 unzoner/openvpn/dh2048.pem:7afe4bea0e57bc35bcd7cdd9e393692c43a88facc64c309a176dc69a66d5a029
diff --git a/unzoner/.balena/balena.yml b/unzoner/.balena/balena.yml
index 6a16100..7f9adba 100644
--- a/unzoner/.balena/balena.yml
+++ b/unzoner/.balena/balena.yml
@@ -6,23 +6,22 @@ build-variables:
       # https://en.wikipedia.org/wiki/Bird_Internet_routing_daemon
       - BUILD_BIRD=0
       # https://github.com/openssl/openssl
-      - BUILD_OPENSSL_VERSION=3.0.5
-      - BUILD_OPENSSL=0
+      # Setting up openssh-server (1:8.9p1-3ubuntu0.4) ...
+      # OpenSSL version mismatch. Built against 30000020, you have 30200000
+      - BUILD_OPENSSL_VERSION=3.0.12
+      - BUILD_OPENSSL=1
       # https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
       - AARCH64_OPTIMISE_FLAGS=-O3 -mtune=cortex-a72 -march=armv8-a
       # https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
       - ARM_OPTIMISE_FLAGS=-O3 -mtune=cortex-a53 -mcpu=cortex-a53+crypto -mfpu=crypto-neon-fp-armv8
       # https://github.com/OpenVPN/openvpn
-      - BUILD_OPENVPN_VERSION=2.5.7
-      - BUILD_OPENVPN=0
+      - BUILD_OPENVPN_VERSION=2.6.8
+      - BUILD_OPENVPN=1
       # FIXME: https://sources.debian.org/patches/sniproxy/0.6.0-2/
-      - BUILD_SNIPROXY_VERSION=0.6.0
-      - BUILD_SNIPROXY=0
-      # project abandoned http://wanproxy.org/)
-      - BUILD_WANPROXY_VERSION=0.8.0
-      - BUILD_WANPROXY=0
+      - BUILD_SNIPROXY_VERSION=0.6.1
+      - BUILD_SNIPROXY=1
       # https://nuitka.net/
-      - COMPILE_CODE=0
+      - COMPILE_CODE=1
       # (e.g.) dig +short us.{{ DNS_SUB_DOMAIN }}.{{ DNS_DOMAIN }}
       - DNS_SUB_DOMAIN=blackbox
 
diff --git a/unzoner/.balena/secrets/env.secret b/unzoner/.balena/secrets/env.secret
index adc913cd4aa10b0565dee71b2682cffec75050c1..3292a17eb741d32d240b3e992e35343eebf6d157 100644
GIT binary patch
literal 1171
zcmV;E1Z?|-0t^F2<0md9g;;U{5B@mhhJo-(o3NA|939c4R8*aH3+;t_6P7^Jaiy5%
zCge!QQ1e$yL%l-bWS5Z!m=4VKGjz&U{K!)9%mFThH$ZU@pRv2dFa7X_K4WCJGxOof
zR{0zyLh;qLWV%fHb=`yVQ3FGG<M%)?5<r|+il)c*;R~%Nh#N0|&<8Fz2;^r`q;lg#
zt75Td_^f2@MAP>hXEsG%vdbZFJSY@#&e?9pz<uOon3I(<Lo6(l9c(I~Vo|OXo-H&k
zaPkYER7CTjv%iYq9lJUC(u?OnMQQDxMK3J*x5a+0WeepK81WM2cxO<M+Cn>24^Cl|
zkhadZ)+TP22W($gFmiD8Bg#CsBJ0)XOvKB$O5-VI1T5g9bgsj!r_qs=M-{~rE5Pxe
zd!Pt(x7kxQOx*8D!Oz)r0+e>a>fhHwWaQQ<Dx2zKwc=gf83_f#<U{<|yeO?_GNq^F
z_2m(G|Cq;l$i&$$bsEjrC#=VTlZ=|XtRUJEbg|~mCnbW+P5VcTi3ZKB^vmI>_NU<O
zM<%){NC7zRVYiv+2?M3m$&j-o2;~_%ldAqe2oP6d-YtSkN0sG54RqVTB@Z4$qs`~;
z@thbQ&_TFvRDPz%0P_8u`z?EQ(^GGjdkH!kP%|}#Bo-Uxt@1TN$Nje=YW{Dl4bNn)
zKoC6r@#*>iA1j9s-3o;Pi~~yUUU_9b7~ug6{vfRINXN(dAbN1?G#hwQ4nC*hPJV(C
zqhPcEYt3u$tfJcG9FUjAMm=v=6VmSCqYE*N*gYlG$viX4tU9<bdX-^3nv{INMzv}-
z4X+5KW)HS%d|yINv0ku1JhQ8hgQQCua|e&fX0heosWnLb%Kn6#u{wLP5-F+8dfWKo
zor0CZZLsr*WAXfoT||ORtTtg9j5tY7CoNkjB-VI41uM0;AqCHFD)C@GVH8m^?2eBp
ziptz?OYM~g2<eld(iVa80>ORz{VMqa82tG!@45wF&~JIMd|Z7_=6#xK6JK)O2eo52
zgj5yJ--FNkECaE(zEQ3ZFYiBZDN+?_*RVHVO7kNbDL}Y!+|eGra?ygd)BD+?%YeTx
zZa35EMh^T&EsHmk)47mIp~x2*BO2U*ZdW>X=aG5Hm!TqO<y!D=ZzH_V((v}xxJn*y
zohk~$`Qb%Cw4z~6kW{z&tIVC|<}MCQ#KL?AKLZDMdT-IRE(xmgGx=ZGEnf?^ebT@(
z0e`?xSE63ZlTNc=sobvj)EUS8gZ6Ys+7q<Iw~^5pI)Efv`FCJP@J|naHZ;=Kf1V=R
zf|^V5ryRtf+Xtug1RE^;z`RSwmR<QBm%o369C}nANFfa|l)P(z*XjWn&okpk701?t
z0R*@mjMFeGYw#oC)A1Zo_ylmm{%%Ux*}b#`sw&i_!kPR4@#BA1>@Gud*qmU=TbW7I
z^U4Z;fI!{6oeb-T7AT3PeWv2>XR4G<PQPMU>K;Fx<>rh3^lX{txW^Anz|p9N=sz5|
llTi3Y>V&_GG11Szo2-vxJa0lf<j-a6e+tMv<c$jJKJa#6QI`M!

literal 1267
zcmV<P1PuFy0t^F2<0md9g;;U{5B@zvK=7x?+w?RlD6yKp3bQ2U+GT+>AQLE})wt?v
zns3s*^fJd(Wb8b(Me>W7i1<nwA>-9Y4W4Qzo?B|Ji)=1w+pbwNi5!>0oL^AUUWndb
zBKnzVP98$RtFkB_>Q*no{p?IZsd3Y$>rzJuug+Aadv5nqiWG5o1HlM&7}L{a_KXHd
zk!DsWfv`GUnBi4^$Ohf`<dAhP@9sdNtet+5w`zcr=nf)@WbzTTJ|^2=@J<$<aFww2
z5xb$#TAa^5rYM4)`>hxZt8Y$Gn1DW)7c3xuc|iPynllvS<-4!<7YACEN_RmF-@^_F
z{!I|VutP7d3F8>}>PJI_F^_9#K$SsJ!BS9%Rx8O3#Rose9xyx5s(2UtPz&v?T~up&
zoiX^*#CcG$Hh82e&*i3y(961GRRA17Cv_eOe~ynqz6LinuqN!04euksPp_F)*8&1b
zp_dQeH@1i55rCh^3?R1YI1Vu8o*DpZ*``R&q=6>5XME2D7{(fH7$R{1Sg--Y#Sy$p
zwKv{>BDQ%<6{|TG92wosZ}Hl*`G{PY6;mm3=qh7+TpLC7XL?qe;sjx<m=43IbvEXZ
z#DtbZEx0~!5Srk1FKWR7CA_FC<neem8WJ~*R6O8Mo+W{9Jb@V5cR|HLxLMU66-V73
zz>{fMzCdiL4B@xw>L7&yi~~yUUU_9b7~ug6{T;huq$Agc^~Nfu`DE>xv{(nEEuFYr
z7JnT}I1WTW0E-`~omvIi(7x4>0R#Rk7|}!+?BIJ0&4*c`=Lj7V8zPTo$uQReYWKNE
z{I>LWI!@-C7?1I_dJRxze6VcIHnykWPtW?|XQ%<rLWfWeTTSFqT3sjQvf-VZ{<Iv$
zO^DBx^f^?{8^}q>DljEB1MZdmv_yRjKNB>n(T%2sx;AzE^}~C=&zIl5_YmcTk0Eec
zE?BzIJ=Lgsw0v7x@b*Kw?{^*;3eVAq=K?q6&-vTJi$YMTdeM1lz;qqE@uOJv%OZXB
zA~_-uFo{TlMzoUF7T9`i@#%yvdu-uIH|KA;=egGFf@yzB_%LoTizymoHbIAB-=V<G
zJ#L8qqaI!Q2f|Z7_1IO!FP{#;sJ}FbtkG_6)`#pD-j_P6aC@wjq{fu!<emJo$xtI0
zTltg$I$EiEVBBCg*??g^p^+TqlQ8?|LYxC^GGy|=IUh}9a1kx3JdInssM8QIiPFH5
z0c>o$e)H8W^i!4pCBKd4<5U)fZ9G124MjW_&a$rOGE?vxJNGKBibH~}y^0xS^`T(0
zcn9Gp_mXF=k}PHYPvOZ4_E3`BA`&vj`&@cGzR_KJ!tCFmZ-52&rOnh;7rhtOFW)`&
zgn=3V;Kpb?4$4Pz%7Ta&7@098dhS|irW34*z~D@H?W#(KCX<Q>YWAVEVwq^AYRxkN
zUfcsH&^KL}V6wFEf7h*A5iByvpkXxAs+nE(aP3<LD7RyDBu&ZXX8@oP(qtV(K{CAN
z4{7E6g~v``#x}<f!tS&JOlcApP4}fHC{7I2`Q;46X#ygx_FkVHTC1_G{oNjsNuG)c
zrUEScWQG`*_w(RTAbmFG9bO?2^MzbMiBntb&FDAlOhX0kvmI&K1oRy~enzBJI-3DH
d2U;u~Jn0Q^2{nurr8G`MFGhWdX3Fpr{o$uNW@G>W

diff --git a/unzoner/Dockerfile.template b/unzoner/Dockerfile.template
index c71497e..56e7b6c 100644
--- a/unzoner/Dockerfile.template
+++ b/unzoner/Dockerfile.template
@@ -14,44 +14,48 @@ ARG BUILD_OPENVPN
 ARG BUILD_OPENVPN_VERSION
 ARG BUILD_SNIPROXY
 ARG BUILD_SNIPROXY_VERSION
-ARG BUILD_WANPROXY
-ARG BUILD_WANPROXY_VERSION
 ARG COMPILE_CODE
 ARG DNS_SUB_DOMAIN
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN install_packages \
-    automake \
-    bison \
-    ca-certificates \
-    cmake \
-    curl \
-    fakeroot \
-    flex \
-    gawk \
-    gettext \
-    libev-dev \
-    liblz4-dev \
-    liblzo2-dev \
-    libpam-dev \
-    libssl-dev \
-    libtool \
-    libudns-dev \
-    openssl \
-    python3-venv
+	automake \
+	bison \
+	ca-certificates \
+	cmake \
+	curl \
+	fakeroot \
+	flex \
+	gawk \
+	gettext \
+	libcap-ng-dev \
+	libev-dev \
+	liblz4-dev \
+	liblzo2-dev \
+	libnl-genl-3-dev \
+	libpam0g-dev \
+	libssl-dev \
+	libtool \
+	libudns-dev \
+	openssl \
+	python3-venv
 
 WORKDIR /data
 
 RUN useradd openssl && (passwd -d openssl || true)
 
+ENV LD_LIBRARY_PATH="/usr/local/ssl/lib64:$LD_LIBRARY_PATH"
+
+RUN update-ca-certificates
+
 RUN if [ "$BUILD_OPENSSL" = '1' ]; then \
-    set -x; git clone --single-branch --branch openssl-$BUILD_OPENSSL_VERSION https://github.com/openssl/openssl \
-    && cd openssl \
-    && chown -hR openssl:openssl . \
-    && if [ '%%BALENA_ARCH%%' = 'armv7hf' ]; then ./config --prefix=/usr/local/ssl shared threads no-async $ARM_OPTIMISE_FLAGS; \
-    elif [ '%%BALENA_ARCH%%' = 'aarch64' ]; then ./config --prefix=/usr/local/ssl shared threads no-async $AARCH64_OPTIMISE_FLAGS; \
-    else ./config --prefix=/usr/local/ssl shared threads no-async; fi && make -j $(nproc); fi
+	set -x; git clone --depth 1 --branch openssl-$BUILD_OPENSSL_VERSION https://github.com/openssl/openssl \
+	&& cd openssl \
+	&& chown -hR openssl:openssl . \
+	&& if [ '%%BALENA_ARCH%%' = 'armv7hf' ]; then ./config --prefix=/usr/local/ssl shared threads no-async $ARM_OPTIMISE_FLAGS; \
+	elif [ '%%BALENA_ARCH%%' = 'aarch64' ]; then ./config --prefix=/usr/local/ssl shared threads no-async $AARCH64_OPTIMISE_FLAGS; \
+	else ./config --prefix=/usr/local/ssl shared threads no-async; fi && make -j $(nproc); fi
 
 USER openssl
 
@@ -62,39 +66,33 @@ USER root
 RUN (deluser --remove-home openssl && delgroup openssl) || true
 
 RUN if [ "$BUILD_OPENSSL" = '1' ]; then \
-    set -x; cd openssl && id && make install_sw \
-    && /usr/local/ssl/bin/openssl version && ldd /usr/local/ssl/bin/openssl; fi
+	set -x; cd openssl && id && make install_sw && ldconfig /usr/local/ssl/lib64 \
+	&& /usr/local/ssl/bin/openssl version && ldd /usr/local/ssl/bin/openssl; fi
 
 # https://stackoverflow.com/a/39006247/1559300
 RUN if [ "$BUILD_OPENVPN" = '1' ]; then \
-    set -x; wget -q https://swupdate.openvpn.org/community/releases/openvpn-$BUILD_OPENVPN_VERSION.tar.gz \
-    && tar -xvf openvpn-$BUILD_OPENVPN_VERSION.tar.gz && cd openvpn-$BUILD_OPENVPN_VERSION \
-    && if [ "$BUILD_OPENSSL" = '1' ]; then CFLAGS='-I/usr/local/ssl/include -Wl,-rpath=/usr/local/ssl/lib -Wl,-rpath=/usr/local/ssl/lib64 -L/usr/local/ssl/lib -L/usr/local/ssl/lib64' ./configure; else ./configure; fi \
-    && make -j $(nproc) && make check && make install \
-    && /usr/local/sbin/openvpn --version \
-    && ldd /usr/local/sbin/openvpn; fi
+	set -x; curl --retry 3 --silent --fail -o openvpn-$BUILD_OPENVPN_VERSION.tar.gz https://swupdate.openvpn.org/community/releases/openvpn-$BUILD_OPENVPN_VERSION.tar.gz \
+	&& tar -xvf openvpn-$BUILD_OPENVPN_VERSION.tar.gz && cd openvpn-$BUILD_OPENVPN_VERSION \
+	&& if [ "$BUILD_OPENSSL" = '1' ]; then CFLAGS='-I/usr/local/ssl/include -Wl,-rpath=/usr/local/ssl/lib -Wl,-rpath=/usr/local/ssl/lib64 -L/usr/local/ssl/lib -L/usr/local/ssl/lib64' ./configure; else ./configure; fi \
+	&& make -j $(nproc) && make check && make install \
+	&& /usr/local/sbin/openvpn --version \
+	&& ldd /usr/local/sbin/openvpn; fi
 
 RUN if [ "$BUILD_SNIPROXY" = '1' ]; then \
-    git clone https://github.com/dlundquist/sniproxy.git \
-    && cd sniproxy \
-    && git checkout $BUILD_SNIPROXY_VERSION \
-    && ./autogen.sh \
-    && ./configure \
-    && make install; fi
+	git clone https://github.com/dlundquist/sniproxy.git \
+	&& cd sniproxy \
+	&& git checkout $BUILD_SNIPROXY_VERSION \
+	&& ./autogen.sh \
+	&& ./configure \
+	&& make install; fi
 
 RUN if [ "$BUILD_BIRD" = '1' ]; then \
-    wget -q https://bird.network.cz/download/bird-$BUILD_BIRD_VERSION.tar.gz \
-    && tar -xvf bird-$BUILD_BIRD_VERSION.tar.gz && cd bird-$BUILD_BIRD_VERSION \
-    && mkdir -p tools/ \
-    && wget -qO tools/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' \
-    && wget -qO tools/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' \
-    && autoreconf && ./configure && make -j $(nproc) && make install; fi
-
-RUN if [ "$BUILD_WANPROXY" = '1' ]; then \
-    wget -q http://wanproxy.org/releases/wanproxy-$BUILD_WANPROXY_VERSION.tar.gz \
-    && tar zxf wanproxy-$BUILD_WANPROXY_VERSION.tar.gz \
-    && cd wanproxy-$BUILD_WANPROXY_VERSION/programs/wanproxy \
-    && make && cp wanproxy /usr/local/sbin; fi
+	set -x; wget -qO bird-$BUILD_BIRD_VERSION.tar.gz https://bird.network.cz/download/bird-$BUILD_BIRD_VERSION.tar.gz \
+	&& tar -xvf bird-$BUILD_BIRD_VERSION.tar.gz && cd bird-$BUILD_BIRD_VERSION \
+	&& mkdir -p tools/ \
+	&& wget -qO tools/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' \
+	&& wget -qO tools/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' \
+	&& autoreconf && ./configure && make -j $(nproc) && make install; fi
 
 WORKDIR /root
 
@@ -107,7 +105,7 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 COPY requirements.txt /requirements.txt
 
 RUN pip3 install --upgrade pip setuptools wheel \
-    && pip3 install --upgrade -r /requirements.txt
+	&& pip3 install --upgrade -r /requirements.txt
 
 COPY src/tests/requirements.txt /_requirements.txt
 
@@ -129,40 +127,33 @@ WORKDIR /root/build
 RUN set -a && . /run/secrets/env && src/tests/run
 
 RUN if [ "$COMPILE_CODE" = '1' ]; then \
-    install_packages ccache \
-    && pip3 install --upgrade \
-    nuitka \
-    ordered-set \
-    patchelf \
-    && mkdir -p app && cd app \
-    && nuitka3 \
-    --remove-output \
-    --assume-yes-for-downloads \
-    --output-dir=$(uname -m) \
-    --plugin-enable=pylint-warnings \
-    --standalone application.py \
-    && cd "$(uname -m)/application.dist" && ln -s ../../templates/ && cd ../.. \
-    && cd .. && mkdir -p src && cd src \
-    && for src in log gen_hash as_prefixes main auth client; do \
-    nuitka3 \
-    --remove-output \
-    --assume-yes-for-downloads \
-    --output-dir=$(uname -m) \
-    --plugin-enable=pylint-warnings \
-    --standalone $src.py; done; fi
+	install_packages ccache \
+	&& pip3 install --upgrade \
+	nuitka \
+	ordered-set \
+	patchelf \
+	&& mkdir -p app && cd app \
+	&& nuitka3 \
+	--remove-output \
+	--assume-yes-for-downloads \
+	--output-dir=$(uname -m) \
+	--plugin-enable=pylint-warnings \
+	--standalone application.py \
+	&& cd "$(uname -m)/application.dist" && ln -s ../../templates/ && cd ../.. \
+	&& cd .. && mkdir -p src && cd src \
+	&& for src in log gen_hash as_prefixes main auth client; do \
+	nuitka3 \
+	--remove-output \
+	--assume-yes-for-downloads \
+	--output-dir=$(uname -m) \
+	--plugin-enable=pylint-warnings \
+	--standalone $src.py; done; fi
 
 # creates encrypted app.tgz.enc bundle
 RUN set -a && . /run/secrets/env && utils/encrypt.sh
 
 WORKDIR /opt
 
-RUN set -a \
-    && . /run/secrets/env \
-    && mkdir -p /usr/share/GeoIP/ \
-    && wget -q "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=$MAXMIND_LICENSE_KEY&suffix=tar.gz" -O - | gunzip -d - > /usr/share/GeoIP/GeoIP.dat \
-    && wget -q "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=$MAXMIND_LICENSE_KEY&suffix=tar.gz" -O - | gunzip -d - > /usr/share/GeoIP/GeoLiteCity.dat \
-    && wget -q "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=$MAXMIND_LICENSE_KEY&suffix=tar.gz" -O - | gunzip -d - > /usr/share/GeoIP/GeoIPASNum.dat
-
 COPY systemd/* ./systemd/
 
 
@@ -177,6 +168,8 @@ ENV VIRTUAL_ENV /root/venv3
 
 ENV PATH "$VIRTUAL_ENV/bin:$PATH"
 
+ENV LD_LIBRARY_PATH="/usr/local/ssl/lib64:$LD_LIBRARY_PATH"
+
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV PYTHONUNBUFFERED 1
@@ -191,8 +184,6 @@ COPY --from=build /usr/local/ /usr/local/
 
 COPY --from=build /root/venv3/ /root/venv3/
 
-COPY --from=build /usr/share/GeoIP/ /usr/share/GeoIP/
-
 COPY --from=build /opt/systemd/entry.sh /usr/bin/entry.sh
 
 COPY --from=build /opt/systemd/balena.service /etc/systemd/system/balena.service
@@ -201,75 +192,78 @@ RUN [ -f /usr/local/sbin/openvpn ] || install_packages openvpn
 
 RUN [ -f /usr/local/sbin/sniproxy ] || install_packages sniproxy
 
-RUN [ -f /usr/local/ssl/bin/openssl ] && (rm -f /usr/local/bin/openssl && ln -s /usr/local/ssl/bin/openssl /usr/local/bin/openssl) \
-    || install_packages openssl
+RUN [ -f /usr/local/ssl/bin/openssl ] \
+	&& (rm -f /usr/local/bin/openssl && ln -s /usr/local/ssl/bin/openssl /usr/local/bin/openssl) \
+	|| install_packages openssl
 
 RUN which bird || install_packages bird
 
 RUN install_packages \
-    bash \
-    bridge-utils \
-    ca-certificates \
-    coreutils \
-    cryptsetup \
-    curl \
-    dbus \
-    dnsmasq \
-    dnsutils \
-    e2fsprogs \
-    fdisk \
-    findutils \
-    gawk \
-    geoip-bin \
-    geoip-database \
-    gettext \
-    git \
-    grep \
-    haveged \
-    hdparm \
-    hostapd \
-    iftop \
-    iperf \
-    iproute2 \
-    ipset \
-    iptables \
-    iputils-ping \
-    iputils-tracepath \
-    iw \
-    jq \
-    kmod \
-    libev4 \
-    libevent-2.1 \
-    liblz4-1 \
-    liblzo2-2 \
-    libpcre3 \
-    libtool \
-    libudns0 \
-    linux-firmware \
-    lsof \
-    miniupnpc \
-    mtr \
-    net-tools \
-    netcat-openbsd \
-    nmap \
-    openntpd \
-    openssh-server \
-    procps \
-    psmisc \
-    sipcalc\
-    socat \
-    stunnel \
-    sysstat \
-    systemd-sysv \
-    tcpdump \
-    telnet \
-    udev \
-    usbutils \
-    vim \
-    wget \
-    whois \
-    wireless-tools \
-    zlib1g
+	bash \
+	bridge-utils \
+	ca-certificates \
+	coreutils \
+	cryptsetup \
+	curl \
+	dbus \
+	dnsmasq \
+	dnsutils \
+	e2fsprogs \
+	fdisk \
+	findutils \
+	gawk \
+	gettext \
+	git \
+	grep \
+	haveged \
+	hdparm \
+	hostapd \
+	iftop \
+	iperf \
+	iproute2 \
+	ipset \
+	iptables \
+	iputils-ping \
+	iputils-tracepath \
+	iw \
+	jq \
+	kmod \
+	libcap-ng0 \
+	libev4 \
+	libevent-2.1 \
+	liblz4-1 \
+	liblzo2-2 \
+	libnl-genl-3-200 \
+	libpcre3 \
+	libtool \
+	libudns0 \
+	linux-firmware \
+	lsof \
+	miniupnpc \
+	mtr \
+	net-tools \
+	netcat-openbsd \
+	nmap \
+	openntpd \
+	openssh-server \
+	procps \
+	psmisc \
+	sipcalc\
+	socat \
+	stunnel \
+	sysstat \
+	systemd-sysv \
+	tcpdump \
+	telnet \
+	udev \
+	usbutils \
+	vim \
+	wget \
+	whois \
+	wireless-tools \
+	zlib1g
+
+RUN update-ca-certificates
 
 RUN (groupadd bird || true) && (useradd -r -g bird bird || true)
 
@@ -290,7 +284,7 @@ RUN systemctl set-default multi-user.target \
 	systemd-remount-fs.service \
 	&& systemctl enable /etc/systemd/system/balena.service \
 	ssh.service \
-    openntpd.service
+	openntpd.service
 
 STOPSIGNAL SIGRTMIN+3
 
diff --git a/unzoner/functions b/unzoner/functions
index d17935a..e42ae56 100644
--- a/unzoner/functions
+++ b/unzoner/functions
@@ -294,28 +294,11 @@ function generate_vpn_profile() {
 function download_ipasn_db() {
     mkdir -p ${DATADIR}
     pushd ${DATADIR}
-    with_backoff wget --no-clobber "${IPASN_DB}"
+    with_backoff wget --ca-directory=/etc/ssl/certs --no-clobber "${IPASN_DB}"
     popd
 }
 
 
-# start WANProxy server
-function start_wanproxy_server() {
-    local temp_file=$(mktemp) && \
-      ($(which wanproxy) -c ${WORKDIR}/server.conf &>${temp_file}&) && \
-      sleep 5 && \
-      local port=$(grep -Po "[0-9]+$" ${temp_file}) && \
-      rm ${temp_file} && \
-      local pid=$(netstat -a -n -p | grep ${port} | grep -Po "[0-9]+/wanproxy" | awk -F'/' '{print $1}') && \
-
-      if [[ "${WANPROXY}" == "SOCAT" ]]; then
-          $(which socat) TCP${AF}-LISTEN:${SOCAT_PORT},su=nobody,fork,reuseaddr TCP${AF}:localhost:${port} &
-      fi
-
-      echo ${pid} ${port}
-}
-
-
 # get remote ping host
 function get_ping_host() {
     for rtnum in 5; do
diff --git a/unzoner/id_rsa.secret b/unzoner/id_rsa.secret
index 49a60db96ff6e45da10bdeae2030244337196ad0..052464881070c6b9a1e21889fc632ead3cdb9e2c 100644
GIT binary patch
literal 2292
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
O>b$|kx+Xy47du&Scwra-

literal 2295
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
R9fHLz(kbQJzHAvDRsGjgSkeFh

diff --git a/unzoner/mgmt.ovpn.secret b/unzoner/mgmt.ovpn.secret
index c641da1fb930caa1e16e9e9da511c0b9c1932947..243ee7fe4a83f078b9815b2708a672f29084cdca 100644
GIT binary patch
literal 4499
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

literal 4501
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

diff --git a/unzoner/openvpn/client.key.secret b/unzoner/openvpn/client.key.secret
index a8c8427387282fda897d07234ed20bc0895c7467..4742be73855e456415546f3dbc6b09af89592c96 100644
GIT binary patch
literal 2308
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

literal 2310
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

diff --git a/unzoner/openvpn/dh2048.pem.secret b/unzoner/openvpn/dh2048.pem.secret
index 6494d8411725421cd02e0512c7514cc801a78831..e3f140a98e96c7d67f0fa4ce006aa49fa723f336 100644
GIT binary patch
literal 1344
zcmV-G1;6@*0t^F2<0md9g;;U{5BmoYOgoEr1kGrt+rInUrc}H3@~=|*MV}n<&}^19
zDL!?k@8hvy>?(lR!rH5aP&Isk0cy_q&C3B--0-@iLb$R!z=4Pe9|N8e5sa`0<oI(}
zF8bo;BFGIva&GiY-+TJ4oQ*v^5~E3P$b=V=wqn{~deIa^Mc@BS&#WY#PUd-RH<=80
z9Jw?jk3M4aa8qeA2Ry*mwoX-^H5SBEpQ!g?lH>*SP*H428U<z&2Sbhk>%Z_Vtz<$j
z@slfrmSik>P)lNRcRR(&Yf|;$BU2G->om-NalX1O(eA}ytGZUX40<?Yv8L3`t03?;
zDM>Vqe>KWVZrb`T#k;S-$#?hnrEB8QXCkifWA;YpBOx#ICu*}^oZ8TS_M}7%x>xcJ
zitJW)$;lsJKAk9+6jsKYF2bHX+_3hzusvB}Gc@=;&>}m4`&vmW=DvEd5R%Hb!qX5x
zDp1SESx;=@rFDIDxnazEgb5hiODEK`fS2sZDFM7>0>|>v2<ZxI$%@D+BtcZ4do*>2
zO5+%e4)vo+G~6-Ibu1&L{pyWLQ2YLJi&yzHtzBy)(0MOE85_c_$;AqqK`}i)7w|~S
zas!ZRI6x&rPZTC+;?soY#4ztfHCJc+-eQGC&;dnwMAt1o&YvnHaiS*$mGQ@$^$j%N
zOC@}q&m<?KlhJ|m2uFnhi~~yUUU_9b7~ug70HOvM*J@Sfa&nzf=lWoSAo}=pFt=f=
znU`MqLcimZ;MdCgY)<F0=bF;aK^rKphp`H*mcRbKX_@p2sbi4i$+HBTBp{7hweK43
z+tuze{vBBoMgBHCcX-14A_}OSDTr(iIO5dt_|LM?U@M%f#CW6!uo;HG$#4eVdKkWH
z0eH@ba-wywj(znWdgzzz{c;}U8U(J^hnlW%@W7CoU(Ka}mC+#3f&pb4->rE)6_zX5
zg5Jm`#OgnKFxV~O%j&w(8UKi)_Z3T~b@Q_hTu=Wdx!hVsW9L`1?qr`Uxt?uIC1jxs
z|Mg}11yMeBZPV(vKOWBf8y=;aNNB_pg^MaKF<aN&)Jft{C(FjcYaOl^n&IK^NQE<K
zn{VG%%;6zP821!}>(fd+wqu*HN(Q<}f_MLmO%EvTM7p^i+s@H!fQzC3P><r-VDPIg
zSBb0*n4bg3FRDx;uJ|8p`-7s_Mr=!Rs9xG?Tx{VO>{E#WsxhATg5<8Iu3%FxiPFH|
z0T$;yE3GEJza6KqD6<o=g-~aMt_+&}P3CIE(7ixW5Jmv@Qp`ntS_z?OJ-0g?MpAhl
z@25BZPJcx_xsGzPAMvn+RU#%r_;_ZZCCme{GCVl8>~NY>hEoeX(8|otF;-dHZ-AS>
zFEcUt+b<iF)aOrt5YVeus)y^s7&Ir7aW5px0iBABx`Ghv7N)J_<iCSYLK7Sq5O$L7
zV0>Ws0U@(9YLa0g%)1CyNfmWh_iwGvML4(?!MXziKSC{Q0HtvXR+B6z)5Ihig*Q)z
z+cN^=oG#wCQs=q%daAEns?vq7z>&@Jz$d;jWu*VG>ZD*b{cCihA<sLC`}%(T_Bv3H
zxu1OsbYc$Lz;&5*L|)rYT@H?oM3}u7@MIXpdTB3gI0<?qh+Kb}9hr|>KG#P3cL(w6
zV6!VLF2X~V&F4f&{#!TWQ(=WylgVwH4T_rY8pGdTGi&T_fqb^|mBIWGbG!VR#W)MD
z;DN*>veUdK;?}YKP!<@sUd+0SV+ZAi0T*H@=MDOWP6q29PfuF3$(?j7eXngPkX4G~
CAfK85

literal 1345
zcmV-H1-|-)0t^F2<0md9g;;U{5C2vpAjF-xEE2m>bR{xBzEd7G4LZ4ptP3kwh~*$W
z(CnlGa{BBKC4GkumPDF_+WR?xk1y+VHJ25Gj2V?p=H@Xi<0COgP}{WL>c!kWF`3_m
ztdS@$eB_Xe1%@FxAZ*I5X5W;Us#qvPrYPkX?=ZgB!9QzSWFt^Zf2gE_W7?qt7^)q{
z;B{|xax2)9`dl3GGJH*$t{gqTe{)rzB*)wJ-+w|S4(*s=c_#Wmk_A-r8BtHY|A!Cu
z@lG;Frnz=P?|H9iVn%Pj>TV)}J(`-y7}hp{x6D&8DC$iHy|=tls(J%*CfHFlj55<r
z7ay#o;jBZ5=N5!-jQTmBG4j{|Jy&`x%Z4`_>X<18Q1RV&IJ>qkI9)sp=CW-&sp77u
z%18qYujYa>oWmCpwEo=qNJRTiETwXPSRdEwnwOPJ{5j=xjNc@Ov|-vFO>#24Dnf@v
zHAlHsYel^t43c|+&vOM9=5*PnXSMZsp}F%Mp!;GS%nvv+0_v&fqgRZ@^RIwY^V8!T
zd$$520a3_``swE)yZZcB{o4-_I<Si=t@uZ+@%M|!yac&hG7Z#HV7GC`P8}8lVe7vC
zf7Y`rv{Sm3IdYg&TPy&7@_f8VgKL0`_PWv;PZY_?VGU{QF9$QFDZynpXK#;cjt)Ox
zc7b={lPY_OgPy9mCl`eQi~~yUUU_9b7~ug6{wObv-#X+#gsW<0E?)*Dl&#C`sMSQ{
z!AXEAt{(Ixc<yV!*Q$*^hduI&1a7NZg(-I#a*s;qkEuf8;A=*$WSpavGv!S4Y21zf
zW70p~qF`1$7hJ@dSNOLdN*;h+t(1_{Rns9-RTOd?Sz{}Br)y+=3Rs$dMKT*->zt%p
zOdAktV8!^$H=o+q;w@x|HkdsuLDOF*!3ce`7#$%3#uEKvI2X7#E1#*v%RyM*ItE6E
zg39vg{Sd3oOWj<$j!}2I+Z`TyGv$gBnGOuq4Wr^{Tqz7HUatQj7w{XtJqt}o?LaL;
zPJxRyDm@bJA!HmFH&$;XfC_2p1e!i^$xIW@1zyaOByn9|({;}@mqDB_$MYfFok)kc
znDIip|EN5y9<1ul-VxYp87Yir<G`F!zlbb1ZQC+;>toulA{Mn8lstY%1t^Cn)Rv9L
z_0rv83QXEq9}hCYTOEcv&Ae}}@D#f5xJp92u<82v)+d5;UnR~o27&Akok9}JUedte
z0p&7>I4oK<i3(yjsxb=m_5SGV{C^#<!)h6xJPly^Y$lsw3Jk2XYMxqUQ`;<kB*y1A
z8ADa!#Vf)RufXhjopY)2#Zv0gUQvontTNK{pb&*qiG=_77lzYKS=|D}u@aMqT~me1
z#}*^K*i5>`_tNv4_!5tb|0}yy2t8NqaR_O)MA<Sx*h+D=>svE^vn+*uE|KND=+Ee~
zvvKh9fr^>V4fvG*Ql+>^(22pr8^^=_x1dhNGyP#@xHXTn_?S}Cl|wp$T}KC%R0(sQ
z{HN`_AFiUZlT7t=b_qNNrj0k=8sC(}TAn6*Da5`icWjJYGQIH}`**S{g)2uT;Mhnw
zZmH|dqp2RYUyWGqGjU5o>)~s+hxW?aD)6M2=@uLYGGsz7x1?qH-+?afATb)Ewf?j>
z7Rr7~QtU`RXX{Zgpl-SMe8(3Gz~?Woa@n6P>;pkOhKCV7H(S;9UN~`v@$WFo6=gv-
zq<y)F2SLXsD6ZQnSGcTv@a_B9v{i@MR{DU{>O#FKMTiZbt0v+CQ&=>OJL3;i<8SO;
DTrQDM

diff --git a/unzoner/openvpn/server.key.secret b/unzoner/openvpn/server.key.secret
index 7ffa416407c9e757146820f28a3f78d7afdeba18..7816beceb31da5b8c070e58bd5aece4f27790ed4 100644
GIT binary patch
literal 2314
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

literal 2316
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

diff --git a/unzoner/openvpn/ta.key.secret b/unzoner/openvpn/ta.key.secret
index 231bbdb359c80e294e13872c4af9217fd2ef74c6..f74f001541f296c6050921fb6d5c577933cebcd9 100644
GIT binary patch
literal 1380
zcmV-q1)KVX0t^F2<0md9g;;U{5B@IO6$!_Lg_%BA9#!|KfB__ZdAW75>kw^!&81wR
zwb2~stX%9i1TVbJ3a*$!Ln9wagr?QRe9qHdyh}S}(FjSNxpPp@BB1PT9m5Xnc^6{j
z_^bp8WJxR<4tzG%c1EUzCJ6}3tI6^em&4)ovPvsMGXBw}ASn9D>D4tlceQw7k3C}F
z3p_k%69kuxZNf-WqI$tQd2M=)OTWj(OEYev1OD5)y1)7VxWl7pmz7uB5#AI6Cgo#$
z;!J0~gU&s=WW&%nX-COtS5}xKEL?O4@dNXWJ|NLhU5V*BhuaZY6t+BS%!G%^+$}U1
zEqNCBKNCPtE)uEPPh3O*9UV~J)((Fm@CYsna%X(13eUoER!yDN&fwPlG$fegXpXrM
zXVCj+ky!+H=u0WK7s>`-{_HGs&s3_wXVC))YAM0#-Ei-A4MZdC4|gxU#_FZIv4oso
zNXOXs5!qG``a=9qbY!alp6sp_Yy68WSh{u<qUYdHzGlh}C-t_`mRzS&|Bi+f`4fSy
zwp^JSLD~`?1IBP-E&}_+cED4Qx1)WSa{Ve3MBkW>A~UYH<$_5P_MB<mEf_U?Yv)%S
zo>_erw4yCM@I4Toq|LImb*B4H07Ya*)P9L(5lS7xqu<#aH#n+bGMqcZMcx<ueN$)^
z0+Msv+2Ccb+osJYNJxbNi~~yUUU_9b7~ug70GbQTI(vW*r*HnsRNqQlscvOziks^X
z`YSXg_wQQ&V!h{*i||Y;lvv+hkzz*f7pou}Pe5SRez)qcvL$rT>3F)&bejijU&g&p
z;g4&dPhSH5_DAbIF-M~;gW$mhtWfPwH`S^htZ~iukuP?o3PL(T>$peD0x}JbkOT_6
zyi$gJ$p2<Pumwe1EF0KrkUP0Q=fTKwz<|Vwr6ltAH|PN+Oa2(cz0PQn0_SWbvXYut
zATRd)*c#!{w)MKCx&vjY9EC&Lf4qpj=Byf~^?v-$H_OKnCB4#8IZpC|$)oOpx6JsC
zN&WKO=fuf-sq`l#U+*hd@l?`V9r<CEK~xQ0=?^Eyi@3Bm3c|7pW}Bs>^9C<ii`ffl
zQCf>%V&o=2Y+2-C0=Cn_bAP<0Q-qJY|BfD+0bWKe54(=EN`wFQHcl8?Uyt}F7{WWq
zph@E>n~8yLwGP$11K*6LI2$MS-gJh#KJ0RbMmeNXMOH6NO*UL;&Dc1|`&^40>e9gj
z0d5pbOvGFbmm9s(_p7ABrCQ8ZDn;zvy&OX*q!yz34ji;=K@7Pb-daX=y6@iVGTw25
zaJQxq#T;cv<o6}{M+__}^xo_}JGgmX^sm<;={*6ht9IjYo(2$1DRQx)(H=w+3E<)l
zJi0>kW}o%CWP5R3unLj<YenmqeN2Oe^enxDDbGAcr9{ng-Uh<?_#b9JBm6gxHf?hT
z%k>hn2&5W{wSEtB#BmeyIvCp~=R&60n*%|ULSJ#6sQs|92Rc(CJ&4?R!IP6A2@6j0
z8-MdO4X<;N6P3`R5(spS_X>%Ytv@-M=7lyuRY^cgG0bJKCkPs}?Tv7|4QXQuJO^pJ
ztGZ?3(1XzgPs?aKq?+?^3=cPOxS=l_trn|AiSud(ug&uLX@}7Exb>co901WDN<;d(
zf-M!n`sc`%d*;e}$PmRj$%Q%mzWJDYg-@J9TubJ;y22?{dm_91U$-WHvZyX0i$ySw
zw&=4hr~gYbu-F$=6^XJGYfL9qwXn`B-JtIunT(t5WyU__Xka<@;k~3Me#?$CKRVW}
m#ztt2T#U=3GmP?Ssbv%FF&nQThD7X@2%Zv2wPa$yr8f1*s->F%

literal 1381
zcmV-r1)BPW0t^F2<0md9g;;U{5CD>)%;sn98%#1w^6N4d=KZW-LM6fY*_);QYHTU+
zuDj&e(_(i&xm@l%=Qr##!Un3((Hy8HAw}D#0xQVC1@FBkC<95L9)!$QU#p0?>Tow2
z;c2C47PGPCtPn}LFAFFfgE#6a(}o?c6b7-Qx}F&H;Y98+Hv9&ZWCES)ef@hb5Dta1
zDnOmPM9C@q5kF;{xmBc4R|nVDOrbZbyDemhpx)l+rra~e>YFN|KUBFn)ybb5kF;z+
z)cTrWF2Xjim)8mi5(4bm&rd_@`ZH=Hsn4YG*gTuw>-zz-Rmvg#!_Vte!{9`1DcO_n
z%_c0TAdR=&@+vCr%(TgSN^mXL+&n5in{M}LU<d2k)}Mx{mx@U0)nKT%fcm|S#l6zv
zWt&n@Oh&9s13<PQraJ<QQ$Y(n?7ByJa@xT+-1%gxV)8Q5B&Pw+AIhVlQI~khz~VKP
zqTvW3UhUzSi*rrH3pzxM1o4R6+x^+d9VSUi?KYe7MmBbSrTHyc7zCzn;(MPv3N>5T
z$cuIvnS`ID*$PI-WkY<+Qz{@fNe_O2b;O_zr0rbriqiQ3i)ef~Xq;}O6(T#7`(1|1
ziPZVlG&&ZxnFc|>gOKpA@@y<mhq*J>pJ=lmZ7PKdd3XG|(06-=Fu)?3a-W4>Eg`6W
zxr-*~_#cRSk0){Ylb3}7i~~yUUU_9b7~ug6|9>_NL8hbA#lF)oi||q6@RwOkqUQJM
zYdo#SHJue{hAb|Q(yG^Y@yUR^5S1B(EB>pL6QA1^h@X%f5&Xow^1}qelS6cdkbO8r
z0M&UEdaa_@?tprh`r@lXX=)i-Jdk4^D@I6DL_EBA*!$J2D^Qkj;!-ZjJ`}zYc)GKu
znpKqE&K^r8^yvFZXa;tMmc}fgU7#Cv39CjQ4z#zfnpu}+!$r9PWZa-f%GSFq7326G
z!c%P8GP5r8YTN0R>KJt>+j+0Oa_V)WqMiIWUQdh0!T}~4SP?e2X|_Ytm^JiGxZhMW
z&07>8lDEOz@y9c%YC^+wD)aGp&}<PZSiftEvX7DgE(E*crOBu=I!)sS@S~#8aMZ*e
zsY)P0O29I);pKcPVc8>|fyJ-Uo-b;~GhA03C4UetY1vm+uP&zjRxk8`w6(rW6|9ER
z7wS~>&TH{vRmAqlhk-m3Xr9|i<;a36BN-$P^_}v?g?9JTPF`Y#(Z3}3bg$l}%hJIF
z0q@g7cX&8P>pl3qP0lG_rU$A_{?PW1JbU7y=GmU4g?dV<p}Q#_$|`VoBokBsmCC`X
zxna+m#}qMp{N4X5a1nai==6DJ{yYqLJ&58_0+zW116P6P_bu4v(S?Obx<5Cn$jaEP
zJO<v8lEe1ZdYtZbR9IG|BmKy*$9o0bh{qC>C0(;qEuwY{to)iEZY#_>oI}EMfKFi>
zQatq=8WP!*Mp)*c;T0|U1^ULRwGn4yMXY7bO=l|V%Z9wJXAN#zx#o=F-O&#|8Z9So
zEw2ORis<!d+sG}AmGST?W{!3NX`(W#))=7DG=M8Dh;dLDzGm(|{LYeJek<5rx4LUI
z7Gf^OSSG7KYhyReLXlF<Tr@aI6oDB@G6E#96G3@r1#VWoWfsn*Nv6}RPwWUk@N6hl
zFVAHZJju`qweHif6qa7hX`$7P?@wJHB$1vC4^7=bNbXotKxd$L<?O|!D;BG5Dv59|
z<Q;&JkZK%R6+3e^Hnd-8G*Yr^`vc+~VfGjrz>?VEK26u*QqdlG63)hQp}m=W$^jmD
n-ix48&z&E0?Ej{9O_0-G4`t1mi47RDU@3vWcOk9$A+w|LdP}vM

diff --git a/unzoner/src/config.py b/unzoner/src/config.py
index b1708c7..c72daa6 100755
--- a/unzoner/src/config.py
+++ b/unzoner/src/config.py
@@ -69,8 +69,6 @@
 PAIRED_DEVICE_GUID = os.getenv('PAIRED_DEVICE_GUID', None)
 PAIRED_DEVICES_FREE = int(os.getenv('PAIRED_DEVICES_FREE', 1))
 PAYPAL_SUBSCRIPTION_CHECK = int(os.getenv('PAYPAL_SUBSCRIPTION_CHECK', 1))
-PING_COUNT = int(os.getenv('PING_COUNT', 10))
-PING_TIMEOUT = int(os.getenv('PING_TIMEOUT', 5))
 POLICY_ROUTING_CHECK = int(os.getenv('POLICY_ROUTING_CHECK', 1))
 POLL_FREQ = int(os.getenv('POLL_FREQ', 100)) # X times per cycle (e.g. LOOP_CYCLE / POLL_FREQ = 4)
 REMOTE_OVERRIDE = os.getenv('REMOTE_OVERRIDE')
@@ -98,8 +96,6 @@
 VPN_TCP_MGMT_PORT = int(os.getenv('VPN_TCP_MGMT_PORT', 7506))
 VPN_UDP_MGMT_PORT = int(os.getenv('VPN_UDP_MGMT_PORT', 7505))
 VPN_USERNAME = os.getenv('VPN_USERNAME', None)
-WANPROXY = os.getenv('WANPROXY', None) # proxy transports: SOCAT or SSH
-WANPROXY_PORT= os.getenv('WANPROXY_PORT', '3300')
 
 ON_POSIX = '' in sys.builtin_module_names
 
diff --git a/unzoner/src/main.py b/unzoner/src/main.py
index 348cd08..7723049 100755
--- a/unzoner/src/main.py
+++ b/unzoner/src/main.py
@@ -68,33 +68,31 @@ def main():
 		)
 	group = p1.groups - 1
 
+	# for information only
 	p2 = re.compile('^.*remote=(.*) country=(.*)$')
 
-	# hdparm tests
+	# (iotest) hdparm tests
 	p3 = re.compile(
 		'^\s+(.*):\s+(\d+\s+.*)\s+in\s+([\d\.]+\s+.*)\s+=\s+(.*)\n$'
 	)
 
-	# dd write
+	# (iotest) dd write
 	p4 = re.compile(
 		'^(\d+\s+.*)\s+\((.*),.*\)\s+.*,\s+(.*),\s+(.*)$'
 	)
 
-	mgmt_ipaddr = None
-	if TUN_MGMT: mgmt_ipaddr = get_ip_address(MGMT_IFACE)
-
 	if DEBUG: print('os.environ: {}'.format(os.environ))
 
 	while True:
-		if DEVICE_TYPE == 0:
+		if DEVICE_TYPE == 0: # disabled
 			log('{}: device={}'.format(this, GUID))
 			sys.exit(0)
 
-		for i in range(1, LOOP_CYCLE + 1):
+		for i in range(1, LOOP_CYCLE + 1): # clunky event loop
 			###########################
 			# server mode(s) or mixed #
 			###########################
-			if DEVICE_TYPE in [1, 3, 4]:
+			if DEVICE_TYPE in [1, 3, 4]: # 1:server 2:unblocking 3:server-mixed 4:private 5:VPN
 				s_lineout = [None, None]
 				s_msg[0] = None
 				s_msg[1] = None
@@ -109,8 +107,7 @@ def main():
 								pass
 					else:
 						if s_stderrq[idx]:
-							with s_stderrq[idx].mutex:
-								s_stderrq[idx].queue.clear()
+							with s_stderrq[idx].mutex: s_stderrq[idx].queue.clear()
 
 					if s_stdoutq[idx]:
 						try:
@@ -127,17 +124,12 @@ def main():
 					if s_msg[idx] in magic_lines:
 						started[idx] = True
 						starting[idx] = False
-						try:
-							log_server_stats(status=started)
-						except:
-							print('exception-handler in {}: {}'.format(this, repr(e)))
-							if DEBUG: print_exc()
+						log_server_stats(status=started)
 
 					if not started[idx] and not starting[idx]:
-						if i == 1: # once per loop (start)
+						if i == 1: # at the beginning of the cycle
 							starting[idx] = True
-							log('{}: cycle={} starting={} proto={}'.format(
-								this,
+							log('vpn-server-state: cycle={} starting={} proto={}'.format(
 								i,
 								starting[idx],
 								proto
@@ -177,7 +169,7 @@ def main():
 								))
 
 						if i == 1 or i % LOOP_CYCLE == 0: # twice per loop (start and end)
-							if DEBUG: log('event-loop-status: cycle={} proto={} status={}'.format(
+							if DEBUG: log('vpn-server-state: cycle={} proto={} status={}'.format(
 								i,
 								proto,
 								get_status(proto=proto)
@@ -186,40 +178,33 @@ def main():
 
 					# flush the stderr queue if not debugging
 					if not DEBUG and s_stderrq[idx]:
-						with s_stderrq[idx].mutex:
-							s_stderrq[idx].queue.clear()
+						with s_stderrq[idx].mutex: s_stderrq[idx].queue.clear()
 
-				if i % LOOP_CYCLE == 0:
-					if DEVICE_TYPE == 3 and connected: # test if double-vpn is up
-						try:
-							shell_check_output_cmd('ip link | grep {}'.format(TUN_IFACE))
-							geo_result = get_geo_location()
-							assert geo_result, '{}: double-vpn not ready'.format(this)
-							print('double-vpn: {}'.format(geo_result))
-							log_server_stats(status=started) # server up only if double-vpn is up
-						except:
-							print('exception-handler in {}: {}'.format(this, repr(e)))
-							if DEBUG: print_exc()
+				if i % LOOP_CYCLE == 0: # at the end of the cycle
+					try:
+						assert started[idx] and not starting[idx] # if not started by now
+					except:
+						started[idx] = False
+						starting[idx] = False
+						s_proc[idx].terminate()
+						while s_proc[idx].poll() is None: sleep(LOOP_TIMER) # https://stackoverflow.com/a/2996026/1559300
+						s_pid[idx] = None
 
-							try:
-								log_server_stats() # force server down if double-vpn is down
-							except:
-								print('exception-handler in {}: {}'.format(this, repr(e)))
-								if DEBUG: print_exc()
-					else:
+					if DEVICE_TYPE == 3 and connected: # test if client-vpn is up
 						try:
-							log_server_stats(status=started)
+							shell_check_output_cmd('ip link | grep {}'.format(TUN_IFACE)) # raises exception if tunnel is down
+							log_server_stats(status=started) # server up only if client-vpn is up
 						except:
-							print('exception-handler in {}: {}'.format(this, repr(e)))
-							if DEBUG: print_exc()
+							log_server_stats() # force server down if client-vpn is down
+					else:
+						log_server_stats(status=started)
 
-					s_status_line = 'server-status: cycle={} started={} starting={} s_pid={} s_conns={} mgmt_ipaddr={} AF={} hostAPd={} UPNP={}'.format(
+					s_status_line = 'server-status: cycle={} started={} starting={} s_pid={} s_conns={} AF={} hostAPd={} UPNP={}'.format(
 						i,
 						started,
 						starting,
 						s_pid,
 						s_conns,
-						mgmt_ipaddr,
 						AF,
 						AP,
 						UPNP
@@ -229,15 +214,15 @@ def main():
 			###########################
 			# client mode(s) or mixed #
 			###########################
-			if DEVICE_TYPE in [2, 3, 5]:
+			if DEVICE_TYPE in [2, 3, 5]: # 1:server 2:unblocking 3:server-mixed 4:private 5:VPN
 				# iperf timeout
 				if c_stp and now - c_stimer > (LOOP_TIMER * LOOP_CYCLE * 5):
-					log('{}: pid={} elapsed={}'.format(
-						this,
+					log('iperf-status: pid={} elapsed={}'.format(
 						c_stp.pid,
 						now - c_stimer
 					))
 					c_stp.terminate()
+					while c_stp.poll() is None: sleep(LOOP_TIMER)
 					c_stp = None
 					c_stq = None
 					c_stimer = 0
@@ -258,8 +243,7 @@ def main():
 
 				# hdparm or dd timeout
 				if c_iotp and now - c_iotimer > (LOOP_TIMER * LOOP_CYCLE * 3):
-					log('{}: pid={} elapsed={} test={}'.format(
-						this,
+					log('iotest-status: pid={} elapsed={} test={}'.format(
 						c_iotp.pid,
 						now - c_iotimer,
 						c_iott
@@ -272,14 +256,12 @@ def main():
 						}
 						log('run_iotest: result={}'.format(result))
 						res = update_iotest(data=result)
-						log('update_iotest({}): {}'.format(
-							res[0],
-							res[1]
-						))
+						log('update_iotest({}): {}'.format(res[0], res[1]))
 					except Exception as e:
 						print('exception-handler in {}: {}'.format(this, repr(e)))
 						if DEBUG: print_exc()
 					c_iotp.terminate()
+					while c_iotp.poll() is None: sleep(LOOP_TIMER)
 					c_iotp = None
 					c_iotq = None
 					c_iotimer = 0
@@ -295,8 +277,7 @@ def main():
 							pass
 				else:
 					if c_stderrq:
-						with c_stderrq.mutex:
-							c_stderrq.queue.clear()
+						with c_stderrq.mutex: c_stderrq.queue.clear()
 
 				c_lineout = None
 				if c_stdoutq:
@@ -383,18 +364,14 @@ def main():
 				if c_msg in magic_lines:
 					connected = True
 					connecting = False
-					try:
-						log_client_stats(status=connected, country=c_country)
-					except:
-						print('exception-handler in {}: {}'.format(this, repr(e)))
-						if DEBUG: print_exc()
+					log_client_stats(status=connected, country=c_country)
 
 				if DEVICE_TYPE == 5:
 					try:
 						m3 = p2.search(c_msg).groups()
 						c_remote = m3[0]
 						c_country = m3[1]
-						log('{}: remote={} country={}'.format(
+						log('vpn-client-state: remote={} country={}'.format(
 							this,
 							c_remote,
 							c_country
@@ -402,11 +379,10 @@ def main():
 					except (IndexError, TypeError, AttributeError):
 						pass
 
-				if not connected and not connecting:
-					if i == 1:
+				if not connected and not connecting: # connect client-vpn
+					if i == 1: # at the beginning of the cycle
 						connecting = True
-						log('{}: cycle={} connecting={} family={}'.format(
-							this,
+						log('vpn-client-state: cycle={} connecting={} family={}'.format(
 							i,
 							connecting,
 							AF
@@ -416,13 +392,16 @@ def main():
 								family=AF
 							)
 							c_pid = c_proc.pid
+							connected = True
+							connecting = False
 						except AssertionError as e:
+							connected = False
 							connecting = False
 							print('exception-handler in {}: {}'.format(this, repr(e)))
 							if DEBUG: print_exc()
 
 				if connected and not connecting:
-					if i % LOOP_CYCLE == 0:
+					if i % LOOP_CYCLE == 0: # at the end of the cycle
 						# run speedtest
 						try:
 							if not c_stimer and dequeue_speedtest():
@@ -461,36 +440,32 @@ def main():
 								c_iotl
 							))
 
-					if i % POLL_FREQ == 0: # every x cycles per loop
-						try:
-							shell_check_output_cmd('ip link | grep {}'.format(TUN_IFACE))
-							geo_result = get_geo_location()
-							assert geo_result, '{}: client tunnel down'.format(this)
-							print('client-vpn: {}'.format(geo_result))
-						except AssertionError as e:
-							print('exception-handler in {}: {}'.format(this, repr(e)))
-							if DEBUG: print_exc()
-							connected = False
-							connecting = False
-							c_proc.terminate()
-							c_pid = None
-
-				if i % LOOP_CYCLE == 0:
+				if i % LOOP_CYCLE == 0: # at the end of the cycle
 					try:
-						log_client_stats(status=connected, country=c_country)
-					except:
+						shell_check_output_cmd('ip link | grep {}'.format(TUN_IFACE)) # raises exception if tunnel is down
+						geo_result = get_geo_location()
+						assert geo_result, '{}: client tunnel down'.format(this)
+						print('client-vpn-geo: {}'.format(geo_result))
+						if DEVICE_TYPE == 3: log_server_stats(status=started) # server up only if client-vpn is up
+					except Exception as e:
 						print('exception-handler in {}: {}'.format(this, repr(e)))
 						if DEBUG: print_exc()
-
+						connected = False
+						connecting = False
+						c_proc.terminate()
+						while c_proc.poll() is None: sleep(LOOP_TIMER)
+						c_pid = None
+						if DEVICE_TYPE == 3: log_server_stats() # force server down if clienv-vpn is down
+
+					log_client_stats(status=connected, country=c_country)
 					w_clnts = get_stations()
-					c_status_line = 'client-status: cycle={} connected={} connecting={} c_proto={} c_pid={} w_clnts={} mgmt_ipaddr={} AF={} hostAPd={} UPNP={}'.format(
+					c_status_line = 'client-status: cycle={} connected={} connecting={} c_proto={} c_pid={} w_clnts={} AF={} hostAPd={} UPNP={}'.format(
 						i,
 						connected,
 						connecting,
 						c_proto,
 						c_pid,
 						w_clnts,
-						mgmt_ipaddr,
 						AF,
 						AP,
 						UPNP
diff --git a/unzoner/src/tests/run b/unzoner/src/tests/run
index b78f87c..41302c1 100755
--- a/unzoner/src/tests/run
+++ b/unzoner/src/tests/run
@@ -16,7 +16,7 @@ function finish() {
 trap finish EXIT
 
 function install_venv() {
-    python3.9 -m venv src/tests/venv
+    python3 -m venv src/tests/venv
 
     export PATH="$(pwd)/src/tests/venv/bin:${PATH}"
 
diff --git a/unzoner/src/vpn.py b/unzoner/src/vpn.py
index 8ce9662..31592cf 100755
--- a/unzoner/src/vpn.py
+++ b/unzoner/src/vpn.py
@@ -31,9 +31,6 @@
 ipaddr = None
 qtype = None
 c_proto = None
-c_wpid = None
-s_wpid = None
-s_wport = None
 
 
 @retry(Exception, cdata='method={}'.format(stack()[0][3]))
@@ -110,35 +107,11 @@ def get_openvpn_binary(default='/usr/sbin/openvpn'):
 def connect_node(family=AF):
 	global PROTOS
 	global c_proto
-	global c_wpid
-	global s_wpid
-	global s_wport
 	global ipaddr
 	global country
 	global host
 	global qtype
 
-	try:
-		log('os.kill: {}'.format(c_wpid))
-		os.kill(int(c_wpid), signal.SIGKILL)
-	except:
-		pass
-
-	c_wpid = None
-
-	try:
-		log('kill_remote_pid: {}'.format(
-			kill_remote_pid(
-				ipaddr=ipaddr,
-				family=family,
-				pid=s_wpid
-			)
-		))
-	except:
-		pass
-
-	s_wpid = None
-	s_wport = None
 	ipaddr = None
 
 	if len(PROTOS) <= 0: PROTOS = list(TUN_PROTO) # start again
@@ -331,39 +304,6 @@ def connect_node(family=AF):
 					ipaddr
 				))
 
-		##############################
-		# (legacy) WANProxy override #
-		##############################
-		if WANPROXY:
-			(c_wpid, s_wpid, s_wport) = start_wanproxy_server(
-				ipaddr=ipaddr,
-				family=family,
-				local_pid=c_wpid,
-				remote_pid=s_wpid,
-				port=s_wport
-			)
-
-			log('start_wanproxy_server: ipaddr={} af={} local_pid={} remote_pid={} remote_port={} transport={}'.format(
-				ipaddr,
-				family,
-				c_wpid,
-				s_wpid,
-				s_wport,
-				WANPROXY
-			))
-
-			port = WANPROXY_PORT
-			ipaddr = 'localhost'
-			tun_proto = 'tcp'
-			if family == 6: tun_proto = '{}{}'.format(tun_proto, family)
-			log('{}: wan_proxy={} proto={} ipaddr={} port={}'.format(
-				stack()[0][3],
-				WANPROXY,
-				tun_proto,
-				ipaddr,
-				port
-			))
-
 		if FRAGMENT and tun_proto == 'udp':
 			cmd.append('--tun-mtu')
 			cmd.append(TUN_MTU)
@@ -572,9 +512,7 @@ def get_client_status():
 	bytesin = 0
 	bytesout = 0
 	try:
-		status = open('{}/client.status'.format(
-			TEMPDIR
-		)).read().split('\n')
+		status = open('{}/client.status'.format(TEMPDIR)).read().split('\n')
 		bytesin = [line.split(',')[1] for line in status if line.split(',')[0] == 'TCP/UDP read bytes'][0]
 		bytesout = [line.split(',')[1] for line in status if line.split(',')[0] == 'TCP/UDP write bytes'][0]
 	except IndexError:
@@ -791,102 +729,6 @@ def restart_stunnel_client(
 	return run_shell_cmd(['%s' % stunnel_bin, '%s' % conf])
 
 
-def start_wanproxy_server(
-	ipaddr=None,
-	family=4,
-	local_pid=None,
-	remote_pid=None,
-	port=None,
-	ssh_port=DOCKER_SSH_PORT
-):
-	if WANPROXY == 'SSH':
-		remote_guid = get_guid_by_public_ipaddr(ipaddr=ipaddr, family=family)
-		assert remote_guid
-		if DEBUG: print( 'get_guid_by_public_ipaddr: ipaddr={} family={} remote_guid={}'.format(
-			ipaddr,
-			family,
-			remote_guid
-		))
-
-	if not (port and remote_pid):
-		if WANPROXY == 'SSH':
-			# start WANProxy server instance and get remote port for forwarding
-			result = run_shell_cmd(
-				[
-					'ssh', '-i', '%s/id_rsa' % WORKDIR,
-					'-o StrictHostKeyChecking=no',
-					'root@%s' % ipaddr,
-					'-p', '%s' % str(ssh_port),
-					'bash',
-					'-c',
-					'"source %s/functions; source %s/.env; start_wanproxy_server"' % (
-						WORKDIR,
-						TEMPDIR
-					)
-				]
-			)
-			if DEBUG: print(result)
-			remote_pid = result[1].split()[0]
-			port = result[1].split()[1]
-
-	if not local_pid:
-		if WANPROXY == 'SSH':
-			# start SSH tunnel
-			result = run_background_shell_cmd(
-				[
-					'ssh', '-i', '%s/id_rsa' % WORKDIR,
-					'-fN','-o StrictHostKeyChecking=no',
-					'-L 3301:localhost:%s' % str(port),
-					'-p', '%s' % str(ssh_port),
-					'root@%s' % ipaddr
-				]
-			)
-			if DEBUG: print(result.__dict__)
-			local_pid = str(int(result.pid) + 1)
-
-		if WANPROXY == 'SOCAT':
-			# start SOCAT local listener
-			result = run_shell_cmd_nowait(
-				[
-					'/usr/bin/socat',
-					'TCP%s-LISTEN:3301,bind=localhost,su=nobody,fork,reuseaddr' % str(
-						family
-					),
-					'TCP%s:%s:%s' % (str(family), ipaddr, SOCAT_PORT)
-				]
-			)
-			if DEBUG: print(result.__dict__)
-			local_pid = str(result.pid)
-
-	return (local_pid, remote_pid, port)
-
-
-def kill_remote_pid(ipaddr=None, family=4, pid=None, ssh_port=DOCKER_SSH_PORT):
-	if WANPROXY == 'SSH':
-		remote_guid = get_guid_by_public_ipaddr(ipaddr=ipaddr, family=family)
-		assert remote_guid
-		if DEBUG: print('get_guid_by_public_ipaddr: ipaddr={} family={} remote_guid={}'.format(
-			ipaddr,
-			family,
-			remote_guid
-		))
-
-	result = None
-	if pid and WANPROXY == 'SSH':
-		# kill remote pid
-		result = run_shell_cmd(
-			[
-				'ssh', '-i', '%s/id_rsa' % WORKDIR,
-				'-o StrictHostKeyChecking=no',
-				'root@%s' % ipaddr,
-				'-p', '%s' % str(ssh_port),
-				'bash', '-c', '"kill -9 %s"' % str(pid)
-			]
-		)
-		if DEBUG: print(result)
-	return result
-
-
 @retry(Exception, cdata='method={}'.format(stack()[0][3]))
 def disconnect_clients():
 	disconnected = list()
diff --git a/unzoner/start b/unzoner/start
index ac976bf..a996cfd 100755
--- a/unzoner/start
+++ b/unzoner/start
@@ -77,8 +77,6 @@ declare -x TUN_PASSWD=${TUN_PASSWD:-$(${WORKDIR}/scripts/pyboot.sh gen_hash)}
 declare -x REQUESTS_CA_BUNDLE=${REQUESTS_CA_BUNDLE:-${DATADIR}/cacert.pem}
 declare -x STUNNEL=${STUNNEL:-0}
 declare -x STUNNEL_PORT=${STUNNEL_PORT:-443}
-declare -x WANPROXY=${WANPROXY}
-declare -x WANPROXY_PORT=${WANPROXY_PORT:-3300}
 declare -x SOCAT_PORT=${SOCAT_PORT:-3302}
 declare -x UPNP_TCP_PORT_FORWARD=${UPNP_TCP_PORT_FORWARD:-${OPENVPN_PORT} ${STUNNEL_PORT} ${SOCAT_PORT}}
 declare -x UPNP_UDP_PORT_FORWARD=${UPNP_UDP_PORT_FORWARD:-${OPENVPN_PORT}}
@@ -831,79 +829,6 @@ EOF
     fi
 fi
 
-if [[ ${WANPROXY} ]]; then
-    if [[ "${DEVICE_TYPE}" == "1" ]] || [[ "${DEVICE_TYPE}" == "3" ]] || [[ "${DEVICE_TYPE}" == "4" ]]; then
-        log 'generating WANProxy server config...'
-        cat << EOF > ${WORKDIR}/server.conf
-create codec codec0
-set codec0.codec XCodec
-set codec0.compressor zlib
-set codec0.compressor_level 6
-activate codec0
-
-create interface $(get_iface)
-set $(get_iface).family IPv${AF}
-set $(get_iface).host "localhost"
-set $(get_iface).port "0"
-activate $(get_iface)
-
-create peer peer0
-set peer0.family IPv${AF}
-set peer0.host "localhost"
-set peer0.port "${OPENVPN_PORT}"
-activate peer0
-
-create proxy proxy0
-set proxy0.interface $(get_iface)
-set proxy0.interface_codec codec0
-set proxy0.peer peer0
-set proxy0.peer_codec None
-activate proxy0
-EOF
-
-        if [[ "${WANPROXY}" == "SOCAT" ]]; then
-            ipt_add_rule flter I "INPUT -i ${EXT_IFACE} -p tcp -m tcp --dport ${SOCAT_PORT} -j ACCEPT"
-            if [[ "${AF}" == "6" ]] && [[ $(ip6tables -t nat -L) ]]; then
-                ip6t_add_rule filter I "INPUT -i ${EXT_IFACE} -p tcp -m tcp --dport ${SOCAT_PORT}"
-            fi
-            start_wanproxy_server
-        fi
-    fi
-
-    if [[ "${DEVICE_TYPE}" == "2" ]] || [[ "${DEVICE_TYPE}" == "3" ]]; then
-        log 'generating WANProxy client config...'
-        cat << EOF > ${WORKDIR}/client.conf
-create codec codec0
-set codec0.codec XCodec
-set codec0.compressor zlib
-set codec0.compressor_level 6
-activate codec0
-
-create interface $(get_iface)
-set $(get_iface).family IPv${AF}
-set $(get_iface).host "localhost"
-set $(get_iface).port "${WANPROXY_PORT}"
-activate $(get_iface)
-
-create peer peer0
-set peer0.family IPv${AF}
-set peer0.host "localhost"
-set peer0.port "3301"
-activate peer0
-
-create proxy proxy0
-set proxy0.interface $(get_iface)
-set proxy0.interface_codec None
-set proxy0.peer peer0
-set proxy0.peer_codec codec0
-activate proxy0
-EOF
-
-        log 'starting WANProxy client...'
-        (nohup $(which wanproxy) -c ${WORKDIR}/client.conf) &
-        cat "${WORKDIR}/id_rsa.pub" >> "${HOME}/.ssh/authorized_keys"
-    fi
-fi
 
 if [[ ${VPN_PROVIDER} ]] && [[ ${VPN_LOCATION_GROUP} ]] && [[ ${VPN_LOCATION} ]]; then
     log 'generating custom VPN client configuration...'