From 02238eadd3ed0b1461e806e9e3bfe7bb79b547cb Mon Sep 17 00:00:00 2001
From: bolvan <k@vodka.home.kg>
Date: Wed, 17 Feb 2016 20:22:21 +0300
Subject: [PATCH] init.d fix

---
 changes.txt                      |  2 +-
 init.d/debian7/zapret            | 12 +++++++++---
 init.d/openwrt/firewall.user.rt  |  5 +++++
 init.d/openwrt/firewall.user.tkt |  5 -----
 init.d/openwrt/zapret            |  8 ++++++--
 init.d/ubuntu12/zapret.conf      | 12 ++++++++----
 6 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 init.d/openwrt/firewall.user.rt
 delete mode 100644 init.d/openwrt/firewall.user.tkt

diff --git a/changes.txt b/changes.txt
index 0c44ec7..fcf5fb2 100644
--- a/changes.txt
+++ b/changes.txt
@@ -29,4 +29,4 @@ ISP support : TKT support
 
 v5
 
-nfqws : ipv6 support â nfqws
+nfqws : ipv6 support in nfqws
diff --git a/init.d/debian7/zapret b/init.d/debian7/zapret
index 6ff4237..1aebd3a 100755
--- a/init.d/debian7/zapret
+++ b/init.d/debian7/zapret
@@ -2,7 +2,7 @@
 
 # CHOOSE ISP HERE. UNCOMMENT ONLY ONE LINE.
 ISP=mns
-#ISP=tkt
+#ISP=rt
 #ISP=beeline
 #ISP=domru
 
@@ -32,12 +32,18 @@ case "$1" in
 
 	echo "Adding iptables rule"
 	case "${ISP}" in
-	    mns|tkt)
+	    mns)
 		iptables -t raw -C PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass 2>/dev/null ||
 		 iptables -t raw -I PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass
 		DAEMON=$NFQWS
 		DAEMON_OPTS="--qnum=$QNUM --wsize=4"
 		;;
+	    rt)
+		iptables -t raw -C PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass 2>/dev/null ||
+		 iptables -t raw -I PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass
+		DAEMON=$NFQWS
+		DAEMON_OPTS="--qnum=$QNUM --wsize=20"
+		;;
 	    beeline)
 		iptables -t mangle -C POSTROUTING -p tcp --dport 80 -m set --match-set zapret dst -j NFQUEUE --queue-num $QNUM --queue-bypass 2>/dev/null ||
 		 iptables -t mangle -I POSTROUTING -p tcp --dport 80 -m set --match-set zapret dst -j NFQUEUE --queue-num $QNUM --queue-bypass
@@ -65,7 +71,7 @@ case "$1" in
 	echo "Deleting iptables rule"
 
 	case "${ISP}" in
-	    mns|tkt)
+	    mns|rt)
 		iptables -t raw -D PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass
 		DAEMON=$NFQWS
 		;;
diff --git a/init.d/openwrt/firewall.user.rt b/init.d/openwrt/firewall.user.rt
new file mode 100644
index 0000000..270376c
--- /dev/null
+++ b/init.d/openwrt/firewall.user.rt
@@ -0,0 +1,5 @@
+# put it to /etc/firewall.user
+
+# for Rostelecom ISP
+iptables -t raw -C PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num 200 --queue-bypass ||
+ iptables -t raw -I PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num 200 --queue-bypass
diff --git a/init.d/openwrt/firewall.user.tkt b/init.d/openwrt/firewall.user.tkt
deleted file mode 100644
index 5bf7a93..0000000
--- a/init.d/openwrt/firewall.user.tkt
+++ /dev/null
@@ -1,5 +0,0 @@
-# put it to /etc/firewall.user
-
-# for TKT ISP
-iptables -t raw -D PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num 200 --queue-bypass 2>/dev/null
-iptables -t raw -I PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num 200 --queue-bypass
diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret
index 56b988d..6936dfe 100755
--- a/init.d/openwrt/zapret
+++ b/init.d/openwrt/zapret
@@ -3,7 +3,7 @@
 
 # CHOOSE ISP HERE. UNCOMMENT ONLY ONE LINE.
 #ISP=mns
-#ISP=tkt
+#ISP=rt
 #ISP=beeline
 ISP=domru
 
@@ -22,10 +22,14 @@ START=18
 
 get_daemon() {
 	case "${ISP}" in
-	    mns|tkt)
+	    mns)
 		DAEMON_OPTS="--qnum=$QNUM --wsize=4"
 		DAEMON=$NFQWS
 		;;
+	    rt)
+		DAEMON_OPTS="--qnum=$QNUM --wsize=20"
+		DAEMON=$NFQWS
+		;;
 	    beeline)
 		DAEMON_OPTS="--qnum=$QNUM --hostcase"
 		DAEMON=$NFQWS
diff --git a/init.d/ubuntu12/zapret.conf b/init.d/ubuntu12/zapret.conf
index 9cecd38..ae71fc3 100644
--- a/init.d/ubuntu12/zapret.conf
+++ b/init.d/ubuntu12/zapret.conf
@@ -5,7 +5,7 @@ stop on runlevel [!2345]
 
 # CHOOSE ISP HERE. UNCOMMENT ONLY ONE LINE.
 env ISP=mns
-#env ISP=tkt
+#env ISP=rt
 #env ISP=beeline
 #env ISP=domru
 
@@ -24,7 +24,7 @@ pre-start script
 	/opt/zapret/ipset/create_ipset.sh
 
 	case "${ISP}" in
-	    mns|tkt)
+	    mns|rt)
 		iptables -t raw -C PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass ||
 		 iptables -t raw -I PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass
 		;;
@@ -45,10 +45,14 @@ end script
 
 script
 	case "${ISP}" in
-	    mns|tkt)
+	    mns)
 		NFEXE=$NFQWS
 		NFARG="--qnum $QNUM --wsize=4"
 		;;
+	    rt)
+		NFEXE=$NFQWS
+		NFARG="--qnum $QNUM --wsize=20"
+		;;
 	    beeline)
 		NFEXE=$NFQWS
 		NFARG="--qnum $QNUM --hostcase"
@@ -63,7 +67,7 @@ end script
 
 pre-stop script
 	case "${ISP}" in
-	    mns|tkt)
+	    mns|rt)
 		iptables -t raw -D PREROUTING -p tcp --sport 80 --tcp-flags SYN,ACK SYN,ACK -m set --match-set zapret src -j NFQUEUE --queue-num $QNUM --queue-bypass
 		;;
 	    beeline)