From 0b2321a306bcb048d720cb882fbd0563c7408fbb Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 14 Mar 2024 13:39:31 +0100 Subject: [PATCH] map-agent: map-dynamic-backhaul: replace deprecated get_network_of function usage --- .../files/etc/hotplug.d/ethernet/map-dynamic-backhaul | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul index 7bd49312b..69d87a37a 100755 --- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul +++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul @@ -4,14 +4,18 @@ conn_ports_file="/var/run/multiap/map.connected.ports" map_bh_file="/var/run/multiap/multiap.backhaul" + +# Exit if AL Bridge is not configured to be a bridge device al_bridge="$(uci -q get mapagent.agent.al_bridge)" [ "${al_bridge:0:3}" = "br-" ] || exit 0 -al_brnet="${al_bridge:3}" # Exit if the PORT is not member of the AL Bridge -[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0 +port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)" +port_bridge_name="$(uci -q get network.$port_bridge_sec.name)" +[ "$port_bridge_name" = "$al_bridge" ] || exit 0 # Exit if the device is not operating in extender/repeater mode +al_brnet="${al_bridge:3}" [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0 ############## Dynamic Backhaul Daemon ##############