From 018009783191749391f44e53bf5ede17fe7f1088 Mon Sep 17 00:00:00 2001
From: gSpot <gspot.x2f@gmail.com>
Date: Tue, 11 Jul 2023 17:05:29 +0300
Subject: [PATCH] Fixed ipt_functions

---
 autoinstall/autoinstall.sh                             |  2 +-
 ruantiblock/Makefile                                   |  2 +-
 .../files/etc/ruantiblock/scripts/ipt_functions        | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh
index c88e730..43b9e5d 100755
--- a/autoinstall/autoinstall.sh
+++ b/autoinstall/autoinstall.sh
@@ -9,7 +9,7 @@ LUA_MODULE=0
 LUCI_APP=1
 
 OWRT_VERSION="current"
-RUAB_VERSION="0.9.7-0"
+RUAB_VERSION="0.9.7-1"
 RUAB_MOD_LUA_VERSION="0.9.7-0"
 RUAB_LUCI_APP_VERSION="0.9.7-0"
 BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile
index df606ae..ab17911 100644
--- a/ruantiblock/Makefile
+++ b/ruantiblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock
 PKG_VERSION:=0.9.7
-PKG_RELEASE:=0
+PKG_RELEASE:=1
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/ruantiblock/files/etc/ruantiblock/scripts/ipt_functions b/ruantiblock/files/etc/ruantiblock/scripts/ipt_functions
index 102d4e0..671cb60 100644
--- a/ruantiblock/files/etc/ruantiblock/scripts/ipt_functions
+++ b/ruantiblock/files/etc/ruantiblock/scripts/ipt_functions
@@ -72,18 +72,20 @@ IptMainAdd() {
     $IPT_CMD -t "$IPT_TABLE" -N "$IPT_BLLIST_CHAIN"
     $IPT_CMD -t "$IPT_TABLE" -N "$IPT_ALLOWED_HOSTS_CHAIN"
     IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ALLOWED_HOSTS_CHAIN" $IPT_ALLOWED_HOSTS_RULE
-    IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -I "$IPT_FIRST_CHAIN" 1 -j "$IPT_ALLOWED_HOSTS_CHAIN"
 
     if [ "$PROXY_MODE" = "2" ]; then
+        IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_FIRST_CHAIN" -j "$IPT_ALLOWED_HOSTS_CHAIN"
         IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ACTION_CHAIN" -j MARK --set-mark $VPN_PKTS_MARK
         IPT_IPSETS="${IPSET_CIDR} ${IPSET_IP} ${IPSET_DNSMASQ}"
     elif [ "$PROXY_MODE" = "3" ]; then
+        IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -I "$IPT_FIRST_CHAIN" 1 -j "$IPT_ALLOWED_HOSTS_CHAIN"
         IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ACTION_CHAIN" -p tcp -j REDIRECT --to-ports ${T_PROXY_PORT_TCP}
         if [ "$T_PROXY_ALLOW_UDP" = "1" ]; then
             IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ACTION_CHAIN" -p udp -j REDIRECT --to-ports ${T_PROXY_PORT_UDP}
         fi
         IPT_IPSETS="${IPSET_CIDR} ${IPSET_IP} ${IPSET_DNSMASQ}"
     else
+        IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -I "$IPT_FIRST_CHAIN" 1 -j "$IPT_ALLOWED_HOSTS_CHAIN"
         IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ACTION_CHAIN" -p tcp -j REDIRECT --to-ports ${TOR_TRANS_PORT}
         if [ "$TOR_ALLOW_UDP" = "1" ]; then
             IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A "$IPT_ACTION_CHAIN" -p udp -j REDIRECT --to-ports ${TOR_TRANS_PORT}
@@ -116,7 +118,11 @@ IptMainDel() {
 IPT_OUTPUT_FIRST_RULE="-j ${IPT_BLLIST_CHAIN}"
 
 IptLocalClientsAdd() {
-    IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -I OUTPUT 1 $IPT_OUTPUT_FIRST_RULE
+    if [ "$PROXY_MODE" = "2" ]; then
+        IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -A OUTPUT $IPT_OUTPUT_FIRST_RULE
+    else
+        IptCmdWrapper $IPT_CMD -t "$IPT_TABLE" -I OUTPUT 1 $IPT_OUTPUT_FIRST_RULE
+    fi
 }
 
 IptLocalClientsDel() {