ospfd: fix flooding procedure
An ospf router should accept a new maxage LSA into its lsdb if it has any
neighbors in state Exchange or Loading. ospfd would however only account
for neighbors on the same interface which does not seem to be a valid
optimization.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
Signed-off-by: David Lamparter <equinox@diac24.net>
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index e0e05ab..109a120 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2794,7 +2794,7 @@
}
-static int
+int
ospf_check_nbr_status (struct ospf *ospf)
{
struct listnode *node, *nnode;
diff --git a/ospfd/ospf_lsa.h b/ospfd/ospf_lsa.h
index 9ff2d92..c71877d 100644
--- a/ospfd/ospf_lsa.h
+++ b/ospfd/ospf_lsa.h
@@ -251,6 +251,7 @@
extern void lsa_header_set (struct stream *, u_char, u_char, struct in_addr,
struct in_addr);
extern struct ospf_neighbor *ospf_nbr_lookup_ptop (struct ospf_interface *);
+extern int ospf_check_nbr_status (struct ospf *);
/* Prototype for LSA primitive. */
extern struct ospf_lsa *ospf_lsa_new (void);
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index d3f1b56..37223fb 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1833,8 +1833,7 @@
then take the following actions: */
if (IS_LSA_MAXAGE (lsa) && !current &&
- (ospf_nbr_count (oi, NSM_Exchange) +
- ospf_nbr_count (oi, NSM_Loading)) == 0)
+ ospf_check_nbr_status(oi->ospf))
{
/* (4a) Response Link State Acknowledgment. */
ospf_ls_ack_send (nbr, lsa);