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

pimd: Fix instance startup to separate data structure setup from use

Browse Source 
Fix the instance startup to allow separation between the data structure
setup for pim instances from actual attempt to use.  More than
likely there will be other issues that need to be fixed but
this gets us 'working' again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-23 07:43:47 -04:00
parent f02d59db8b
commit b4575b3aa0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pimd/pim_instance.c
View File

@ -107,8 +107,6 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf)
if (vrf->vrf_id == VRF_DEFAULT)
pimg = pim;
pim_mroute_socket_enable(pim);
pim_rp_init(pim);
pim_oil_init(pim);
@ -161,16 +159,17 @@ static int pim_vrf_delete(struct vrf *vrf)
return 0;
}
/*
* Code to turn on the pim instance that
* we have created with new
*/
static int pim_vrf_enable(struct vrf *vrf)
{
// struct pim_instance *pim;
struct pim_instance *pim = (struct pim_instance *)vrf->info;
zlog_debug("%s: for %s", __PRETTY_FUNCTION__, vrf->name);
// vrf->info = (void *)pim;
// if (vrf->vrf_id == VRF_DEFAULT)
// pimg = pim;
pim_mroute_socket_enable(pim);
return 0;
}