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

Fix rules_up for v2ray and set rules after firewall changes

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-10-16 09:35:27 +02:00
parent b6b6d2fc29
commit d5a1ad3ceb
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
v2ray-core/files/etc/firewall.v2ray-rules Normal file
View file

@ -0,0 +1,2 @@
#!/bin/sh
/etc/init.d/v2ray rules_up

26
v2ray-core/files/etc/init.d/v2ray
View file

@ -411,12 +411,14 @@ add_v2ray_redirect_rules() {
local ipset_dst_direct="$IPSET_DST_DIRECT_V4" local ipset_dst_direct="$IPSET_DST_DIRECT_V4"
test -n "$port" || return test -n "$port" || return
logger -t "v2ray" "v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward"
# This part need a rewrite
v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward
logger -t "v2ray" "v2ray-rules2 -l $((port+1)) -L $((port+1)) -s $OUTBOUND_SERVERS_V6 --rule-name def --src-default forward --dst-default forward --local-default forward"
v2ray-rules6 -l $((port+1)) -L $((port+1)) --rule-name def --src-default forward --dst-default forward --local-default forward v2ray-rules6 -l $((port+1)) -L $((port+1)) --rule-name def --src-default forward --dst-default forward --local-default forward
logger -t "V2Ray" "Reload omr-bypass rules" [ -f /etc/init.d/omr-bypass ] && {
/etc/init.d/omr-bypass reload_rules logger -t "V2Ray" "Reload omr-bypass rules"
/etc/init.d/omr-bypass reload_rules
}
} }
init_rules_for_listfile() { init_rules_for_listfile() {
@ -2075,7 +2077,7 @@ start_instance() {
} }
rules_exist() { rules_exist() {
[ -n "$(iptables -t nat -L -n | grep v2r)" ] && return 0 [ -n "$(iptables -t nat -L -n | grep v2r_)" ] && return 0
return 1 return 1
} }
@ -2085,19 +2087,9 @@ rules_up() {
config_load v2ray config_load v2ray
config_get enabled main enabled "0" config_get enabled main enabled "0"
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
OUTBOUND_SERVERS_V4="$(uci -q get v2ray.omrout.s_vless_address)"
logger -t "V2Ray" "Rules UP" logger -t "V2Ray" "Rules UP"
#local bin="/usr/bin/v2ray-rules" add_v2ray_redirect_rules
[ -x "$bin" ] && {
"$bin" >/dev/null 2>&1
}
#local bin6="/usr/bin/v2ray-rules6"
[ -x "$bin6" ] && {
"$bin6" >/dev/null 2>&1
}
[ -f /etc/init.d/omr-bypass ] && {
logger -t "V2Ray" "Reload omr-bypass rules"
/etc/init.d/omr-bypass reload_rules
}
} }
rules_down() { rules_down() {

9
v2ray-core/files/etc/uci-defaults/3010-omr-v2ray
View file

@ -94,5 +94,14 @@ if [ -z "$(uci -q get v2ray.main)" ]; then
fi fi
uci -q set v2ray.omr.listen='::' uci -q set v2ray.omr.listen='::'
if [ "$(uci -q get firewall.v2ray)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set firewall.v2ray=include
set firewall.v2ray.path=/etc/firewall.v2ray
set firewall.v2ray.reload=1
commit firewall
EOF
fi
exit 0 exit 0