Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ospf6d: Max aged LSAs are not getting deleted from DB (backport #8919) #9117

Merged
merged 1 commit into from
Jul 22, 2021
Merged

ospf6d: Max aged LSAs are not getting deleted from DB (backport #8919) #9117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions ospf6d/ospf6_flood.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa,
{
struct listnode *node, *nnode;
struct ospf6_neighbor *on;
struct ospf6_lsa *req;
struct ospf6_lsa *req, *old;
int retrans_added = 0;
int is_debug = 0;

Expand Down Expand Up @@ -383,12 +383,27 @@ void ospf6_flood_interface(struct ospf6_neighbor *from, struct ospf6_lsa *lsa,
if (is_debug)
zlog_debug("Add retrans-list of neighbor %s ",
on->name);
ospf6_increment_retrans_count(lsa);
ospf6_lsdb_add(ospf6_lsa_copy(lsa), on->retrans_list);
thread_add_timer(master, ospf6_lsupdate_send_neighbor,
on, on->ospf6_if->rxmt_interval,
&on->thread_send_lsupdate);
retrans_added++;

/* Do not increment the retrans count if the lsa is
* already present in the retrans list.
*/
old = ospf6_lsdb_lookup(
lsa->header->type, lsa->header->id,
lsa->header->adv_router, on->retrans_list);
if (!old) {
if (is_debug)
zlog_debug(
"Increment %s from retrans_list of %s",
lsa->name, on->name);
ospf6_increment_retrans_count(lsa);
ospf6_lsdb_add(ospf6_lsa_copy(lsa),
on->retrans_list);
thread_add_timer(
master, ospf6_lsupdate_send_neighbor,
on, on->ospf6_if->rxmt_interval,
&on->thread_send_lsupdate);
retrans_added++;
}
}
}

Expand Down