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

合并Ysurac/develop的拉取请求#109

Browse source 
sync
This commit is contained in:
suyuan 2021-04-08 00:30:05 +08:00 • committed by GitHub
commit 96df26a220
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ _bypass_domain() {
local domain=$1
local intf=$2
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
[ -z "$intf" ] && intf="all"
if [ -n "$domain" ]; then
domain=$(echo $domain | sed 's:^\.::')
@ -120,6 +120,7 @@ _bypass_mac() {
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -162,6 +163,7 @@ _bypass_lan_ip() {
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -220,6 +222,7 @@ _bypass_dest_port() {
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -276,6 +279,7 @@ _bypass_src_port() {
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -330,6 +334,7 @@ _bypass_proto() {
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/')
[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"

5
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1297,6 +1297,11 @@ if [ "$(pgrep v2ray)" = "" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ] &&
/etc/init.d/v2ray restart
sleep 5
fi
if [ "$(pgrep miniupnpd)" = "" ] && [ "$(uci -q get upnpd.config.enabled)" = "1" ] && [ -f /etc/init.d/miniupnpd ]; then
_log "Can't find miniupnpd, restart it..."
/etc/init.d/miniupnpd restart
sleep 5
fi
if [ "$(pgrep rpcd)" = "" ] && [ -f /etc/init.d/rpcd ]; then
_log "Can't find rpcd, restart it..."

7
openmptcprouter/files/etc/uci-defaults/2092-upnpd
View file

@ -7,4 +7,11 @@ if [ "$(uci -q get upnpd.config.external_ifac)" != "omrvpn" ]; then
EOF
fi
if [ "$(uci -q get upnpd.@perm_rule[0].ext_ports)" = "1024-65535" ]; then
uci -q batch <<-EOF >/dev/null
set upnpd.@perm_rule[0].ext_ports='1024-64999'
commit upnpd
EOF
fi
exit 0

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

@ -417,7 +417,7 @@ add_v2ray_redirect_rules() {
v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward
[ "$(uci -q get v2ray.main.inbounds | grep omr6)" != "" ] && {
v2ray-rules6 -f
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)) -s $OUTBOUND_SERVERS_V6 --rule-name def --src-default forward --dst-default forward --local-default forward
}
[ -f /etc/init.d/omr-bypass ] && {
logger -t "v2ray" "Reload omr-bypass rules"
@ -2092,9 +2092,12 @@ rules_up() {
config_get enabled main enabled "0"
[ "$enabled" = "0" ] && return
OUTBOUND_SERVERS_V4="$(uci -q get v2ray.omrout.s_vless_address)"
OUTBOUND_SERVERS_V6="$(uci -q get v2ray.omrout.s_vless_address)"
TRANSPARENT_PROXY_PORT="$(uci -q get v2ray.omr.port)"
logger -t "v2ray" "Rules UP"
add_v2ray_redirect_rules
[ -n "$OUTBOUND_SERVERS_V4" ] && {
logger -t "v2ray" "Rules UP"
add_v2ray_redirect_rules
}
}
rules_down() {