mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Bypass changes

Browse source
This commit is contained in:
Ycarus 2018-10-20 19:20:51 +02:00
parent 008cdcc468
commit 703e376d60
5 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

64
luci-app-omr-bypass/root/etc/init.d/omr-bypass
View file

@ -50,11 +50,28 @@ _bypass_proto() {
[ -z "$intf" ] && intf="all"
[ -z "$proto" ] && return
if [ "$intf" = "all" ]; then
ndpi_rules="-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539
$ndpi_rules"
echo "Add $proto"
iptables-restore --wait=60 --noflush <<-EOF
*mangle
-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539
COMMIT
EOF
ip6tables-restore --wait=60 --noflush <<-EOF
*mangle
-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539
COMMIT
EOF
else
ndpi_rules="-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539$intfid
$ndpi_rules"
iptables-restore --wait=60 --noflush <<-EOF
*mangle
-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539$intfid
COMMIT
EOF
ip6tables-restore --wait=60 --noflush <<-EOF
*mangle
-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539$intfid
COMMIT
EOF
fi
}
@ -82,14 +99,15 @@ _intf_rule() {
EOF
fi
if [ "$(iptables -w 40 -t nat -L | grep ss_rules_pre_src)" != "" ] && [ "$(iptables -w 40 -t nat -L | grep ss_rules_dst_bypass_$intf)" = "" ]; then
echo "add nat rules..."
iptables-restore --wait=60 --noflush <<-EOF
*nat
-I ss_rules_dst 1 -m set --match-set ss_rules_dst_bypass_$intf dst -j RETURN
-I ss_rules_local_out 1 -m set --match-set ss_rules_dst_bypass_$intf dst -j RETURN
-I ss_rules_local_out 2 -m mark --mark 0x539$count -j RETURN
-I ss_rules_pre_src 1 -m set --match-set ss_rules_dst_bypass_$intf dst -j MARK --set-xmark 0x539$count
-I ss_rules_pre_src 2 -m set --match-set ss_rules_dst_bypass_$intf dst -j RETURN
-I ss_rules_pre_src 3 -m mark --mark 0x539$count -j RETURN
-I ss_rules_local_out 1 -m mark --mark 0x539$count -j RETURN
COMMIT
EOF
fi
@ -105,10 +123,10 @@ _intf_rule() {
*nat
-I ss_rules6_dst 1 -m set --match-set ss_rules6_dst_bypass_$intf dst -j RETURN
-I ss_rules6_local_out 1 -m set --match-set ss_rules6_dst_bypass_$intf dst -j RETURN
-I ss_rules6_local_out 2 -m mark --mark 0x539$count -j RETURN
-I ss_rules6_pre_src 1 -m set --match-set ss_rules6_dst_bypass_$intf dst -j MARK --set-xmark 0x539$count
-I ss_rules6_pre_src 2 -m set --match-set ss_rules6_dst_bypass_$intf dst -j RETURN
-I ss_rules6_pre_src 3 -m mark --mark 0x539$count -j RETURN
-I ss_rules6_local_out 1 -m mark --mark 0x539$count -j RETURN
COMMIT
EOF
fi
@ -144,7 +162,7 @@ start_service() {
config_foreach _bypass_domain domains
uci -q commit dhcp
/etc/init.d/dnsmasq reload
config_foreach _bypass_proto dpis
#config_foreach _bypass_proto dpis
ip rule add prio 1 fwmark 0x539 lookup 991337 > /dev/null 2>&1
ip -6 rule add prio 1 fwmark 0x539 lookup 991337 > /dev/null 2>&1
@ -167,28 +185,26 @@ start_service() {
iptables-save --counters | grep -v omr-bypass-dpi | iptables-restore --counters
ip6tables-save --counters | grep -v omr-bypass-dpi | ip6tables-restore --counters
ndpi_rules=$(echo $ndpi_rules | awk 'NF')
if [ "$ndpi_rules" != "" ]; then
iptables-restore --wait=60 --noflush <<-EOF
*mangle
:omr-bypass-dpi -
-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
$ndpi_rules
COMMIT
EOF
ip6tables-restore --wait=60 --noflush <<-EOF
*mangle
:omr-bypass-dpi -
-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
$ndpi_rules
COMMIT
EOF
fi
#iptables-restore --wait=60 --noflush <<-EOF
#*mangle
#:omr-bypass-dpi -
#-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
#COMMIT
#EOF
ip6tables-restore --wait=60 --noflush <<-EOF
*mangle
:omr-bypass-dpi -
-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi
COMMIT
EOF
config_load omr-bypass
config_foreach _bypass_proto dpis
logger -t "omr-bypass" "OMR-ByPass is running"
}
service_triggers() {
PROCD_RELOAD_DELAY=1000
procd_add_reload_trigger omr-bypass shadowsocks-libev
procd_add_reload_trigger omr-bypass
procd_add_raw_trigger "interface.*" 2000 /etc/init.d/omr-bypass restart
}