mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

sync (#478)

Browse source
This commit is contained in:
suyuan 2024-05-03 01:38:58 +08:00 • committed by GitHub
commit cabb3a312f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mptcp/files/etc/init.d/mptcp
View file

@ -212,6 +212,9 @@ interface_multipath_settings() {
[ "$(echo $iface | grep _dev)" != "" ] && return 0 [ "$(echo $iface | grep _dev)" != "" ] && return 0
[ "$(echo $iface | grep '^if')" != "" ] && return 0 [ "$(echo $iface | grep '^if')" != "" ] && return 0
[ "$iface" = "lo" ] && return 0 [ "$iface" = "lo" ] && return 0
status=`ifstatus $config | jsonfilter -q -e "@.up" | tr -d "\n"`
[ "$status" = "false" ] && return 0
#echo "îface: $iface" #echo "îface: $iface"

20
mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
View file

@ -733,17 +733,15 @@ initcwrwnd=""
# An interface in error will never be used in MPTCP # An interface in error will never be used in MPTCP
if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || ([ "$OMR_TRACKER_INTERFACE" != "omrvpn" ] && [ "$interface_up" != "true" ]); then 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" ] && [ -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
#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 # _log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface"
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 "Set $OMR_TRACKER_INTERFACE down"
_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface" # ifdown $OMR_TRACKER_INTERFACE
_log "Set $OMR_TRACKER_INTERFACE down" # sleep 5
ifdown $OMR_TRACKER_INTERFACE # _log "Set $OMR_TRACKER_INTERFACE up"
sleep 5 # ifup $OMR_TRACKER_INTERFACE
_log "Set $OMR_TRACKER_INTERFACE up" # sleep 30
ifup $OMR_TRACKER_INTERFACE 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
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
modemfind="0" modemfind="0"
for modem in $(timeout 3 mmcli -L | awk -F/ '{ print $6}' | awk '{print $1}'); do for modem in $(timeout 3 mmcli -L | awk -F/ '{ print $6}' | awk '{print $1}'); do
modeminfo="$(timeout 2 mmcli -m $modem -K)" modeminfo="$(timeout 2 mmcli -m $modem -K)"

4
z8102/files/usr/lib/custom/wdg.sh
View file

@ -10,14 +10,14 @@ do
if [ -f /usr/bin/gpiofind ]; then if [ -f /usr/bin/gpiofind ]; then
gpioset `gpiofind "watchdog"`=1 2>&1 >/dev/null gpioset `gpiofind "watchdog"`=1 2>&1 >/dev/null
else else
gpioset --hold-period 100ms -t0 watchdog=1 2>&1 >/dev/null gpioset -t0 watchdog=1 2>&1 >/dev/null
fi fi
sleep 1 sleep 1
#echo "0" > /sys/class/gpio/gpio${i}/value #echo "0" > /sys/class/gpio/gpio${i}/value
if [ -f /usr/bin/gpiofind ]; then if [ -f /usr/bin/gpiofind ]; then
gpioset `gpiofind "watchdog"`=0 2>&1 >/dev/null gpioset `gpiofind "watchdog"`=0 2>&1 >/dev/null
else else
gpioset --hold-period 100ms -t0 watchdog=0 2>&1 >/dev/null gpioset -t0 watchdog=0 2>&1 >/dev/null
fi fi
sleep 1 sleep 1
done done