From 51ec3648cfee3e0ec5c9d1f46a1b4124c39a0ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Tue, 4 Jan 2022 12:04:47 +0100 Subject: [PATCH] fff-babeld: Simplify CIDR mask removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The removal of CIDR masks from ip addresses is changed to utilize variable substitutions, which simplifies the expression. Signed-off-by: Fabian Bläse Reviewed-by: Johannes Kimmel --- src/packages/fff/fff-babeld/files/lib/functions/fff/babel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/fff/fff-babeld/files/lib/functions/fff/babel b/src/packages/fff/fff-babeld/files/lib/functions/fff/babel index 7a7620b6..83c3a58c 100644 --- a/src/packages/fff/fff-babeld/files/lib/functions/fff/babel +++ b/src/packages/fff/fff-babeld/files/lib/functions/fff/babel @@ -49,7 +49,7 @@ babel_add_peeraddr() { uci add_list "$option"="$ip" elif ipaddr=$(uci -q get gateway.@client[0].ipaddr); then # use client interface address (without subnet) if no router_ip is set - uci add_list "$option"=$(echo $ipaddr | cut -d / -f1) + uci add_list "$option"=${ipaddr%%/*} else echo "WARNING: No peer_ip, router_ip or client interface ipaddr set! IPv4 routing is not possible." return 1