1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
This commit is contained in:
suyuan 2023-12-25 16:48:59 +08:00 committed by GitHub
commit cd74412022
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions

View file

@ -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

View file

@ -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 <stdint.h>
static inline uint64_t get_u_int64_t(const uint8_t* X, int O)
{
uint64_t tmp;