Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / bfdd / bfdd.c

diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index 7a2c3cc3aa1305899f3b7b323b3601ec1a381058..a3751e4d330daf05a3979d008416b654aadba61c 100644 (file)
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -1,21 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * BFD daemon code
  * Copyright (C) 2018 Network Device Education Foundation, Inc. ("NetDEF")
- *
- * FRR 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.
- *
- * FRR 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 FRR; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
  */
 
 #include <zebra.h>
@@ -103,7 +89,7 @@ static void sighup_handler(void)
        vty_read_config(NULL, bfdd_di.config_file, config_default);
 }
 
-static struct quagga_signal_t bfd_signals[] = {
+static struct frr_signal_t bfd_signals[] = {
        {
                .signal = SIGUSR1,
                .handler = &sigusr1_handler,
@@ -337,6 +323,8 @@ int main(int argc, char *argv[])
        bool ctlsockused = false;
        int opt;
 
+       bglobal.bg_use_dplane = false;
+
        /* Initialize system sockets. */
        bg_init();
 
@@ -364,7 +352,6 @@ int main(int argc, char *argv[])
 
                default:
                        frr_help_exit(1);
-                       break;
                }
        }