diff --git a/openmptcprouter/files/bin/blocklanfw b/openmptcprouter/files/bin/blocklanfw index 1d1b7bd65..5b476da4a 100755 --- a/openmptcprouter/files/bin/blocklanfw +++ b/openmptcprouter/files/bin/blocklanfw @@ -17,7 +17,7 @@ ss_rules_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" + eval "$IPTABLES -w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -25,7 +25,7 @@ ss_rules_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IPTABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" + eval "$IPTABLES -w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -36,7 +36,7 @@ ss_rules6_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" + eval "$IP6TABLES -w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -44,7 +44,7 @@ ss_rules6_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IP6TABLES-w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" + eval "$IP6TABLES -w -t nat -A zone_lan_prerouting ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -55,7 +55,7 @@ v2r_rules_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" + eval "$IPTABLES -w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -63,7 +63,7 @@ v2r_rules_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IPTABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" + eval "$IPTABLES -w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" fw=$((fw+1)) fi done @@ -74,14 +74,14 @@ v2ray_rules6_fw_drop() { while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/reject/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" + eval "$IP6TABLES -w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" fi done timeout 1 fw3 -6 print 2>/dev/null | awk '/iptables/&&/zone_lan_forward/&&/tcp/&&/-t filter/&&/-j DROP/ {for(i=6; i<=NF; i++) { printf "%s ",$i } print "\n" }' | while IFS=$"\n" read -r c; do fwrule=$(echo "$c" | sed 's/DROP/REDIRECT --to-ports 65535/') if [ -n "$fwrule" ] && [ -z "$($IPTABLESSAVE 2>/dev/null | grep zone_lan_prerouting | grep '${fwrule}')" ]; then - eval "$IP6TABLES-w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" + eval "$IP6TABLES -w -t nat -I zone_lan_prerouting 1 ${fwrule} >/dev/null 2>&1" fi done } diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 569b74654..a5a380082 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -1873,7 +1873,7 @@ _set_config_from_vps() { # DSVPN settings dsvpn_key="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.key')" dsvpn_port="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.port')" - if [ -n "$(uci -q get dsvpn.vpn)" ] && (([ -n "$dsvpn_key" ] && [ "$dsvpn_key" != "$(uci -q get dsvpn.vpn.key)" ]) || ([ -n "$dsvpn_port" ] && [ "$dsvpn_port" != "$(uci -q get dsvpn.vpn.port)" ])); then + if [ -f /etc/init.d/dsvpn ] && [ -n "$(uci -q get dsvpn.vpn)" ] && (([ -n "$dsvpn_key" ] && [ "$dsvpn_key" != "$(uci -q get dsvpn.vpn.key)" ]) || ([ -n "$dsvpn_port" ] && [ "$dsvpn_port" != "$(uci -q get dsvpn.vpn.port)" ])); then dsvpn_state=0 if [ "$vpn" = "dsvpn" ]; then dsvpn_state=1