diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-09-29 13:47:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 13:47:10 +0200 |
| commit | 5ae96447d7e0b6f5e3a361b61b743b7e92e6832e (patch) | |
| tree | 1c48bb9658ed1973e1027a2a56aae373164e4742 /pimd | |
| parent | Merge pull request #12036 from opensourcerouting/fix/show_single_allow-reserv... (diff) | |
| parent | pimd: Remove some unused defines in pimd.h (diff) | |
| download | frr-5ae96447d7e0b6f5e3a361b61b743b7e92e6832e.tar.xz frr-5ae96447d7e0b6f5e3a361b61b743b7e92e6832e.zip | |
Merge pull request #12035 from donaldsharp/pim6_write_non_integrated
pimd: Allow v6 to do non-integrated configuration
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim6_main.c | 4 | ||||
| -rw-r--r-- | pimd/pimd.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c index e0b5a87e0..7ac22fd02 100644 --- 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 index c77e98d63..3a80c24f7 100644 --- 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) |