summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-05-19 18:03:50 -0700
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-05-19 18:03:50 -0700
commit97dba7b704f18c66f16e9330821514a79f982fdb (patch)
treed1ff17a6df739e214c177eda763efae70ae844b9
parent907f92c8fcbd212a1bcb7b2b421ba9a8faa3f4af (diff)
ospfd: ospf-start-lsreq-b4-exchange.patch
OSPFv2: Don't wait for state change to Exchange to start LSReq
-rw-r--r--ospfd/ospf_nsm.c3
-rw-r--r--ospfd/ospf_packet.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 2cbd04bbee..b733878496 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -338,7 +338,8 @@ nsm_exchange_done (struct ospf_neighbor *nbr)
return NSM_Full;
/* Send Link State Request. */
- ospf_ls_req_send (nbr);
+ if (nbr->t_ls_req == NULL)
+ ospf_ls_req_send (nbr);
return NSM_Loading;
}
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index fb86f3fc81..7a4d027843 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1205,6 +1205,9 @@ ospf_db_desc_proc (struct stream *s, struct ospf_interface *oi,
/* Save received neighbor values from DD. */
ospf_db_desc_save_current (nbr, dd);
+
+ if (!nbr->t_ls_req)
+ ospf_ls_req_send (nbr);
}
static int