From: Igor Ryzhov <iryzhov@nfware.com>
Date: Wed, 3 Mar 2021 16:38:38 +0000 (+0300)
Subject: bfdd: require local-address when using multihop
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6eeeec97178d30134a20376499863f23bd5f7acb;p=mirror%2Ffrr.git

bfdd: require local-address when using multihop

If local-address is not supplied, then an incorrect xpath is generated
which is not expected by NB CLI.

Fixes #7465.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---

diff --git a/bfdd/bfdd_cli.c b/bfdd/bfdd_cli.c
index d115684b1c..f6ba8fce94 100644
--- a/bfdd/bfdd_cli.c
+++ b/bfdd/bfdd_cli.c
@@ -112,10 +112,14 @@ DEFPY_YANG_NOSH(
 	char source_str[INET6_ADDRSTRLEN + 32];
 	char xpath[XPATH_MAXLEN], xpath_srcaddr[XPATH_MAXLEN + 32];
 
-	if (multihop)
+	if (multihop) {
+		if (!local_address_str) {
+			vty_out(vty, "%% local-address is required when using multihop\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
 		snprintf(source_str, sizeof(source_str), "[source-addr='%s']",
 			 local_address_str);
-	else
+	} else
 		source_str[0] = 0;
 
 	slen = snprintf(xpath, sizeof(xpath),