diff options
| author | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:09:52 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2019-07-03 11:12:25 +0200 |
| commit | eac9250fd5b10809830361b94438339b3b31b270 (patch) | |
| tree | 5c9ec2591f0baa462f5572f83e4c452c3a166c95 /proto/ospf/dbdes.c | |
| parent | 8816b6cdd98d24535eece6b5e35730aac57cd9f7 (diff) | |
| parent | 026bfedb332d8c0dde28c693c177fe993b5df26d (diff) | |
Merge branch 'master' into mq-filter-stack
Diffstat (limited to 'proto/ospf/dbdes.c')
| -rw-r--r-- | proto/ospf/dbdes.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c index a1559782..b39595d9 100644 --- a/proto/ospf/dbdes.c +++ b/proto/ospf/dbdes.c @@ -215,7 +215,7 @@ ospf_send_dbdes(struct ospf_proto *p, struct ospf_neighbor *n) ASSERT((n->state == NEIGHBOR_EXSTART) || (n->state == NEIGHBOR_EXCHANGE)); - if (n->ifa->oa->rt == NULL) + if (!n->ifa->oa->rt && !p->gr_recovery) return; ospf_prepare_dbdes(p, n); @@ -279,6 +279,10 @@ ospf_process_dbdes(struct ospf_proto *p, struct ospf_packet *pkt, struct ospf_ne if (LSA_SCOPE(lsa_type) == LSA_SCOPE_RES) DROP1("LSA with invalid scope"); + /* RFC 3623 2.2 (2) special case - check for my router-LSA (GR recovery) */ + if ((lsa_type == LSA_T_RT) && (lsa.rt == p->router_id)) + n->got_my_rt_lsa = 1; + en = ospf_hash_find(p->gr, lsa_domain, lsa.id, lsa.rt, lsa_type); if (!en || (lsa_comp(&lsa, &(en->lsa)) == CMP_NEWER)) { |