From 4a23a992f4904725c22ef2302fb45da60ae58632 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 25 Dec 2023 09:54:32 +0100 Subject: [PATCH 1/4] Only indicate that modem is not in ModemManager for now... --- mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking | 5 +++-- 1 file changed, 3 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 3a315231d..12f10e425 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,9 +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, rescan modem..." - /usr/bin/mmcli -S 2>&1 >/dev/null + #_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..." + _log "Can't find $OMR_TRACKER_INTERFACE in ModemManager" #/etc/init.d/modemmanager restart sleep 30 fi From cd85e5fb59cfb86d9dbbd3df2c2d50b96fa7fa8e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Dec 2023 15:38:55 +0100 Subject: [PATCH 2/4] Don't use wrong device on OMR-Tracker when not yet available --- omr-bypass/files/etc/init.d/omr-bypass | 8 ++++++++ omr-tracker/files/bin/omr-tracker | 2 +- omr-tracker/files/etc/init.d/omr-tracker | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/omr-bypass/files/etc/init.d/omr-bypass b/omr-bypass/files/etc/init.d/omr-bypass index faceac0de..413165173 100755 --- a/omr-bypass/files/etc/init.d/omr-bypass +++ b/omr-bypass/files/etc/init.d/omr-bypass @@ -73,7 +73,9 @@ _bypass_domains() { config_get enabled $1 enabled config_get noipv6 $1 noipv6 config_get family $1 family + config_get vpn $1 vpn [ -z "$intf" ] && intf="all" + [ "$vpn" = "1" ] && intf="srv_vpn1" [ "$enabled" = "0" ] && return [ -z "$domain" ] && return [ -z "$family" ] && family="ipv4ipv6" @@ -995,6 +997,12 @@ start_service() { create omr_dst_bypass_all hash:net hashsize 64 create omr6_dst_bypass_all hash:net family inet6 hashsize 64 EOF + ipset -q flush omr_dst_bypass_srv_vpn1 > /dev/null 2>&1 + ipset -q flush omr6_dst_bypass_srv_vpn1 > /dev/null 2>&1 + ipset -q --exist restore <<-EOF + create omr_dst_bypass_srv_vpn1 hash:net hashsize 64 + create omr6_dst_bypass_srv_vpn1 hash:net family inet6 hashsize 64 + EOF } $IPTABLESSAVE --counters 2>/dev/null | grep -v omr-bypass | $IPTABLESRESTORE -w --counters 2>/dev/null $IPTABLESRESTORE -w --wait=60 --noflush <<-EOF diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 110eda0ea..7f0799eee 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -252,7 +252,7 @@ while true; do [ -z "$OMR_TRACKER_DEVICE" ] && network_get_physdev OMR_TRACKER_DEVICE $1 [ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]') - [ -z "$OMR_TRACKER_DEVICE" ] && config_get OMR_TRACKER_DEVICE "$1" device + #[ -z "$OMR_TRACKER_DEVICE" ] && config_get OMR_TRACKER_DEVICE "$1" device [ -n "$(echo $OMR_TRACKER_DEVICE | grep '@')" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["device"]') } diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker index 35d2c4e1c..2b1655ef5 100755 --- a/omr-tracker/files/etc/init.d/omr-tracker +++ b/omr-tracker/files/etc/init.d/omr-tracker @@ -61,7 +61,7 @@ _launch_tracker() { [ -z "$ifname" ] && network_get_physdev ifname $1 [ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]') - [ -z "$ifname" ] && config_get ifname "$1" device + #[ -z "$ifname" ] && config_get ifname "$1" device [ -n "$(echo $ifname | grep '@')" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["device"]') config_get multipath "$1" multipath From dfc9ea66c9d0728da4251b3e728384923621c895 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Dec 2023 20:06:44 +0100 Subject: [PATCH 3/4] Fix default config for z8102ax --- openmptcprouter/files/etc/uci-defaults/1920-omr-network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network index 4d2572a6e..5889afb48 100755 --- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network +++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network @@ -430,7 +430,7 @@ if ([ "$board" = "teltonika,rutx" ] || [ "$board" = "teltonika,rutx12" ] || [ "$ EOF fi -if [ "$board" = "z8102ax" ]; then +if [ "$board" = "z8102ax-128m" ] || [ "$board" = "z8102ax-64m" ] || [ "$board" = "z8102ax" ]; then uci -q batch <<-EOF set network.modem1=interface set network.modem1.proto='modemmanager' From 01f17f82f699dfbc56f67f083a10897f8d6bd693 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 26 Dec 2023 20:23:11 +0100 Subject: [PATCH 4/4] Fix typo in mptcp init --- mptcp/files/etc/init.d/mptcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index 8ea4f225b..2ca1050af 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -206,7 +206,7 @@ interface_multipath_settings() { #echo "îface: $iface" if [ "$(uci -q get openmptcprouter.settings.force_multipath)" != "0" ]; then - _logger -t "MPTCP" "Set $iface to $mode" + logger -t "MPTCP" "Set $iface to $mode" if [ "$mode" = "master" ]; then multipath "$iface" "on" else