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

Use uci for ip rule in omr-bypass

Browse source
This commit is contained in:
Ycarus 2018-12-21 15:42:14 +01:00
parent f9858717b7
commit 9e4aaea7a2
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,8 @@ _intf_rule() {
local intf local intf
config_get intf $1 ifname config_get intf $1 ifname
[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
count=$((count+1)) #count=$((count+1))
config_get count $1 metric
local mode local mode
config_get mode $1 multipath "off" config_get mode $1 multipath "off"
[ "$mode" = "off" ] && return [ "$mode" = "off" ] && return
@ -177,8 +178,21 @@ _intf_rule() {
create omr_rules_dst_bypass_$intf hash:net hashsize 64 create omr_rules_dst_bypass_$intf hash:net hashsize 64
create omr_rules6_dst_bypass_$intf hash:net family inet6 hashsize 64 create omr_rules6_dst_bypass_$intf hash:net family inet6 hashsize 64
EOF EOF
ip rule add prio 1 fwmark 0x539$count lookup $count pref 1 > /dev/null 2>&1 uci -q batch <<-EOF >/dev/null
ip -6 rule add prio 1 fwmark 0x6539$count lookup 6$count > /dev/null 2>&1 delete network.${1}_fw_rule=rule
set network.${1}_fw_rule=rule
set network.${1}_fw_rule.priority=1
set network.${1}_fw_rule.mark=0x539${count}
set network.${1}_fw_rule.lookup=${count}
delete network.${1}_fw_rule6=rule6
set network.${1}_fw_rule6=rule6
set network.${1}_fw_rule6.priority=1
set network.${1}_fw_rule6.mark=0x6539${count}
set network.${1}_fw_rule6.lookup=${count}
commit network
EOF
#ip rule add prio 1 fwmark 0x539$count lookup $count pref 1 > /dev/null 2>&1
#ip -6 rule add prio 1 fwmark 0x6539$count lookup 6$count > /dev/null 2>&1
if [ "$(iptables -w 40 -t mangle -L | grep omr_rules_dst_bypass_$intf)" = "" ]; then if [ "$(iptables -w 40 -t mangle -L | grep omr_rules_dst_bypass_$intf)" = "" ]; then
iptables-restore --wait=60 --noflush <<-EOF iptables-restore --wait=60 --noflush <<-EOF
*mangle *mangle
@ -239,7 +253,7 @@ boot() {
} }
start_service() { start_service() {
local count #local count
logger -t "omr-bypass" "Starting OMR-ByPass..." logger -t "omr-bypass" "Starting OMR-ByPass..."
ipset -q flush omr_rules_dst_bypass_all > /dev/null 2>&1 ipset -q flush omr_rules_dst_bypass_all > /dev/null 2>&1
ipset -q flush omr_rules6_dst_bypass_all > /dev/null 2>&1 ipset -q flush omr_rules6_dst_bypass_all > /dev/null 2>&1