Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ospfd / ospf_main.c

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index d94de129942f5c870dd9171b3a0fd3450a380fb6..05fc5c95d1ec47b0baf8278f6456a67e9880c7dc 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * OSPFd main routine.
  *   Copyright (C) 1998, 99 Kunihiro Ishiguro, Toshiaki Takada
- *
- * 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>
@@ -54,6 +39,7 @@
 #include "ospfd/ospf_zebra.h"
 #include "ospfd/ospf_vty.h"
 #include "ospfd/ospf_bfd.h"
+#include "ospfd/ospf_gr.h"
 #include "ospfd/ospf_errors.h"
 #include "ospfd/ospf_ldp_sync.h"
 #include "ospfd/ospf_routemap_nb.h"
@@ -111,7 +97,7 @@ static void sigusr1(void)
        zlog_rotate();
 }
 
-struct quagga_signal_t ospf_signals[] = {
+struct frr_signal_t ospf_signals[] = {
        {
                .signal = SIGHUP,
                .handler = &sighup,
@@ -184,7 +170,6 @@ int main(int argc, char **argv)
 #endif /* SUPPORT_OSPF_API */
                default:
                        frr_help_exit(1);
-                       break;
                }
        }
 
@@ -225,6 +210,7 @@ int main(int argc, char **argv)
 
        ospf_route_map_init();
        ospf_opaque_init();
+       ospf_gr_init();
        ospf_gr_helper_init();
 
        /* OSPF errors init */