Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pimd / pim6_main.c

diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c
index 8c7fca174ca37309985220e53c89fefff637e79a..1af4a17e5bd51bed1f4f41292ed382c3c0cc7d4d 100644 (file)
--- a/pimd/pim6_main.c
+++ b/pimd/pim6_main.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PIMv6 main()
  * Copyright (C) 2021  David Lamparter for NetDEF, Inc.
  * Copyright (C) 2008  Everton da Silva Marques (pim_main.c)
- *
- * This program 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 of the License, or (at your option)
- * any later version.
- *
- * This program 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>
@@ -38,6 +25,7 @@
 #include "pim_zebra.h"
 #include "pim_nb.h"
 #include "pim6_cmd.h"
+#include "pim6_mld.h"
 
 zebra_capabilities_t _caps_p[] = {
        ZCAP_SYS_ADMIN,
@@ -118,9 +106,7 @@ static const struct frr_yang_module_info *const pim6d_yang_modules[] = {
 
 /* clang-format off */
 FRR_DAEMON_INFO(pim6d, PIM6,
-       .vty_port = 0,
-       .flags = FRR_NO_SPLIT_CONFIG,
-
+       .vty_port = PIM6D_VTY_PORT,
        .proghelp = "Protocol Independent Multicast (RFC7761) for IPv6",
 
        .signals = pim6d_signals,
@@ -133,7 +119,6 @@ FRR_DAEMON_INFO(pim6d, PIM6,
 );
 /* clang-format on */
 
-
 int main(int argc, char **argv, char **envp)
 {
        static struct option longopts[] = {
@@ -161,8 +146,6 @@ int main(int argc, char **argv, char **envp)
        }
 
        pim_router_init();
-       /* TODO PIM6: temporary enable all debugs, remove later in PIMv6 work */
-       router->debugs = ~0U;
 
        access_list_init();
        prefix_list_init();
@@ -178,13 +161,14 @@ int main(int argc, char **argv, char **envp)
 
        pim_route_map_init();
 #endif
-       /* pim_init(); */
-       pim_cmd_init();
+       pim_init();
        /*
         * Initialize zclient "update" and "lookup" sockets
         */
        pim_iface_init();
 
+       gm_cli_init();
+
        pim_zebra_init();
 #if 0
        pim_bfd_init();