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

zebra: Properly unregister hook on shutdown

Browse Source 
the zebra pseudo wire code was registering a callback
per vrf.  These callbacks are not per vrf based.  They
are vrf agnostic so this was a mistake.  Modify the code
to on startup register once and on shutdown unregister once.

Finally rename the zebra_pw_init and zebra_pw_exit functions
to more properly reflect when they are called.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-12-11 15:22:07 -05:00
parent c783d5b698
commit 7cabd9361c
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/main.c
View File

@ -234,6 +234,8 @@ void zebra_finalize(struct event *dummy)
zebra_mpls_terminate(); zebra_mpls_terminate();
zebra_pw_terminate();
ns_terminate(); ns_terminate();
frr_fini(); frr_fini();
exit(0); exit(0);

20
zebra/zebra_pw.c
View File

@ -377,15 +377,18 @@ static int zebra_pw_client_close(struct zserv *client)
return 0; return 0;
} }
void zebra_pw_init(struct zebra_vrf *zvrf) static void zebra_pw_init(void)
{ {
RB_INIT(zebra_pw_head, &zvrf->pseudowires);
RB_INIT(zebra_static_pw_head, &zvrf->static_pseudowires);
hook_register(zserv_client_close, zebra_pw_client_close); hook_register(zserv_client_close, zebra_pw_client_close);
} }
void zebra_pw_exit(struct zebra_vrf *zvrf) void zebra_pw_init_vrf(struct zebra_vrf *zvrf)
{
RB_INIT(zebra_pw_head, &zvrf->pseudowires);
RB_INIT(zebra_static_pw_head, &zvrf->static_pseudowires);
}
void zebra_pw_exit_vrf(struct zebra_vrf *zvrf)
{ {
struct zebra_pw *pw; struct zebra_pw *pw;
@ -396,6 +399,11 @@ void zebra_pw_exit(struct zebra_vrf *zvrf)
} }
} }
void zebra_pw_terminate(void)
{
hook_unregister(zserv_client_close, zebra_pw_client_close);
}
DEFUN_NOSH (pseudowire_if, DEFUN_NOSH (pseudowire_if,
pseudowire_if_cmd, pseudowire_if_cmd,
"pseudowire IFNAME", "pseudowire IFNAME",
@ -837,4 +845,6 @@ void zebra_pw_vty_init(void)
install_element(VIEW_NODE, &show_pseudowires_cmd); install_element(VIEW_NODE, &show_pseudowires_cmd);
install_element(VIEW_NODE, &show_pseudowires_detail_cmd); install_element(VIEW_NODE, &show_pseudowires_detail_cmd);
zebra_pw_init();
} }

5
zebra/zebra_pw.h
View File

@ -60,8 +60,9 @@ void zebra_pw_change(struct zebra_pw *, ifindex_t, int, int, union g_addr *,
struct zebra_pw *zebra_pw_find(struct zebra_vrf *, const char *); struct zebra_pw *zebra_pw_find(struct zebra_vrf *, const char *);
void zebra_pw_update(struct zebra_pw *); void zebra_pw_update(struct zebra_pw *);
void zebra_pw_install_failure(struct zebra_pw *pw, int pwstatus); void zebra_pw_install_failure(struct zebra_pw *pw, int pwstatus);
void zebra_pw_init(struct zebra_vrf *); void zebra_pw_init_vrf(struct zebra_vrf *);
void zebra_pw_exit(struct zebra_vrf *); void zebra_pw_exit_vrf(struct zebra_vrf *);
void zebra_pw_terminate(void);
void zebra_pw_vty_init(void); void zebra_pw_vty_init(void);
#ifdef __cplusplus #ifdef __cplusplus

4
zebra/zebra_vrf.c
View File

@ -195,7 +195,7 @@ static int zebra_vrf_disable(struct vrf *vrf)
/* Cleanup Vxlan, MPLS and PW tables. */ /* Cleanup Vxlan, MPLS and PW tables. */
zebra_vxlan_cleanup_tables(zvrf); zebra_vxlan_cleanup_tables(zvrf);
zebra_mpls_cleanup_tables(zvrf); zebra_mpls_cleanup_tables(zvrf);
zebra_pw_exit(zvrf); zebra_pw_exit_vrf(zvrf);
/* Remove link-local IPv4 addresses created for BGP unnumbered peering. /* Remove link-local IPv4 addresses created for BGP unnumbered peering.
*/ */
@ -376,7 +376,7 @@ struct zebra_vrf *zebra_vrf_alloc(struct vrf *vrf)
zebra_vxlan_init_tables(zvrf); zebra_vxlan_init_tables(zvrf);
zebra_mpls_init_tables(zvrf); zebra_mpls_init_tables(zvrf);
zebra_pw_init(zvrf); zebra_pw_init_vrf(zvrf);
zvrf->table_id = rt_table_main_id; zvrf->table_id = rt_table_main_id;
/* by default table ID is default one */ /* by default table ID is default one */