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

pimd: move iface lib initialization to a proper place

Browse Source 
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2022-01-24 00:16:59 +03:00
parent 9e84443aca
commit 6b88faa7ff
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pimd/pim6_main.c
View File

@ -178,8 +178,7 @@ int main(int argc, char **argv, char **envp)
/* /*
* Initialize zclient "update" and "lookup" sockets * Initialize zclient "update" and "lookup" sockets
*/ */
if_zapi_callbacks(pim_ifp_create, pim_ifp_up, pim_iface_init();
pim_ifp_down, pim_ifp_destroy);
/* TODO PIM6: next line is temporary since pim_cmd_init is disabled */ /* TODO PIM6: next line is temporary since pim_cmd_init is disabled */
if_cmd_init(NULL); if_cmd_init(NULL);

27
pimd/pim_iface.c
View File

@ -1521,7 +1521,7 @@ int pim_if_ifchannel_count(struct pim_interface *pim_ifp)
return count; return count;
} }
int pim_ifp_create(struct interface *ifp) static int pim_ifp_create(struct interface *ifp)
{ {
struct pim_instance *pim; struct pim_instance *pim;
@ -1589,7 +1589,7 @@ int pim_ifp_create(struct interface *ifp)
return 0; return 0;
} }
int pim_ifp_up(struct interface *ifp) static int pim_ifp_up(struct interface *ifp)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct pim_instance *pim; struct pim_instance *pim;
@ -1645,7 +1645,7 @@ int pim_ifp_up(struct interface *ifp)
return 0; return 0;
} }
int pim_ifp_down(struct interface *ifp) static int pim_ifp_down(struct interface *ifp)
{ {
if (PIM_DEBUG_ZEBRA) { if (PIM_DEBUG_ZEBRA) {
zlog_debug( zlog_debug(
@ -1681,7 +1681,7 @@ int pim_ifp_down(struct interface *ifp)
return 0; return 0;
} }
int pim_ifp_destroy(struct interface *ifp) static int pim_ifp_destroy(struct interface *ifp)
{ {
struct pim_instance *pim; struct pim_instance *pim;
@ -1702,3 +1702,22 @@ int pim_ifp_destroy(struct interface *ifp)
return 0; return 0;
} }
static int pim_if_new_hook(struct interface *ifp)
{
return 0;
}
static int pim_if_delete_hook(struct interface *ifp)
{
return 0;
}
void pim_iface_init(void)
{
hook_register_prio(if_add, 0, pim_if_new_hook);
hook_register_prio(if_del, 0, pim_if_delete_hook);
if_zapi_callbacks(pim_ifp_create, pim_ifp_up, pim_ifp_down,
pim_ifp_destroy);
}

5
pimd/pim_iface.h
View File

@ -259,9 +259,6 @@ bool pim_if_is_vrf_device(struct interface *ifp);
int pim_if_ifchannel_count(struct pim_interface *pim_ifp); int pim_if_ifchannel_count(struct pim_interface *pim_ifp);
extern int pim_ifp_create(struct interface *ifp); void pim_iface_init(void);
extern int pim_ifp_up(struct interface *ifp);
extern int pim_ifp_down(struct interface *ifp);
extern int pim_ifp_destroy(struct interface *ifp);
#endif /* PIM_IFACE_H */ #endif /* PIM_IFACE_H */

3
pimd/pim_main.c
View File

@ -136,8 +136,7 @@ int main(int argc, char **argv, char **envp)
/* /*
* Initialize zclient "update" and "lookup" sockets * Initialize zclient "update" and "lookup" sockets
*/ */
if_zapi_callbacks(pim_ifp_create, pim_ifp_up, pim_iface_init();
pim_ifp_down, pim_ifp_destroy);
pim_zebra_init(); pim_zebra_init();
pim_bfd_init(); pim_bfd_init();
pim_mlag_init(); pim_mlag_init();