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

Merge pull request #4481 from donaldsharp/pim_zlookup_fixup

Browse Source 
pimd: Allow zlookup socket to drain
This commit is contained in:
David Lamparter 2019-06-11 11:10:40 +02:00 committed by GitHub
commit 681848a672
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pimd/pim_zlookup.c
View File

@ -37,8 +37,10 @@
#include "pim_zlookup.h" #include "pim_zlookup.h"
static struct zclient *zlookup = NULL; static struct zclient *zlookup = NULL;
struct thread *zlookup_read;
static void zclient_lookup_sched(struct zclient *zlookup, int delay); static void zclient_lookup_sched(struct zclient *zlookup, int delay);
static int zclient_lookup_read_pipe(struct thread *thread);
/* Connect to zebra for nexthop lookup. */ /* Connect to zebra for nexthop lookup. */
static int zclient_lookup_connect(struct thread *t) static int zclient_lookup_connect(struct thread *t)
@ -65,6 +67,8 @@ static int zclient_lookup_connect(struct thread *t)
return -1; return -1;
} }
thread_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60,
&zlookup_read);
return 0; return 0;
} }
@ -113,6 +117,7 @@ static void zclient_lookup_failed(struct zclient *zlookup)
void zclient_lookup_free(void) void zclient_lookup_free(void)
{ {
thread_cancel(zlookup_read);
zclient_stop(zlookup); zclient_stop(zlookup);
zclient_free(zlookup); zclient_free(zlookup);
zlookup = NULL; zlookup = NULL;
@ -357,6 +362,20 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
return zclient_read_nexthop(pim, zlookup, nexthop_tab, tab_size, addr); return zclient_read_nexthop(pim, zlookup, nexthop_tab, tab_size, addr);
} }
int zclient_lookup_read_pipe(struct thread *thread)
{
struct zclient *zlookup = THREAD_ARG(thread);
struct pim_instance *pim = pim_get_pim_instance(VRF_DEFAULT);
struct pim_zlookup_nexthop nexthop_tab[10];
struct in_addr l = {.s_addr = INADDR_ANY};
zclient_lookup_nexthop_once(pim, nexthop_tab, 10, l);
thread_add_timer(router->master, zclient_lookup_read_pipe, zlookup, 60,
&zlookup_read);
return 1;
}
int zclient_lookup_nexthop(struct pim_instance *pim, int zclient_lookup_nexthop(struct pim_instance *pim,
struct pim_zlookup_nexthop nexthop_tab[], struct pim_zlookup_nexthop nexthop_tab[],
const int tab_size, struct in_addr addr, const int tab_size, struct in_addr addr,