Merge branch 'test' into develop

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

@@ -498,11 +498,19 @@ _bypass_proto_without_ndpi() {
 		ALLIPS=$(sqlite3 /usr/share/omr-bypass/omr-bypass.db "select ip from ipproto where proto=\"$proto\";" ".exit")
 		if [ -n "$ALLIPS" ]; then
 			ipset -q flush bypass_$proto > /dev/null 2>&1
+			ipset -q flush bypass6_$proto > /dev/null 2>&1
 			ipset -q --exist restore <<-EOF
 			create bypass_$proto hash:net hashsize 64
+			create bypass6_$proto hash:net hashsize 64
 			EOF
 			for ip in $ALLIPS; do
-				ipset -q add bypass_$proto $ip
+				valid_ip4=$( valid_subnet4 $ip)
+				valid_ip6=$( valid_subnet6 $ip)
+				if [ "$valid_ip4" = "ok" ]; then
+					ipset -q add bypass_$proto $ip
+				elif [ "$valid_ip6" = "ok" ]; then
+					ipset -q add bypass6_$proto $ip
+				fi
 			done
 			if [ "$intf" = "all" ]; then
 				if [ "$family" = "ipv4" ] || [ "$family" = "ipv4ipv6" ]; then
@@ -516,7 +524,7 @@ _bypass_proto_without_ndpi() {
 				if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
 					$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
 					*mangle
-					-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539
+					-A omr-bypass6-dpi -m set --match-set bypass6_$proto dst -j MARK --set-mark 0x6539
 					-A omr-bypass6-dpi -m mark --mark 0x6539 -j RETURN
 					COMMIT
 					EOF
@@ -533,7 +541,7 @@ _bypass_proto_without_ndpi() {
 				if [ "$disableipv6" = "0" ] && ([ "$family" = "ipv6" ] || [ "$family" = "ipv4ipv6" ]); then
 					$IP6TABLESRESTORE -w --wait=60  --noflush <<-EOF
 					*mangle
-					-A omr-bypass6-dpi -m set --match-set bypass_$proto dst -j MARK --set-mark 0x6539$intfid
+					-A omr-bypass6-dpi -m set --match-set bypass6_$proto dst -j MARK --set-mark 0x6539$intfid
 					-A omr-bypass6-dpi -m mark --mark 0x6539$intfid -j RETURN
 					COMMIT
 					EOF

luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua

@@ -926,8 +926,8 @@ function wizard_add()
 		ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm")
 		ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm")
 		ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm")
-		ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm")
+		ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
-		ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm")
+		ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
 	elseif encryption == "aes-256-cfb" then
 		ucic:set("openmptcprouter","settings","encryption","aes-256-cfb")
 		ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb")
@@ -945,15 +945,15 @@ function wizard_add()
 		ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm")
 		ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm")
 		ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm")
-		ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm")
+		ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
-		ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm")
+		ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
 	elseif encryption == "chacha20-ietf-poly1305" then
 		ucic:set("openmptcprouter","settings","encryption","chacha20")
 		ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
 		ucic:set("shadowsocks-libev","sss1","method","chacha20-ietf-poly1305")
 		ucic:set("glorytun","vpn","chacha20","1")
 		ucic:set("glorytun-udp","vpn","chacha","1")
-		ucic:set("openvpn","omr","cipher","AES-256-CBC")
+		ucic:set("openvpn","omr","cipher","AES-256-GCM")
 		ucic:set("mlvpn","general","cleartext_data","0")
 		ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305")
 		ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305")
@@ -964,8 +964,10 @@ function wizard_add()
 		ucic:set("xray","omrout","s_trojan_user_security","chacha20-poly1305")
 		ucic:set("xray","omrout","s_socks_user_security","chacha20-poly1305")
 		ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-chacha20-poly1305")
-		ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-chacha20-poly1305")
+		--ucic:set("shadowsocks-rust","sss0","method","2022-blake3-chacha20-poly1305")
-		ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-chacha20-poly1305")
+		--ucic:set("shadowsocks-rust","sss1","method","2022-blake3-chacha20-poly1305")
+		ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
+		ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
 	else
 		ucic:set("openmptcprouter","settings","encryption","other")
 	end

luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm

@@ -28,7 +28,7 @@ menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
 			lastmodif=""
 			allbackup=luci.model.uci.cursor():get("openmptcprouter",servername,"allbackup")
 			for _, backup in pairs(allbackup) do
-			    filemodif=split(backup, '|')
+			    filemodif=luci.util.split(backup, '|')
 			    if filemodif[2] ~= lastmodif then
 				lastmodif=filemodif[2]
 				%>

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

@@ -115,7 +115,7 @@ set_get_config() {
 	[ -n "$server" ] && uci -q set openmptcprouter.${server}.get_config=1
 }
 
-if ([ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]) || ([ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ]); then
+if ([ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]) || ([ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.password)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "192.18.1.3" ]); then
 	config_load openmptcprouter
 	config_foreach set_get_config server
 	[ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter

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

@@ -93,3 +93,38 @@ if [ -n "$(grep RUTX /etc/board.json)" ] && [ -z "$(grep RUTX50 /etc/board.json)
 		fi
 	fi
 fi
+if [ -n "$(grep RUTX /etc/board.json)" ] && [ -n "$(grep RUTX50 /etc/board.json)" ] && [ -n "$OMR_TRACKER_DEVICE" ]; then
+	if [ "$OMR_TRACKER_DEVICE" = "wwan0" ]; then
+		modemdata=$(omr-modemmanager '/sys/devices/platform/soc/8af8800.usb3/8a00000.dwc3/xhci-hcd.0.auto/usb2/2-1' all)
+		gen=$(echo $modemdata | cut -d ';' -f 5 | tr -d '\n')
+		if [ "$gen" = "gsm" ]; then
+			echo "default-on" > /sys/class/leds/green:3g/trigger
+			echo "none" > /sys/class/leds/green:4g/trigger
+			echo "none" > /sys/class/leds/green:5g/trigger
+		elif [ "$gen" = "umts" ]; then
+			echo "none" > /sys/class/leds/green:3g/trigger
+			echo "default-on" > /sys/class/leds/green:4g/trigger
+			echo "none" > /sys/class/leds/green:5g/trigger
+		elif [ "$gen" = "lte" ]; then
+			echo "none" > /sys/class/leds/green:3g/trigger
+			echo "none" > /sys/class/leds/green:4g/trigger
+			echo "default-on" > /sys/class/leds/green:5g/trigger
+		fi
+		bar=$(echo $modemdata | cut -d ';' -f 1 | tr -d '\n')
+		if [ "$bar" -gt "10" ]; then
+			echo "default-on" > /sys/class/leds/green:rssi0/trigger
+		else
+			echo "none" > /sys/class/leds/green:rssi0/trigger
+		fi
+		if [ "$bar" -gt "50" ]; then
+			echo "default-on" > /sys/class/leds/green:rssi1/trigger
+		else
+			echo "none" > /sys/class/leds/green:rssi1/trigger
+		fi
+		if [ "$bar" -gt "70" ]; then
+			echo "default-on" > /sys/class/leds/green:rssi2/trigger
+		else
+			echo "none" > /sys/class/leds/green:rssi2/trigger
+		fi
+	fi
+fi

omr-tracker/files/bin/omr-tracker-ss

@@ -166,7 +166,7 @@ while true; do
 						/etc/init.d/shadowsocks-libev restart
 						sleep 5
 					fi
-					if [ "$type" = "rust" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
+					if [ "$type" = "rust" ] && [ "$(pgrep sslocal)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
 						_log "Can't find shadowsocks rust, restart it..."
 						/etc/init.d/shadowsocks-rust restart
 						sleep 5

omr-tracker/files/etc/init.d/omr-tracker

@@ -243,7 +243,7 @@ _launch_shadowsocks_tracker() {
 	procd_append_param env "OMR_TRACKER_TRIES=$tries"
 	procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
 	procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port"
-	procd_append_param env "OMR_TRACKER_WAIT_TEST=$type"
+	procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
 	procd_append_param env "OMR_TRACKER_SERVER=$server"
 	procd_append_param env "OMR_TRACKER_SS_TYPE=libev"
 	procd_set_param limits nofile="51200 51200"
@@ -277,7 +277,7 @@ _launch_shadowsocks_rust_tracker() {
 	procd_append_param env "OMR_TRACKER_TRIES=$tries"
 	procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
 	procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port"
-	procd_append_param env "OMR_TRACKER_WAIT_TEST=$type"
+	procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
 	procd_append_param env "OMR_TRACKER_SERVER=$server"
 	procd_append_param env "OMR_TRACKER_SS_TYPE=rust"
 	procd_set_param limits nofile="51200 51200"

openmptcprouter/files/etc/init.d/openmptcprouter-vps

@@ -323,10 +323,12 @@ _set_ssgo_server_vps() {
 	config_load shadowsocks-rust
 	config_foreach _get_ss_redir ss_redir
 	config_foreach _get_ss_server server
+	# Force disable fast open for now du to problem on 6.1 with MPTCP
+	fast_open="false"
 
 	if [ "$current_mptcp" != "$mptcp" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_fast_open" != "$fast_open" ]; then
 		local settings
-		settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":true,"mptcp":'$mptcp'}'
+		settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":false,"mptcp":'$mptcp'}'
 		result=$(_set_json "shadowsocks-go" "$settings")
 	fi
 }
@@ -925,6 +927,7 @@ _set_vpn_ip() {
 	local settings
 	[ -z "$vps_config" ] && vps_config=$(_get_json "config")
 	[ -z "$vps_config" ] && return
+	[ "$(uci -q get openmptcprouter.settings.vpn)" = "none" ] && return
 	vpnifname="$(uci -q get network.omrvpn.device)"
 	vpnip_local_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.remoteip')"
 	vpnip_local=$(ip -4 -br addr ls dev ${vpnifname} | awk -F'[ /]+' '{print $3}')
@@ -1591,7 +1594,7 @@ _set_config_from_vps() {
 			set shadowsocks-rust.sss0.server_port=$ss_port
 			set shadowsocks-rust.sss0.method=$ss_method
 		EOF
-		config_foreach _set_ssrust_server server "key" $ssgo_sskey
+		config_foreach _set_ssrust_server server "password" $ssgo_sskey
 		config_foreach _set_ssrust_server server "method" $ss_method
 		if [ "$(uci -q get shadowsocks-rust.sss0.server)" != "127.0.0.1" ]; then
 			config_foreach _set_ssrust_server server "server" $vpsip
@@ -1647,7 +1650,7 @@ _set_config_from_vps() {
 			set xray.omrout.s_vless_user_id="$xray_key"
 			set xray.omrout.s_vless_port="$xray_port"
 		EOF
-		uci -q set xray.omrout.s_shadowsocks_password=$ss_key
+		#uci -q set xray.omrout.s_shadowsocks_password=$xray_sskey
 		if [ "$(uci -q get xray.omrout.s_vmess_address)" != "127.0.0.1" ]; then
 			uci -q set xray.omrout.s_vmess_address="$vpsip"
 			uci -q set xray.omrout.s_vless_address="$vpsip"

openmptcprouter/files/etc/uci-defaults/2060-omr-system

@@ -39,7 +39,50 @@ fi
 	EOF
 }
 
-if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
+if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx50)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
+	uci -q batch <<-EOF >/dev/null
+		add system led
+		set system.@led[-1].sysfs='green:eth'
+		set system.@led[-1].name='WAN_ETH'
+		set system.@led[-1].trigger='netdev'
+		set system.@led[-1].dev='eth0'
+		add_list system.@led[-1].mode='tx'
+		add_list system.@led[-1].mode='rx'
+		add system led
+		set system.@led[-1].sysfs='green:wifi'
+		set system.@led[-1].name='WAN_WIFI'
+		set system.@led[-1].trigger='netdev'
+		add_list system.@led[-1].mode='tx'
+		add_list system.@led[-1].mode='rx'
+		add system led
+		set system.@led[-1].sysfs='green:sim1'
+		set system.@led[-1].name='WAN_MODEM1'
+		set system.@led[-1].trigger='netdev'
+		set system.@led[-1].dev='wwan0'
+		set system.@led[-1].mode='rx'
+		add system led
+		set system.@led[-1].name='WAN_MODEM2'
+		set system.@led[-1].sysfs='green:sim2'
+		set system.@led[-1].trigger='netdev'
+		set system.@led[-1].dev='wwan1'
+		set system.@led[-1].mode='rx'
+		add system led
+		set system.@led[-1].name='WIFI24'
+		set system.@led[-1].sysfs='green:wifi2g'
+		set system.@led[-1].trigger='netdev'
+		set system.@led[-1].dev='radio0.network1'
+		add_list system.@led[-1].mode='tx'
+		add_list system.@led[-1].mode='rx'
+		add system led
+		set system.@led[-1].name='WIFI5'
+		set system.@led[-1].sysfs='green:wifi5g'
+		set system.@led[-1].trigger='netdev'
+		set system.@led[-1].dev='radio1.network1'
+		add_list system.@led[-1].mode='tx'
+		add_list system.@led[-1].mode='rx'
+		commit system
+	EOF
+elif [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add system led
 		set system.@led[-1].sysfs='wan_wifi_4'

shadowsocks-rust/files/shadowsocks-rust.config

@@ -7,25 +7,10 @@ config ss_redir hi1
 	option fast_open 0
 	option verbose 0
 	option syslog 1
-	option reuse_port 1
+	option reuse_port 0
 	option mptcp 1
 	option ipv6_first 1
-	option no_delay 1
+	option no_delay 0
-
-config ss_redir hi2
-	option server 'sss0'
-	option local_address '0.0.0.0'
-	option local_port '1100'
-	option mode 'tcp_and_udp'
-	option timeout '1000'
-	option fast_open 1
-	option verbose 0
-	option syslog 1
-	option reuse_port 1
-	option mptcp 1
-	option ipv6_first 1
-	option no_delay 1
-	option disabled 1
 
 config ss_rules 'ss_rules'
 	option disabled 0
@@ -39,7 +24,7 @@ config server 'sss0'
 	option disabled 1
 	option server '192.168.1.3'
 	option server_port '65280'
-	option key ''
+	option password ''
 	option method '2022-blake3-aes-256-gcm'
 	option obfs 0