sync (#431)

suyuan168 · Jan 30, 2024 · d42fdc9 · d42fdc9
2 parents 2c2462e + d930f7f
commit d42fdc9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
@@ -125,6 +125,9 @@ interface_multipath_settings() {
 	else
 		metric="$(uci -q get openmptcprouter.${config}.metric)"
 	fi
+	if [ "${config}" = "lan" ] || [ "$(uci -q get network.${config}.ip4table)" = "lan" ]; then
+		metric="9999"
+	fi
 	config_set "$config" metric $metric
 	uci -q set network.${config}.metric=$metric
 	uci -q set openmptcprouter.${config}.metric=$metric

diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
@@ -177,7 +177,7 @@ _ping() {
 		loss=$(echo "$ret" | grep 'packet loss' | cut -d " " -f6 | sed 's/%//' | tr -d '\n')
 		if [ -n "$loss" ] && [ "$loss" -ne 100 ]; then
 			if [ "$localip" = "yes" ]; then
-				latency=$(echo "$ret" | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
+				latency=$(echo "$ret" | grep rtt | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
 				[ -n "$latency" ] && {
 					OMR_TRACKER_LATENCY="$latency"
 					_update_rto "$OMR_TRACKER_LATENCY"

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
@@ -87,7 +87,7 @@ MY_DEPENDS := \
     (TARGET_x86||TARGET_x86_64):kmod-mlx4-core \
     !(TARGET_ips40xx||TARGET_ramips):iptables-mod-ndpi !(TARGET_ips40xx||TARGET_ramips):kmod-ipt-ndpi libip4tc libip6tc \
     xray-core LINUX_5_4:xray-config !LINUX_5_4:xray-config-nft shadowsocks-rust-sslocal shadowsocks-rust-ssservice LINUX_5_4:shadowsocks-rust-config !LINUX_5_4:shadowsocks-rust-config-nft luci-app-shadowsocks-rust (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2 \
-    luci-proto-external omr-schedule
+    luci-proto-external omr-schedule jq luci-app-ddns
 
 # keepalived disabled by default because it's running even with no configuration, would need a default OMR config with some changes
 #    (TARGET_x86||TARGET_x86_64):keepalived (TARGET_x86||TARGET_x86_64):keepalived-sync

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -2231,7 +2231,8 @@ _config_service() {
 			vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')"
 			if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then
 				logger -t "OMR-VPS" "CPU support AES, set it by default"
-				method="$(uci -q get shadowsocks-libev.sss0.method)"
+				#method="$(uci -q get shadowsocks-libev.sss0.method)"
+				method="$(uci -q get openmptcprouter.settings.encryption)"
 				uci -q batch <<-EOF >/dev/null
 					set openmptcprouter.settings.encryption="aes-256-gcm"
 					commit openmptcprouter
@@ -2281,7 +2282,7 @@ _config_service() {
 		[ -z "$(_set_vpn_vps)" ] && error=1
 		[ -z "$(_set_proxy_vps)" ] && error=1
 	fi
-	[ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && uci -q set openmptcprouter.${servername}.get_config=1
+	[ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" = "" ] && uci -q set openmptcprouter.${servername}.get_config=1
 
 	#_set_pihole
 	[ -n "$wanips" ] && _set_wan_ip