From 27e074b1ead1ec42ea5a2c82bfed20159b91bab6 Mon Sep 17 00:00:00 2001 From: Johannes Kimmel Date: Thu, 21 Jan 2021 12:34:02 +0100 Subject: [PATCH] fff-network: exclude vxmesh fdb entries in client count This avoids counting a single client multiple times. Neighbours behind the vxlan device are actually local to another router and should only be counted there. Signed-off-by: Johannes Kimmel --- src/packages/fff/fff-network/Makefile | 2 +- .../fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index c97a816..21af16a 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_RELEASE:=31 +PKG_RELEASE:=32 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh index 1d5cd83..98e9f92 100755 --- a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh +++ b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh @@ -12,7 +12,7 @@ debug "Collecting information about connected clients" client_count=0 dataclient="" -CLIENT_INTERFACES=$(ls "/sys/class/net/$MESH_INTERFACE/brif" | grep -v '^bat') +CLIENT_INTERFACES=$(ls "/sys/class/net/$MESH_INTERFACE/brif" | grep -v -e '^bat' -v -e '^vxmesh') for clientif in ${CLIENT_INTERFACES}; do cc=$(bridge fdb show br "$MESH_INTERFACE" brport "$clientif" | grep -v self | grep -v permanent -c) client_count=$((client_count + cc))