diff options
| author | Acee Lindem <acee@lindem.com> | 2024-04-02 17:55:49 +0200 |
|---|---|---|
| committer | Acee Lindem <acee@lindem.com> | 2024-04-02 23:34:29 +0200 |
| commit | 58e623714bf01eafc2256917c64fe03e8c543411 (patch) | |
| tree | de7f36611baf86ff10899b4129e13a6fab674c42 /ospfd/ospf_nsm.c | |
| parent | Merge pull request #15609 from anlancs/fix/doc-isis-hello (diff) | |
| download | frr-58e623714bf01eafc2256917c64fe03e8c543411.tar.xz frr-58e623714bf01eafc2256917c64fe03e8c543411.zip | |
ospfd: Implement non-broadcast support for point-to-multipoint networks
This extends non-broadcast support to point-to-multipoint networks.
Neighbors will be explicitly configured and polled in lieu of multicast
dicovery. Toptotests and documentation updates are included.
Additionally, the ospf neighbor commands have been greatly simplified taking
advantage of DEFPY() capabilities.
The AllOSPFRouters (224.0.0.5) is still joined for non-broadcast networks
since it is joined for NBMA networks. It seems this could be removed but
it should done be in a separate commit.
Signed-off-by: Acee Lindem <acee@lindem.com>
Diffstat (limited to 'ospfd/ospf_nsm.c')
| -rw-r--r-- | ospfd/ospf_nsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 08aa10368..c466ddcc6 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -166,7 +166,7 @@ static int nsm_hello_received(struct ospf_neighbor *nbr) OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer, nbr->v_inactivity); - if (nbr->oi->type == OSPF_IFTYPE_NBMA && nbr->nbr_nbma) + if (OSPF_IF_NON_BROADCAST(nbr->oi) && nbr->nbr_nbma != NULL) EVENT_OFF(nbr->nbr_nbma->t_poll); /* Send proactive ARP requests */ @@ -377,7 +377,7 @@ static int nsm_kill_nbr(struct ospf_neighbor *nbr) return 0; } - if (nbr->oi->type == OSPF_IFTYPE_NBMA && nbr->nbr_nbma != NULL) { + if (OSPF_IF_NON_BROADCAST(nbr->oi) && nbr->nbr_nbma != NULL) { struct ospf_nbr_nbma *nbr_nbma = nbr->nbr_nbma; nbr_nbma->nbr = NULL; |