From 517ffd45671dd27f424aa1019eb4453e649679dc Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 13 Sep 2023 10:48:17 +0200 Subject: [PATCH 1/3] Fix compilation for 5.4 --- netifd/patches/001-init-pause.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 netifd/patches/001-init-pause.patch diff --git a/netifd/patches/001-init-pause.patch b/netifd/patches/001-init-pause.patch new file mode 100644 index 000000000..0c09aab73 --- /dev/null +++ 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]; From 8390c42e126c904a4b127299b1e6c69655f7bc1b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 14 Sep 2023 11:13:47 +0200 Subject: [PATCH 2/3] Change sleep duration for omr-tracker after error --- mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index b29484d6d..3c1a64006 100755 --- 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 From d303c1bce420a4f80bea008e2b7fe8cb53485cbc Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 14 Sep 2023 11:15:40 +0200 Subject: [PATCH 3/3] Remove ncp-disable for mptcp over vpn using OpenVPN --- openmptcprouter/files/etc/init.d/mptcpovervpn | 1 - 1 file changed, 1 deletion(-) diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn index f192c51fa..a827989a9 100755 --- 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'