mirror of
https://github.com/bol-van/zapret.git
synced 2024-12-22 06:15:25 +00:00
init.d: fix apply of TPWS_SOCKS_OPT to tpws socks mode
This commit is contained in:
parent
ebb89c48e0
commit
228572afb5
@ -164,7 +164,7 @@ standard_mode_daemons()
|
|||||||
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
||||||
opt="--socks --user=$WS_USER --port=$TPPORT_SOCKS"
|
opt="--socks --user=$WS_USER --port=$TPPORT_SOCKS"
|
||||||
tpws_apply_socks_binds opt
|
tpws_apply_socks_binds opt
|
||||||
opt="$opt $TPWS_OPT"
|
opt="$opt $TPWS_SOCKS_OPT"
|
||||||
filter_apply_hostlist_target opt
|
filter_apply_hostlist_target opt
|
||||||
do_daemon $1 2 "$TPWS" "$opt"
|
do_daemon $1 2 "$TPWS" "$opt"
|
||||||
}
|
}
|
||||||
|
@ -123,7 +123,7 @@ standard_mode_daemons()
|
|||||||
run_tpws 1 "$opt"
|
run_tpws 1 "$opt"
|
||||||
}
|
}
|
||||||
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
||||||
opt="--port=$TPPORT_SOCKS $TPWS_OPT"
|
opt="--port=$TPPORT_SOCKS $TPWS_SOCKS_OPT"
|
||||||
filter_apply_hostlist_target opt
|
filter_apply_hostlist_target opt
|
||||||
run_tpws_socks 2 "$opt"
|
run_tpws_socks 2 "$opt"
|
||||||
}
|
}
|
||||||
|
@ -291,7 +291,7 @@ standard_mode_daemons()
|
|||||||
do_tpws $1 1 "$opt"
|
do_tpws $1 1 "$opt"
|
||||||
}
|
}
|
||||||
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
[ "$TPWS_SOCKS_ENABLE" = 1 ] && {
|
||||||
opt="--port=$TPPORT_SOCKS $TPWS_OPT"
|
opt="--port=$TPPORT_SOCKS $TPWS_SOCKS_OPT"
|
||||||
filter_apply_hostlist_target opt
|
filter_apply_hostlist_target opt
|
||||||
do_tpws_socks $1 2 "$opt"
|
do_tpws_socks $1 2 "$opt"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user