diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-12-12 08:28:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 08:28:49 -0500 |
| commit | f170e9bba933ea0f4ba7d7000480a7cae97e304d (patch) | |
| tree | 25a23e6514c7222130eeeb674cebf7a1acaf5638 /pimd/pim_instance.c | |
| parent | 492750f8bc422de83c008c94b4a7ce9a357a0a25 (diff) | |
| parent | d4da6316c7ec016c8b89877fe081599bfb6f7f0c (diff) | |
Merge pull request #17636 from opensourcerouting/msdp-cleanup
pimd: clean up MSDP code
Diffstat (limited to 'pimd/pim_instance.c')
| -rw-r--r-- | pimd/pim_instance.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index 4e4e5a6ce8..5649e49835 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -53,7 +53,9 @@ static void pim_instance_terminate(struct pim_instance *pim) pim_oil_terminate(pim); +#if PIM_IPV == 4 pim_msdp_exit(pim); +#endif /* PIM_IPV == 4 */ close(pim->reg_sock); @@ -91,7 +93,9 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf) pim->spt.switchover = PIM_SPT_IMMEDIATE; pim->spt.plist = NULL; +#if PIM_IPV == 4 pim_msdp_init(pim, router->master); +#endif /* PIM_IPV == 4 */ pim_vxlan_init(pim); snprintf(hash_name, sizeof(hash_name), "PIM %s RPF Hash", vrf->name); @@ -126,11 +130,6 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf) if (pim->reg_sock < 0) assert(0); - /* MSDP global timer defaults. */ - pim->msdp.hold_time = PIM_MSDP_PEER_HOLD_TIME; - pim->msdp.keep_alive = PIM_MSDP_PEER_KA_TIME; - pim->msdp.connection_retry = PIM_MSDP_PEER_CONNECT_RETRY_TIME; - #if PIM_IPV == 4 pim_autorp_init(pim); #endif |