From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Tue, 9 Apr 2019 14:48:43 +0000 (+0200)
Subject: bfdd: remove the constraint of bfd vrf and multihop
X-Git-Tag: base_7.2~355^2~21
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5764d816d370aebad1da4281177bbb15ea7f748e;p=mirror%2Ffrr.git

bfdd: remove the constraint of bfd vrf and multihop

there is no specific constraints that should prevent from configuring a
multihop bfd session within a bfd session.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 7c80cfc38e..95b2dc2548 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -90,7 +90,7 @@ DEFUN_NOSH(bfd_enter, bfd_enter_cmd, "bfd", "Configure BFD peers\n")
 
 DEFUN_NOSH(
 	bfd_peer_enter, bfd_peer_enter_cmd,
-	"peer <A.B.C.D|X:X::X:X> [{[multihop] local-address <A.B.C.D|X:X::X:X>|interface IFNAME|vrf NAME}]",
+	"peer <A.B.C.D|X:X::X:X> [{multihop|local-address <A.B.C.D|X:X::X:X>|interface IFNAME|vrf NAME}]",
 	PEER_STR PEER_IPV4_STR PEER_IPV6_STR
 	MHOP_STR
 	LOCAL_STR LOCAL_IPV4_STR LOCAL_IPV6_STR
@@ -130,10 +130,6 @@ DEFUN_NOSH(
 		vty_out(vty, "%% VRF is not mixable with interface\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
-	if (vrfname && !mhop) {
-		vty_out(vty, "%% VRF only applies with multihop.\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
 
 	strtosa(peer, &psa);
 	if (local) {