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

sync

luci-app-omr-bypass/root/etc/init.d/omr-bypass

@@ -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"

mptcp/files/usr/share/omr/post-tracking.d/post-tracking

@@ -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..."

openmptcprouter/files/etc/uci-defaults/2092-upnpd

@@ -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

v2ray-core/files/etc/init.d/v2ray

@@ -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"
+	[ -n "$OUTBOUND_SERVERS_V4" ] && {
-	add_v2ray_redirect_rules
+		logger -t "v2ray" "Rules UP"
+		add_v2ray_redirect_rules
+	}
 }
 
 rules_down() {