diff options
| -rw-r--r-- | ospf6d/ospf6_flood.c | 19 | ||||
| -rw-r--r-- | ospf6d/ospf6_lsdb.c | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c index 5fed6dfe17..cc82084e5e 100644 --- a/ospf6d/ospf6_flood.c +++ b/ospf6d/ospf6_flood.c @@ -464,11 +464,28 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa, lsa->header->type, lsa->header->id, lsa->header->adv_router, on->retrans_list); if (!old) { + struct ospf6_lsa *orig; + struct ospf6_lsdb *lsdb; + if (is_debug) zlog_debug( "Increment %s from retrans_list of %s", lsa->name, on->name); - ospf6_increment_retrans_count(lsa); + + /* Increment the retrans count on the original + * copy of LSA if present, to maintain the + * counter consistency. + */ + + lsdb = ospf6_get_scoped_lsdb(lsa); + orig = ospf6_lsdb_lookup( + lsa->header->type, lsa->header->id, + lsa->header->adv_router, lsdb); + if (orig) + ospf6_increment_retrans_count(orig); + else + ospf6_increment_retrans_count(lsa); + ospf6_lsdb_add(ospf6_lsa_copy(lsa), on->retrans_list); thread_add_timer( diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c index 889ab16b11..7a4c49a158 100644 --- a/ospf6d/ospf6_lsdb.c +++ b/ospf6d/ospf6_lsdb.c @@ -132,6 +132,8 @@ void ospf6_lsdb_add(struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb) (*lsdb->hook_add)(lsa); } } else { + lsa->retrans_count = old->retrans_count; + if (OSPF6_LSA_IS_CHANGED(old, lsa)) { if (OSPF6_LSA_IS_MAXAGE(lsa)) { if (lsdb->hook_remove) { |