Merge pull request #12035 from donaldsharp/pim6_write_non_integrated

pimd: Allow v6 to do non-integrated configuration
FRRouting · Sep 29, 2022 · 5ae9644 · 5ae9644
2 parents 8ad5293 + 9f8df43
commit 5ae9644
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c
@@ -119,9 +119,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,

diff --git a/pimd/pimd.h b/pimd/pimd.h
@@ -32,9 +32,8 @@
 #include "pim_memory.h"
 #include "pim_assert.h"
 
-#define PIMD_PROGNAME       "pimd"
-#define PIMD_DEFAULT_CONFIG "pimd.conf"
 #define PIMD_VTY_PORT       2611
+#define PIM6D_VTY_PORT      2622
 
 #define PIM_IP_PROTO_IGMP             (2)
 #define PIM_IP_PROTO_PIM              (103)