proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 01:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8334 from ranjanyash54/last_dbdesc

Browse Source 
ospf6d: Release last dbdesc packet after router dead interval
This commit is contained in:
Russ White 2021-06-22 09:38:21 -04:00 committed by GitHub
commit 1332a177b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ospf6d/ospf6_neighbor.c
View File

@ -145,6 +145,8 @@ void ospf6_neighbor_delete(struct ospf6_neighbor *on)
THREAD_OFF(on->inactivity_timer); THREAD_OFF(on->inactivity_timer);
THREAD_OFF(on->last_dbdesc_release_timer);
THREAD_OFF(on->thread_send_dbdesc); THREAD_OFF(on->thread_send_dbdesc);
THREAD_OFF(on->thread_send_lsreq); THREAD_OFF(on->thread_send_lsreq);
THREAD_OFF(on->thread_send_lsupdate); THREAD_OFF(on->thread_send_lsupdate);
@ -350,6 +352,16 @@ int negotiation_done(struct thread *thread)
return 0; return 0;
} }
static int ospf6_neighbor_last_dbdesc_release(struct thread *thread)
{
struct ospf6_neighbor *on = THREAD_ARG(thread);
assert(on);
memset(&on->dbdesc_last, 0, sizeof(struct ospf6_dbdesc));
return 0;
}
int exchange_done(struct thread *thread) int exchange_done(struct thread *thread)
{ {
struct ospf6_neighbor *on; struct ospf6_neighbor *on;
@ -366,10 +378,13 @@ int exchange_done(struct thread *thread)
THREAD_OFF(on->thread_send_dbdesc); THREAD_OFF(on->thread_send_dbdesc);
ospf6_lsdb_remove_all(on->dbdesc_list); ospf6_lsdb_remove_all(on->dbdesc_list);
/* XXX /* RFC 2328 (10.8): Release the last dbdesc after dead_interval */
thread_add_timer (master, ospf6_neighbor_last_dbdesc_release, on, if (!CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT)) {
on->ospf6_if->dead_interval); THREAD_OFF(on->last_dbdesc_release_timer);
*/ thread_add_timer(master, ospf6_neighbor_last_dbdesc_release, on,
on->ospf6_if->dead_interval,
&on->last_dbdesc_release_timer);
}
if (on->request_list->count == 0) if (on->request_list->count == 0)
ospf6_neighbor_state_change(OSPF6_NEIGHBOR_FULL, on, ospf6_neighbor_state_change(OSPF6_NEIGHBOR_FULL, on,

3
ospf6d/ospf6_neighbor.h
View File

@ -89,6 +89,9 @@ struct ospf6_neighbor {
/* Inactivity timer */ /* Inactivity timer */
struct thread *inactivity_timer; struct thread *inactivity_timer;
/* Timer to release the last dbdesc packet */
struct thread *last_dbdesc_release_timer;
/* Thread for sending message */ /* Thread for sending message */
struct thread *thread_send_dbdesc; struct thread *thread_send_dbdesc;
struct thread *thread_send_lsreq; struct thread *thread_send_lsreq;