From 4f0139e9e901088ab69d1193d07258ba19820a80 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 16 Aug 2024 20:46:43 +0200 Subject: [PATCH] No MPTCP reload on public IP change in OMR-Tracker Post-Tracking status script --- .../usr/share/omr/post-tracking.d/020-status | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/omr-tracker/files/usr/share/omr/post-tracking.d/020-status b/omr-tracker/files/usr/share/omr/post-tracking.d/020-status index 2584f7d30..c594a8596 100755 --- a/omr-tracker/files/usr/share/omr/post-tracking.d/020-status +++ b/omr-tracker/files/usr/share/omr/post-tracking.d/020-status @@ -73,10 +73,10 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && { [ "$(uci -q get openmptcprouter.$OMR_TRA _log "New public ip detected for $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE): $ipaddr (First public IP detected)" fi uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.publicip="$ipaddr" - /etc/init.d/mptcp enabled && { - _log "Reload MPTCP for $OMR_TRACKER_DEVICE" - /etc/init.d/mptcp reload "$OMR_TRACKER_DEVICE" >/dev/null 2>&1 - } + #/etc/init.d/mptcp enabled && ([ "$OMR_TRACKER_DEVICE_IP" = "$previousip" ] || [ "$OMR_TRACKER_DEVICE_IP" = "$ipaddr" ]) && { + # _log "Reload MPTCP for $OMR_TRACKER_DEVICE" + # /etc/init.d/mptcp reload "$OMR_TRACKER_DEVICE" >/dev/null 2>&1 + #} } [ -n "$OMR_TRACKER_LATENCY" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency="$OMR_TRACKER_LATENCY" [ -n "$asn" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.asn)" != "$asn" ] && { @@ -183,11 +183,12 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && { [ "$(uci -q get openmptcprouter.$OMR_TRA } fi [ -n "$ip6addr" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.publicip)" != "$ip6addr" ] && { + previousip6=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.publicip) _log "New public ip detected for $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE): $ip6addr" - /etc/init.d/mptcp enabled && { - _log "Reload MPTCP for $OMR_TRACKER_DEVICE" - /etc/init.d/mptcp reload "$OMR_TRACKER_DEVICE" >/dev/null 2>&1 - } + #/etc/init.d/mptcp enabled && ([ "$OMR_TRACKER_DEVICE_IP6" = "$ip6addr" ] || [ "$OMR_TRACKER_DEVICE_IP" = "$previousip6" ]) && { + # _log "Reload MPTCP for $OMR_TRACKER_DEVICE" + # /etc/init.d/mptcp reload "$OMR_TRACKER_DEVICE" >/dev/null 2>&1 + #} uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.publicip="$ip6addr" } [ -n "$OMR_TRACKER_LATENCY" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency="$OMR_TRACKER_LATENCY"