mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-14 19:41:51 +00:00
Code Issues Releases Wiki Activity

Remove the -w of iptables-restore

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2022-12-29 19:42:35 +01:00
parent 1d046f0ca3
commit 1ebc65b1c9
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openmptcprouter/files/etc/firewall.gre-tunnel
View file

@ -39,7 +39,7 @@ _setup_fw() {
[ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')" [ -n "$ifnames" ] && rule="$rule -i $(echo "${ifnames}" | sed 's/ /-i /g')"
if [ -n "$rule" ] && [ -n "$lookup" ]; then if [ -n "$rule" ] && [ -n "$lookup" ]; then
$IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters $IPTABLESAVE --counters | grep -v "0x${lookup}" | $IPTABLERESTORE -w --counters
$IPTABLERESTORE -w --wait=60 --noflush <<-EOF $IPTABLERESTORE --wait=60 --noflush <<-EOF
*mangle *mangle
-A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup} -A omr-gre-tunnel ${rule} -j MARK --set-mark 0x${lookup}
COMMIT COMMIT
@ -48,7 +48,7 @@ _setup_fw() {
} }
if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then if [ -z "$($IPTABLESAVE | grep omr-gre-tunnel)" ]; then
$IPTABLERESTORE -w --wait=60 --noflush <<-EOF $IPTABLERESTORE --wait=60 --noflush <<-EOF
*mangle *mangle
:omr-gre-tunnel - :omr-gre-tunnel -
-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel -I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-gre-tunnel

8
shadowsocks-libev/files/ss-rules
View file

@ -133,7 +133,7 @@ ss_rules_parse_args() {
ss_rules_flush() { ss_rules_flush() {
local setname local setname
$IPTABLESSAVE --counters 2>/dev/null | grep -v ssr_ | $IPTABLESRESTORE -w --counters $IPTABLESSAVE --counters 2>/dev/null | grep -v ssr_ | $IPTABLESRESTORE --counters
while ip rule del fwmark 1 lookup 100 2>/dev/null; do true; done while ip rule del fwmark 1 lookup 100 2>/dev/null; do true; done
ip route flush table 100 || true ip route flush table 100 || true
for setname in $(ipset -n list | grep "ssr_${rule}"); do for setname in $(ipset -n list | grep "ssr_${rule}"); do
@ -178,7 +178,7 @@ ss_rules_iptchains_init() {
ss_rules_iptchains_init_mark() { ss_rules_iptchains_init_mark() {
if [ "$($IPTABLES -w -t mangle -L PREROUTING | grep ss_rules_dst_bypass_all)" = "" ]; then if [ "$($IPTABLES -w -t mangle -L PREROUTING | grep ss_rules_dst_bypass_all)" = "" ]; then
$IPTABLESRESTORE -w --noflush <<-EOF $IPTABLESRESTORE --noflush <<-EOF
*mangle *mangle
-A PREROUTING -m set --match-set ss_rules_dst_bypass_all dst -j MARK --set-mark 0x539 -A PREROUTING -m set --match-set ss_rules_dst_bypass_all dst -j MARK --set-mark 0x539
COMMIT COMMIT
@ -199,7 +199,7 @@ ss_rules_iptchains_init_tcp() {
bypass|*) return 0;; bypass|*) return 0;;
esac esac
if [ "$($IPTABLESSAVE 2>/dev/null | grep ssr_${rule}_local_out | grep ssr_${rule}_dst_bypass)" = "" ]; then if [ "$($IPTABLESSAVE 2>/dev/null | grep ssr_${rule}_local_out | grep ssr_${rule}_dst_bypass)" = "" ]; then
$IPTABLESRESTORE -w --noflush <<-EOF $IPTABLESRESTORE --noflush <<-EOF
*nat *nat
:ssr_${rule}_local_out - :ssr_${rule}_local_out -
-I OUTPUT 1 -p tcp -j ssr_${rule}_local_out -I OUTPUT 1 -p tcp -j ssr_${rule}_local_out
@ -255,7 +255,7 @@ ss_rules_iptchains_init_() {
forward) dst_default_target=ssr_${rule}_forward ;; forward) dst_default_target=ssr_${rule}_forward ;;
bypass|*) dst_default_target=RETURN ;; bypass|*) dst_default_target=RETURN ;;
esac esac
sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IPTABLESRESTORE -w --noflush sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IPTABLESRESTORE --noflush
*$table *$table
:ssr_${rule}_pre_src - :ssr_${rule}_pre_src -
:ssr_${rule}_src - :ssr_${rule}_src -

8
shadowsocks-libev/files/ss-rules6
View file

@ -117,7 +117,7 @@ ss_rules6_parse_args() {
ss_rules6_flush() { ss_rules6_flush() {
local setname local setname
$IP6TABLESSAVE --counters 2>/dev/null | grep -v ssr6_ | $IP6TABLESRESTORE -w --counters $IP6TABLESSAVE --counters 2>/dev/null | grep -v ssr6_ | $IP6TABLESRESTORE --counters
while ip -f inet6 rule del fwmark 1 lookup 100 2>/dev/null; do true; done while ip -f inet6 rule del fwmark 1 lookup 100 2>/dev/null; do true; done
ip -f inet6 route flush table 100 || true ip -f inet6 route flush table 100 || true
for setname in $(ipset -n list | grep "ssr6_${rule}"); do for setname in $(ipset -n list | grep "ssr6_${rule}"); do
@ -162,7 +162,7 @@ ss_rules6_iptchains_init() {
ss_rules6_iptchains_init_mark() { ss_rules6_iptchains_init_mark() {
if [ "$($IP6TABLES -w -t mangle -L PREROUTING | grep ss_rules6_dst_bypass_all)" = "" ]; then if [ "$($IP6TABLES -w -t mangle -L PREROUTING | grep ss_rules6_dst_bypass_all)" = "" ]; then
$IP6TABLESRESTORE -w --noflush <<-EOF $IP6TABLESRESTORE --noflush <<-EOF
*mangle *mangle
-A PREROUTING -m set --match-set ss_rules6_dst_bypass_all dst -j MARK --set-mark 0x6539 -A PREROUTING -m set --match-set ss_rules6_dst_bypass_all dst -j MARK --set-mark 0x6539
COMMIT COMMIT
@ -184,7 +184,7 @@ ss_rules6_iptchains_init_tcp() {
bypass|*) return 0;; bypass|*) return 0;;
esac esac
$IP6TABLESRESTORE -w --noflush <<-EOF $IP6TABLESRESTORE --noflush <<-EOF
*nat *nat
:ssr6_${rule}_local_out - :ssr6_${rule}_local_out -
-I OUTPUT 1 -p tcp -j ssr6_${rule}_local_out -I OUTPUT 1 -p tcp -j ssr6_${rule}_local_out
@ -239,7 +239,7 @@ ss_rules6_iptchains_init_() {
forward) dst_default_target=ssr6_${rule}_forward ;; forward) dst_default_target=ssr6_${rule}_forward ;;
bypass|*) dst_default_target=RETURN ;; bypass|*) dst_default_target=RETURN ;;
esac esac
sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IP6TABLESRESTORE -w --noflush sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IP6TABLESRESTORE --noflush
*$table *$table
:ssr6_${rule}_pre_src - :ssr6_${rule}_pre_src -
:ssr6_${rule}_src - :ssr6_${rule}_src -

8
v2ray-core/files/usr/bin/v2ray-rules
View file

@ -134,7 +134,7 @@ v2r_rules_parse_args() {
v2r_rules_flush() { v2r_rules_flush() {
local setname local setname
$IPTABLESSAVE --counters 2>/dev/null | grep -v v2r_ | $IPTABLESRESTORE -w --counters $IPTABLESSAVE --counters 2>/dev/null | grep -v v2r_ | $IPTABLESRESTORE --counters
while ip rule del fwmark 1 lookup 100 2>/dev/null; do true; done while ip rule del fwmark 1 lookup 100 2>/dev/null; do true; done
ip route flush table 100 || true ip route flush table 100 || true
for setname in $(ipset -n list | grep "ssr_${rule}"); do for setname in $(ipset -n list | grep "ssr_${rule}"); do
@ -179,7 +179,7 @@ v2r_rules_iptchains_init() {
v2r_rules_iptchains_init_mark() { v2r_rules_iptchains_init_mark() {
if [ "$($IPTABLES -w -t mangle -L PREROUTING | grep ss_rules_dst_bypass_all)" = "" ]; then if [ "$($IPTABLES -w -t mangle -L PREROUTING | grep ss_rules_dst_bypass_all)" = "" ]; then
$IPTABLESRESTORE -w --noflush <<-EOF $IPTABLESRESTORE --noflush <<-EOF
*mangle *mangle
-A PREROUTING -m set --match-set ss_rules_dst_bypass_all dst -j MARK --set-mark 0x539 -A PREROUTING -m set --match-set ss_rules_dst_bypass_all dst -j MARK --set-mark 0x539
COMMIT COMMIT
@ -200,7 +200,7 @@ v2r_rules_iptchains_init_tcp() {
bypass|*) return 0;; bypass|*) return 0;;
esac esac
$IPTABLESRESTORE -w --noflush <<-EOF $IPTABLESRESTORE --noflush <<-EOF
*nat *nat
:v2r_${rule}_local_out - :v2r_${rule}_local_out -
-I OUTPUT 1 -p tcp -j v2r_${rule}_local_out -I OUTPUT 1 -p tcp -j v2r_${rule}_local_out
@ -255,7 +255,7 @@ v2r_rules_iptchains_init_() {
forward) dst_default_target=v2r_${rule}_forward ;; forward) dst_default_target=v2r_${rule}_forward ;;
bypass|*) dst_default_target=RETURN ;; bypass|*) dst_default_target=RETURN ;;
esac esac
sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IPTABLESRESTORE -w --noflush sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IPTABLESRESTORE --noflush
*$table *$table
:v2r_${rule}_pre_src - :v2r_${rule}_pre_src -
:v2r_${rule}_src - :v2r_${rule}_src -

8
v2ray-core/files/usr/bin/v2ray-rules6
View file

@ -117,7 +117,7 @@ v2ray_rules6_parse_args() {
v2ray_rules6_flush() { v2ray_rules6_flush() {
local setname local setname
$IP6TABLESSAVE --counters 2>/dev/null | grep -v v2r6_ | $IP6TABLESRESTORE -w --counters $IP6TABLESSAVE --counters 2>/dev/null | grep -v v2r6_ | $IP6TABLESRESTORE --counters
while ip -f inet6 rule del fwmark 1 lookup 100 2>/dev/null; do true; done while ip -f inet6 rule del fwmark 1 lookup 100 2>/dev/null; do true; done
ip -f inet6 route flush table 100 || true ip -f inet6 route flush table 100 || true
for setname in $(ipset -n list | grep "ssr6_${rule}"); do for setname in $(ipset -n list | grep "ssr6_${rule}"); do
@ -161,7 +161,7 @@ v2ray_rules6_iptchains_init() {
} }
v2ray_rules6_iptchains_init_mark() { v2ray_rules6_iptchains_init_mark() {
$IP6TABLESRESTORE -w --noflush <<-EOF $IP6TABLESRESTORE --noflush <<-EOF
*mangle *mangle
-A PREROUTING -m set --match-set ss_rules6_dst_bypass_all dst -j MARK --set-mark 0x6539 -A PREROUTING -m set --match-set ss_rules6_dst_bypass_all dst -j MARK --set-mark 0x6539
COMMIT COMMIT
@ -184,7 +184,7 @@ v2ray_rules6_iptchains_init_tcp() {
esac esac
# echo "tcp mangle" # echo "tcp mangle"
# $IP6TABLESRESTORE -w --noflush <<-EOF # $IP6TABLESRESTORE --noflush <<-EOF
# *mangle # *mangle
# :v2r6_${rule}_local_out - # :v2r6_${rule}_local_out -
# -I OUTPUT 1 -p tcp -j v2r6_${rule}_local_out # -I OUTPUT 1 -p tcp -j v2r6_${rule}_local_out
@ -244,7 +244,7 @@ v2ray_rules6_iptchains_init_() {
forward) dst_default_target=v2r6_${rule}_forward ;; forward) dst_default_target=v2r6_${rule}_forward ;;
bypass|*) dst_default_target=RETURN ;; bypass|*) dst_default_target=RETURN ;;
esac esac
sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IP6TABLESRESTORE -w --noflush sed -e '/^\s*$/d' -e 's/^\s\+//' <<-EOF | $IP6TABLESRESTORE --noflush
*$table *$table
:v2r6_${rule}_pre_src - :v2r6_${rule}_pre_src -
:v2r6_${rule}_src - :v2r6_${rule}_src -