obsolete non-desync nfqws options in scripts

This commit is contained in:
bol-van 2020-02-02 17:59:59 +03:00
parent d7c176bc1a
commit bf46572bac
4 changed files with 0 additions and 45 deletions

3
config
View File

@ -20,9 +20,6 @@ IP2NET_OPT6="--prefix-length=56-64 --v6-threshold=5"
# custom mode : custom . should modify init script and add your own code # custom mode : custom . should modify init script and add your own code
MODE=tpws_ipset_https MODE=tpws_ipset_https
# CHOOSE NFQWS DAEMON OPTIONS. run "nfq/nfqws --help" for option list
NFQWS_OPT="--wsize=3 --hostspell=HOST"
# CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list # CHOOSE NFQWS DAEMON OPTIONS for DPI desync mode. run "nfq/nfqws --help" for option list
DESYNC_MARK=0x40000000 DESYNC_MARK=0x40000000
NFQWS_OPT_DESYNC="--dpi-desync=fake --dpi-desync-ttl=0 --dpi-desync-fooling=badsum --dpi-desync-fwmark=$DESYNC_MARK" NFQWS_OPT_DESYNC="--dpi-desync=fake --dpi-desync-ttl=0 --dpi-desync-fooling=badsum --dpi-desync-fwmark=$DESYNC_MARK"

View File

@ -285,24 +285,6 @@ zapret_apply_firewall()
fw_tpws "--dport 80" "--dport 80" $TPPORT_HTTP fw_tpws "--dport 80" "--dport 80" $TPPORT_HTTP
fw_tpws "--dport 443" "--dport 443" $TPPORT_HTTPS fw_tpws "--dport 443" "--dport 443" $TPPORT_HTTPS
;; ;;
nfqws_ipset)
fw_nfqws_pre "--sport 80 $synack $ipset_zapret src" "--sport 80 $synack $ipset_zapret6 src" $QNUM
fw_nfqws_post "--dport 80 $ipset_zapret dst" "--dport 80 $ipset_zapret6 dst" $QNUM
;;
nfqws_ipset_https)
rule="-m multiport --sports 80,443 $synack"
fw_nfqws_pre "$rule $ipset_zapret src" "$rule $ipset_zapret6 src" $QNUM
fw_nfqws_post "--dport 80 $ipset_zapret dst" "--dport 80 $ipset_zapret6 dst" $QNUM
;;
nfqws_all)
fw_nfqws_pre "--sport 80 $synack" "--sport 80 $synack" $QNUM
fw_nfqws_post "--dport 80" "--dport 80" $QNUM
;;
nfqws_all_https)
rule="-m multiport --sports 80,443 $synack"
fw_nfqws_pre "$rule" "$rule" $QNUM
fw_nfqws_post "--dport 80" "--dport 80" $QNUM
;;
nfqws_all_desync|nfqws_hostlist_desync) nfqws_all_desync|nfqws_hostlist_desync)
fw_nfqws_post "$desync" "$desync" $QNUM fw_nfqws_post "$desync" "$desync" $QNUM
;; ;;

View File

@ -74,9 +74,6 @@ start_service() {
run_tpws 1 "$TPWS_OPT_BASE_HTTP $TPWS_OPT_HTTP" run_tpws 1 "$TPWS_OPT_BASE_HTTP $TPWS_OPT_HTTP"
run_tpws 2 "$TPWS_OPT_BASE_HTTPS $TPWS_OPT_HTTPS" run_tpws 2 "$TPWS_OPT_BASE_HTTPS $TPWS_OPT_HTTPS"
;; ;;
nfqws_ipset|nfqws_ipset_https|nfqws_all|nfqws_all_https)
run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT"
;;
nfqws_ipset_desync|nfqws_all_desync) nfqws_ipset_desync|nfqws_all_desync)
run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT_DESYNC" run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT_DESYNC"
;; ;;

View File

@ -404,24 +404,6 @@ zapret_do_firewall()
fw_tpws $1 "--dport 80" "--dport 80" $TPPORT_HTTP fw_tpws $1 "--dport 80" "--dport 80" $TPPORT_HTTP
fw_tpws $1 "--dport 443" "--dport 443" $TPPORT_HTTPS fw_tpws $1 "--dport 443" "--dport 443" $TPPORT_HTTPS
;; ;;
nfqws_ipset)
fw_nfqws_pre $1 "--sport 80 $synack $ipset_zapret src" "--sport 80 $synack $ipset_zapret6 src" $QNUM
fw_nfqws_post $1 "--dport 80 $ipset_zapret dst" "--dport 80 $ipset_zapret6 dst" $QNUM
;;
nfqws_ipset_https)
rule="-m multiport --sports 80,443 $synack"
fw_nfqws_pre $1 "$rule $ipset_zapret src" "$rule $ipset_zapret6 src" $QNUM
fw_nfqws_post $1 "--dport 80 $ipset_zapret dst" "--dport 80 $ipset_zapret6 dst" $QNUM
;;
nfqws_all)
fw_nfqws_pre $1 "--sport 80 $synack" "--sport 80 $synack" $QNUM
fw_nfqws_post $1 "--dport 80" "--dport 80" $QNUM
;;
nfqws_all_https)
rule="-m multiport --sports 80,443 $synack"
fw_nfqws_pre $1 "$rule" "$rule" $QNUM
fw_nfqws_post $1 "--dport 80" "--dport 80" $QNUM
;;
nfqws_all_desync|nfqws_hostlist_desync) nfqws_all_desync|nfqws_hostlist_desync)
fw_nfqws_post $1 "$desync" "$desync" $QNUM fw_nfqws_post $1 "$desync" "$desync" $QNUM
;; ;;
@ -457,9 +439,6 @@ zapret_do_daemons()
do_tpws $1 1 "$TPWS_OPT_BASE_HTTP $TPWS_OPT_HTTP" do_tpws $1 1 "$TPWS_OPT_BASE_HTTP $TPWS_OPT_HTTP"
do_tpws $1 2 "$TPWS_OPT_BASE_HTTPS $TPWS_OPT_HTTPS" do_tpws $1 2 "$TPWS_OPT_BASE_HTTPS $TPWS_OPT_HTTPS"
;; ;;
nfqws_ipset|nfqws_ipset_https|nfqws_all|nfqws_all_https)
do_nfqws $1 1 "$NFQWS_OPT"
;;
nfqws_ipset_desync|nfqws_all_desync) nfqws_ipset_desync|nfqws_all_desync)
do_nfqws $1 1 "$NFQWS_OPT_DESYNC" do_nfqws $1 1 "$NFQWS_OPT_DESYNC"
;; ;;