diff options
| author | David Lamparter <equinox@diac24.net> | 2019-02-05 00:54:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 00:54:16 +0100 |
| commit | 83c2a84d7cfe9b4132f15b04593869cee5f408e9 (patch) | |
| tree | 5f39f3561b35222fe36ce61aae78a29a2cac74c0 /zebra/label_manager.c | |
| parent | 5a753fee025b0cf5fcc0050ba41e5ec8cf948972 (diff) | |
| parent | b120fe3b69208980372d04728ee57894b6a7a842 (diff) | |
Merge pull request #3602 from donaldsharp/mlag_debug
zebra cleanup and some mlag additions
Diffstat (limited to 'zebra/label_manager.c')
| -rw-r--r-- | zebra/label_manager.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c index 13472059a0..1b17845e41 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -34,7 +34,8 @@ #include "lib/zclient.h" #include "lib/libfrr.h" -#include "zebra/zserv.h" +//#include "zebra/zserv.h" +#include "zebra/zebra_router.h" #include "zebra/label_manager.h" #include "zebra/zebra_errors.h" @@ -294,7 +295,7 @@ static int lm_zclient_connect(struct thread *t) if (zclient_socket_connect(zclient) < 0) { flog_err(EC_ZEBRA_LM_CLIENT_CONNECTION_FAILED, "Error connecting synchronous zclient!"); - thread_add_timer(zebrad.master, lm_zclient_connect, zclient, + thread_add_timer(zrouter.master, lm_zclient_connect, zclient, CONNECTION_DELAY, &zclient->t_connect); return -1; } @@ -318,7 +319,7 @@ static void lm_zclient_init(char *lm_zserv_path) lm_zserv_path); /* Set default values. */ - zclient = zclient_new(zebrad.master, &zclient_options_default); + zclient = zclient_new(zrouter.master, &zclient_options_default); zclient->privs = &zserv_privs; zclient->sock = -1; zclient->t_connect = NULL; |