Merge pull request #356 from Ysurac/develop

sync
suyuan168 · Sep 14, 2023 · 220d8db · 220d8db
2 parents 372db2c + d303c1b
commit 220d8db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
@@ -744,7 +744,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
 				modem_device=$(mmcli -m $modem -K | grep 'modem.generic.device ' | awk '{print $3}')
 				[ -n "$modem_device" ] && modem_interface=$(uci show network | grep $modem_device | awk -F. '{print $2}')
 				[ -n "$modem_interface" ] && {
-					_log "No anwser from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart associed interface $modem_interface"
+					_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart associed interface $modem_interface"
 					ifup $modem_interface
 				}
 			fi
@@ -900,9 +900,9 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
 
 	# Set a little sleep after an interface error
 	if [ -n "$RANDOM" ]; then
-		sleep `expr $RANDOM % 10`
+		sleep `expr $RANDOM % 100`
 	else
-		sleep `awk 'BEGIN{srand();print int(rand()*9)}'`
+		sleep `awk 'BEGIN{srand();print int(rand()*20)}'`
 	fi
 
 	exit 0

diff --git a/netifd/patches/001-init-pause.patch b/netifd/patches/001-init-pause.patch
@@ -0,0 +1,13 @@
+--- a/system-linux.c	2023-09-13 10:44:22.163111635 +0200
++++ b/system-linux.c	2023-09-13 10:44:47.562696256 +0200
+@@ -2720,7 +2720,9 @@
+ system_if_dump_info(struct device *dev, struct blob_buf *b)
+ {
+ 	__u32 *supported, *advertising, *lp_advertising;
+-	bool rx_pause, tx_pause, pause_autoneg;
++	bool rx_pause = false;
++	bool tx_pause = false;
++	bool pause_autoneg = false;
+ 	struct {
+ 		struct ethtool_link_settings req;
+ 		__u32 link_mode_data[3 * 127];
diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn
@@ -84,7 +84,6 @@ mptcp_over_vpn() {
 					set openvpn.${interface}.remote="${remoteip}"
 					set openvpn.${interface}.local="${localip}"
 					set openvpn.${interface}.lport='0'
-					set openvpn.${interface}.ncp_disable='1'
 					set openvpn.${interface}.auth_nocache='1'
 					set openvpn.${interface}.proto='udp'
 					set openvpn.${interface}.client='1'