From 95cdac78e22ee139024861a49a4cec04ea1cca00 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 25 Dec 2023 09:24:59 +0100 Subject: [PATCH 1/2] Rescan instead of restart ModemManager when modem missing, restart OpenPVN if not working --- .../usr/share/omr/post-tracking.d/001-post-tracking | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 a6e347037..3a315231d 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 @@ -748,8 +748,10 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then fi done if [ "$modemfind" = "0" ]; then - _log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, restart modemmanager..." - /etc/init.d/modemmanager restart + _log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, rescan modem..." + /usr/bin/mmcli -S 2>&1 >/dev/null + #_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, restart modemmanager..." + #/etc/init.d/modemmanager restart sleep 30 fi fi @@ -901,6 +903,10 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then _log "Glorytun UDP VPN down, restart it" /etc/init.d/glorytun-udp restart 2>&1 >/dev/null fi + if [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then + _log "OpenVPN down, restart it" + /etc/init.d/openvpn restart 2>&1 >/dev/null + fi config_load openmptcprouter config_foreach disable_pihole server #if [ "$(uci -q get openmptcprouter.settings.master)" != "balancing" ] || [ "$(uci -q get openmptcprouter.settings.vpn)" = "mlvpn" ]; then From 8d88557722ab57d30e31b6d85a37155df6f8b722 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 25 Dec 2023 09:33:20 +0100 Subject: [PATCH 2/2] Fix NDPI on ARM --- .../patches/004-fix-compilation-on-arm.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ndpi-netfilter2/patches/004-fix-compilation-on-arm.patch diff --git a/ndpi-netfilter2/patches/004-fix-compilation-on-arm.patch b/ndpi-netfilter2/patches/004-fix-compilation-on-arm.patch new file mode 100644 index 000000000..7e7218e3e --- /dev/null +++ b/ndpi-netfilter2/patches/004-fix-compilation-on-arm.patch @@ -0,0 +1,10 @@ +--- a/src/include/ndpi_define.h.in 2023-12-25 08:45:56.692170223 +0100 ++++ b/src/include/ndpi_define.h.in 2023-12-25 08:46:11.595904820 +0100 +@@ -326,7 +326,6 @@ + #define get_u_int16_t(X,O) (*(u_int16_t *)((&(((u_int8_t *)X)[O])))) + #define get_u_int32_t(X,O) (*(u_int32_t *)((&(((u_int8_t *)X)[O])))) + #if defined(__arm__) +-#include + static inline uint64_t get_u_int64_t(const uint8_t* X, int O) + { + uint64_t tmp;