matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Forgot to add the vrf_init call

Browse source 
Forward port of vrf code didn't have the pimd
code.  So when it was forward ported we lost
the vrf_init.  Now that we have pimd let's
add it back in.

Additionally forward port lost the
additional zclient->zebra_connect call.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-05-25 21:24:01 -04:00
parent d3a9c76878
commit 48e8451b8e
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pimd/pim_main.c
View file

@ -35,6 +35,7 @@
#include "vty.h"
#include "sigevent.h"
#include "version.h"
#include "vrf.h"
#include "pimd.h"
#include "pim_version.h"
@ -197,6 +198,7 @@ int main(int argc, char** argv, char** envp) {
cmd_init(1);
vty_init(master);
memory_init();
vrf_init ();
access_list_init();
pim_init();

6
pimd/pim_zebra.c
View file

@ -650,6 +650,11 @@ static int redist_read_ipv4_route(int command, struct zclient *zclient,
return 0;
}
static void
pim_zebra_connected (struct zclient *zclient)
{
zclient_send_reg_requests (zclient, VRF_DEFAULT);
}
void pim_zebra_init(char *zebra_sock_path)
{
int i;
@ -666,6 +671,7 @@ void pim_zebra_init(char *zebra_sock_path)
/* Socket for receiving updates from Zebra daemon */
qpim_zclient_update = zclient_new (master);
qpim_zclient_update->zebra_connected = pim_zebra_connected;
qpim_zclient_update->router_id_update = pim_router_id_update_zebra;
qpim_zclient_update->interface_add = pim_zebra_if_add;
qpim_zclient_update->interface_delete = pim_zebra_if_del;