From f7a591f3dcd08ea2949469a78916efd0c14a2b63 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 2 May 2024 09:46:53 +0200 Subject: [PATCH 1/3] Simplify z8102 watchdog command --- z8102/files/usr/lib/custom/wdg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/z8102/files/usr/lib/custom/wdg.sh b/z8102/files/usr/lib/custom/wdg.sh index 3f2e2d868..e69527cec 100755 --- a/z8102/files/usr/lib/custom/wdg.sh +++ b/z8102/files/usr/lib/custom/wdg.sh @@ -10,14 +10,14 @@ do if [ -f /usr/bin/gpiofind ]; then gpioset `gpiofind "watchdog"`=1 2>&1 >/dev/null else - gpioset --hold-period 100ms -t0 watchdog=1 2>&1 >/dev/null + gpioset -t0 watchdog=1 2>&1 >/dev/null fi sleep 1 #echo "0" > /sys/class/gpio/gpio${i}/value if [ -f /usr/bin/gpiofind ]; then gpioset `gpiofind "watchdog"`=0 2>&1 >/dev/null else - gpioset --hold-period 100ms -t0 watchdog=0 2>&1 >/dev/null + gpioset -t0 watchdog=0 2>&1 >/dev/null fi sleep 1 done \ No newline at end of file From fa035a752a6d0f7ec9a0f29910ba7f2c217b300c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 2 May 2024 19:07:24 +0200 Subject: [PATCH 2/3] No MPTCP settings if interface down --- mptcp/files/etc/init.d/mptcp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index b8bce8fc0..1fb6407e4 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -212,6 +212,9 @@ interface_multipath_settings() { [ "$(echo $iface | grep _dev)" != "" ] && return 0 [ "$(echo $iface | grep '^if')" != "" ] && return 0 [ "$iface" = "lo" ] && return 0 + status=`ifstatus $config | jsonfilter -q -e "@.up" | tr -d "\n"` + [ "$status" = "false" ] && return 0 + #echo "îface: $iface" From 058c3474cca95ef6542d03755a1ca2c148ace07e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 2 May 2024 19:08:09 +0200 Subject: [PATCH 3/3] No special interface restart with modemmanager in OMR-Tracker --- .../omr/post-tracking.d/001-post-tracking | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 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 3cdd888f0..6cdd0ac55 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 @@ -733,17 +733,15 @@ initcwrwnd="" # An interface in error will never be used in MPTCP if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || ([ "$OMR_TRACKER_INTERFACE" != "omrvpn" ] && [ "$interface_up" != "true" ]); then - #if [ "$interface_up" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then - #if [ "$interface_available" = "true" ] && ([ "$interface_pending" = "true" ] || [ "$interface_up" = "true" ]) && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]); then - if [ "$interface_available" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]) && [ "$interface_error" != "MM_PINCODE_REQUIRED" ]; then - _log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface" - _log "Set $OMR_TRACKER_INTERFACE down" - ifdown $OMR_TRACKER_INTERFACE - sleep 5 - _log "Set $OMR_TRACKER_INTERFACE up" - ifup $OMR_TRACKER_INTERFACE - sleep 30 - elif [ -n "$OMR_TRACKER_INTERFACE" ] && [ -n "$OMR_TRACKER_DEVICE" ] && [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] && [ "$interface_up" = "false" ] && [ "$interface_available" = "false" ] && [ "$interface_pending" = "false" ] && [ "$interface_autostart" = "true" ]; then + #if [ "$interface_available" = "true" ] && [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "wireguard" ]) && [ "$interface_error" != "MM_PINCODE_REQUIRED" ] && [ "$interface_error" != "MM_FAILED_REASON_SIM_MISSING" ]; then + # _log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface" + # _log "Set $OMR_TRACKER_INTERFACE down" + # ifdown $OMR_TRACKER_INTERFACE + # sleep 5 + # _log "Set $OMR_TRACKER_INTERFACE up" + # ifup $OMR_TRACKER_INTERFACE + # sleep 30 + if [ -n "$OMR_TRACKER_INTERFACE" ] && [ -n "$OMR_TRACKER_DEVICE" ] && [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] && [ "$interface_up" = "false" ] && [ "$interface_available" = "false" ] && [ "$interface_pending" = "false" ] && [ "$interface_autostart" = "true" ]; then modemfind="0" for modem in $(timeout 3 mmcli -L | awk -F/ '{ print $6}' | awk '{print $1}'); do modeminfo="$(timeout 2 mmcli -m $modem -K)"