Compare commits

..

No commits in common. "4374ca229084c330d5c85ec1b3a6596217b66a9c" and "bbeee9d640c70fc21cf46248cb2ec500a3e07201" have entirely different histories.

View File

@ -19,8 +19,7 @@ check_need_to_reload_tpws6()
# interface ifsets (wanif, wanif6, lanif) can be reloaded independently # interface ifsets (wanif, wanif6, lanif) can be reloaded independently
check_lan check_lan
RELOAD_TPWS6= RELOAD_TPWS6=
[ "$ACTION" = "ifup" -a "$DISABLE_IPV6" != 1 -a -n "$IS_LAN" ] && \ [ "$ACTION" = "ifup" -a "$DISABLE_IPV6" != 1 -a -n "$IS_LAN" ] && [ "$MODE" = "tpws" -o "$MODE" = "custom" ] && RELOAD_TPWS6=1
if [ "$TPWS_ENABLE" = 1 ] || dir_is_not_empty "$CUSTOM_DIR/custom.d"; then RELOAD_TPWS6=1; fi
} }
@ -34,16 +33,15 @@ check_need_to_reload_tpws6()
fi fi
ZAPRET_RW=${ZAPRET_RW:-"$ZAPRET_BASE"} ZAPRET_RW=${ZAPRET_RW:-"$ZAPRET_BASE"}
ZAPRET_CONFIG=${ZAPRET_CONFIG:-"$ZAPRET_RW/config"} ZAPRET_CONFIG=${ZAPRET_CONFIG:-"$ZAPRET_RW/config"}
CUSTOM_DIR="$ZAPRET_RW/init.d/openwrt"
. "$ZAPRET_CONFIG" . "$ZAPRET_CONFIG"
. "$ZAPRET_BASE/common/base.sh"
. "$ZAPRET_BASE/common/fwtype.sh"
check_need_to_reload_tpws6 check_need_to_reload_tpws6
[ -n "$RELOAD_TPWS6" ] && { [ -n "$RELOAD_TPWS6" ] && {
logger -t zapret restarting daemons due to $ACTION of $INTERFACE to update tpws6 dnat target logger -t zapret restarting daemons due to $ACTION of $INTERFACE to update tpws6 dnat target
"$ZAPRET" restart_daemons "$ZAPRET" restart_daemons
} }
. "$ZAPRET_BASE/common/base.sh"
. "$ZAPRET_BASE/common/fwtype.sh"
linux_fwtype linux_fwtype
case "$FWTYPE" in case "$FWTYPE" in
nftables) nftables)