Merge pull request #12837 from donaldsharp/unlikely_routemap

[mirror_frr.git] / bgpd / bgp_bfd.c

diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index d66b916b95240188292359cd9529bb5fa4625dce..d1ddfd046025e1be25da3b3d25d4078725d86fda 100644 (file)
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /**
  * bgp_bfd.c: BGP BFD handling routines
  *
  * @copyright Copyright (C) 2015 Cumulus Networks, Inc.
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -26,7 +11,7 @@
 #include "linklist.h"
 #include "memory.h"
 #include "prefix.h"
-#include "thread.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "stream.h"
 #include "vrf.h"
@@ -70,7 +55,7 @@ static void bfd_session_status_update(struct bfd_session_params *bsp,
                }
                peer->last_reset = PEER_DOWN_BFD_DOWN;
 
-               /* draft-ietf-idr-bfd-subcode */
+               /* rfc9384 */
                if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
                        bgp_notify_send(peer, BGP_NOTIFY_CEASE,
                                        BGP_NOTIFY_CEASE_BFD_DOWN);
@@ -521,10 +506,8 @@ DEFUN (neighbor_bfd_check_controlplane_failure,
        else
                idx_peer = 1;
        peer = peer_and_group_lookup_vty(vty, argv[idx_peer]->arg);
-       if (!peer) {
-               vty_out(vty, "%% Specify remote-as or peer-group commands first\n");
+       if (!peer)
                return CMD_WARNING_CONFIG_FAILED;
-       }
 
        if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
                bgp_group_configure_bfd(peer);
@@ -626,7 +609,7 @@ DEFUN(no_neighbor_bfd_profile, no_neighbor_bfd_profile_cmd,
 }
 #endif /* HAVE_BFDD */
 
-void bgp_bfd_init(struct thread_master *tm)
+void bgp_bfd_init(struct event_loop *tm)
 {
        /* Initialize BFD client functions */
        bfd_protocol_integration_init(zclient, tm);