Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #12035 from donaldsharp/pim6_write_non_integrated 

pimd: Allow v6 to do non-integrated configuration
This commit is contained in:
Donatas Abraitis 2022-09-29 14:47:10 +03:00 committed by GitHub
parent 8ad5293270 9f8df438e8
commit 5ae96447d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim6_main.c
View File

@ -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,

3
pimd/pimd.h
View File

@ -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)