init: allow override TPPORT and QNUM

init.d/macos/functions

@@ -8,7 +8,7 @@ HOSTLIST="$ZHOSTLIST.gz"
 [ -f "$HOSTLIST" ] || HOSTLIST="$ZUSERLIST"
 
 PIDDIR=/var/run
-TPPORT=988
+[ -n "$TPPORT" ] || TPPORT=988
 TPWS_USER=daemon
 TPWS_WAIT="--bind-wait-ip=60"
 TPWS="$ZAPRET_BASE/tpws/tpws"

init.d/openwrt/functions

@@ -3,8 +3,8 @@
 [ -n "$ZAPRET_BASE" ] || ZAPRET_BASE=/opt/zapret
 . "$ZAPRET_BASE/config"
 
-QNUM=200
-TPPORT=988
+[ -n "$QNUM" ] || QNUM=200
+[ -n "$TPPORT" ] || TPPORT=988
 TPWS_USER=daemon
 TPWS_LOCALHOST4=127.0.0.127
 [ -n "$DESYNC_MARK" ] || DESYNC_MARK=0x40000000

init.d/openwrt/zapret

@@ -19,13 +19,10 @@ fi
 
 PIDDIR=/var/run
 
-QNUM=200
 NFQWS_USER=daemon
 NFQWS="$ZAPRET_BASE/nfq/nfqws"
 NFQWS_OPT_BASE="--qnum=$QNUM --user=$NFQWS_USER"
 
-TPWS_USER=daemon
-TPPORT=988
 TPWS="$ZAPRET_BASE/tpws/tpws"
 TPWS_LOCALHOST4=127.0.0.127
 HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"

init.d/sysv/functions

@@ -10,11 +10,11 @@ IPSET_CR="$ZAPRET_BASE/ipset/create_ipset.sh"
 
 WS_USER=tpws
 
-QNUM=200
+[ -n "$QNUM" ] || QNUM=200
 NFQWS="$ZAPRET_BASE/nfq/nfqws"
 NFQWS_OPT_BASE="--qnum=$QNUM --user=$WS_USER"
 
-TPPORT=988
+[ -n "$TPPORT" ] || TPPORT=988
 TPWS="$ZAPRET_BASE/tpws/tpws"
 TPWS_LOCALHOST4=127.0.0.127
 HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"