sharpd: Allow sharpd to accept nexthop group as part of route install

[mirror_frr.git] / bfdd / bfdd_vty.c

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index ae6081f01ad360f18c50dff55e06eddaf2f38b35..8f8fff6b1837295139e65c709ff94d3522eef18f 100644 (file)
--- 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
@@ -827,7 +827,7 @@ DEFPY(bfd_show_peers_counters, bfd_show_peers_counters_cmd,
  * Configuration rules:
  *
  * Single hop:
- * peer + (optional vxlan or interface name)
+ * peer + (interface name)
  *
  * Multi hop:
  * peer + local + (optional vrf)
@@ -886,33 +886,9 @@ static int bfd_configure_peer(struct bfd_peer_cfg *bpc, bool mhop,
        if (local)
                bpc->bpc_local = *local;
 
-       if (peer) {
-               bpc->bpc_peer = *peer;
-       } else {
-               /* Peer configuration is mandatory. */
-               snprintf(ebuf, ebuflen, "no peer configured");
-               return -1;
-       }
-
+       bpc->bpc_peer = *peer;
        bpc->bpc_mhop = mhop;
 
-#if 0
-       /* Handle VxLAN configuration. */
-       if (vxlan >= 0) {
-               if (vxlan > ((1 << 24) - 1)) {
-                       snprintf(ebuf, ebuflen, "invalid VxLAN %d", vxlan);
-                       return -1;
-               }
-               if (bpc->bpc_mhop) {
-                       snprintf(ebuf, ebuflen,
-                                "multihop doesn't accept VxLAN");
-                       return -1;
-               }
-
-               bpc->bpc_vxlan = vxlan;
-       }
-#endif /* VxLAN */
-
        /* Handle interface specification configuration. */
        if (ifname) {
                if (bpc->bpc_mhop) {