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

Merge pull request #7868 from mjstapp/fix_fpm_conn_up

Browse Source 
zebra: don't set connection-up event pointer directly
This commit is contained in:
Donald Sharp 2021-01-15 06:55:29 -05:00 committed by GitHub
commit f7f52f0d2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/zebra_fpm.c
View File

@ -522,8 +522,6 @@ static int zfpm_conn_up_thread_cb(struct thread *thread)
struct zfpm_rnodes_iter *iter; struct zfpm_rnodes_iter *iter;
rib_dest_t *dest; rib_dest_t *dest;
zfpm_g->t_conn_up = NULL;
iter = &zfpm_g->t_conn_up_state.iter; iter = &zfpm_g->t_conn_up_state.iter;
if (zfpm_g->state != ZFPM_STATE_ESTABLISHED) { if (zfpm_g->state != ZFPM_STATE_ESTABLISHED) {
@ -557,7 +555,6 @@ static int zfpm_conn_up_thread_cb(struct thread *thread)
zfpm_g->stats.t_conn_up_yields++; zfpm_g->stats.t_conn_up_yields++;
zfpm_rnodes_iter_pause(iter); zfpm_rnodes_iter_pause(iter);
zfpm_g->t_conn_up = NULL;
thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb,
NULL, 0, &zfpm_g->t_conn_up); NULL, 0, &zfpm_g->t_conn_up);
return 0; return 0;
@ -585,13 +582,13 @@ static void zfpm_connection_up(const char *detail)
/* /*
* Start thread to push existing routes to the FPM. * Start thread to push existing routes to the FPM.
*/ */
assert(!zfpm_g->t_conn_up); thread_cancel(&zfpm_g->t_conn_up);
zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter); zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter);
zfpm_g->fpm_mac_dump_done = false; zfpm_g->fpm_mac_dump_done = false;
zfpm_debug("Starting conn_up thread"); zfpm_debug("Starting conn_up thread");
zfpm_g->t_conn_up = NULL;
thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, NULL, 0, thread_add_timer_msec(zfpm_g->master, zfpm_conn_up_thread_cb, NULL, 0,
&zfpm_g->t_conn_up); &zfpm_g->t_conn_up);
zfpm_g->stats.t_conn_up_starts++; zfpm_g->stats.t_conn_up_starts++;