Browse Source

init: MODE_OVERRIDE to allow code reuse from custom scripts

pull/84/head
bol-van 3 years ago
parent
commit
566e3d1536
  1. 4
      init.d/macos/functions
  2. 2
      init.d/openwrt/functions
  3. 2
      init.d/openwrt/zapret
  4. 4
      init.d/sysv/functions

4
init.d/macos/functions

@ -395,7 +395,7 @@ zapret_do_firewall()
{
# $1 - 1 - add, 0 - del
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws|filter|custom)
if [ "$1" = "1" ] ; then
pf_anchor_root || return 1
@ -438,7 +438,7 @@ zapret_do_daemons()
local opt
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws)
[ "$1" = "1" ] && [ "$DISABLE_IPV4" = "1" ] && [ "$DISABLE_IPV6" = "1" ] && {
echo "both ipv4 and ipv6 are disabled. nothing to do"

2
init.d/openwrt/functions

@ -457,7 +457,7 @@ zapret_apply_firewall()
# always create ipsets. ip_exclude ipset is required
create_ipset no-update
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws)
if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then
echo both http and https are disabled. not applying redirection.

2
init.d/openwrt/zapret

@ -107,7 +107,7 @@ tpws_apply_socks_binds()
start_service() {
local opt qn qns qn6 qns6
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws)
opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt

4
init.d/sysv/functions

@ -630,7 +630,7 @@ zapret_do_firewall()
# always create ipsets. ip_exclude ipset is required
[ "$1" != "1" ] || create_ipset no-update
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws)
if [ ! "$MODE_HTTP" = "1" ] && [ ! "$MODE_HTTPS" = "1" ]; then
echo both http and https are disabled. not applying redirection.
@ -708,7 +708,7 @@ zapret_do_daemons()
local opt qn qns qn6 qns6
case "${MODE}" in
case "${MODE_OVERRIDE:-$MODE}" in
tpws)
opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt

Loading…
Cancel
Save