From 21ccc0cf24f80b7b75815dba3da308f6bae70492 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Mon, 23 Apr 2018 18:35:35 -0400 Subject: zebra: refactor zserv names, consolidate events * Add centralized thread scheduling dispatchers for client threads and the main thread * Rename everything in zserv.c to stop using a combination of: - zebra_server_* - zebra_* - zserv_* Everything in zserv.c now begins with zserv_*. Signed-off-by: Quentin Young --- zebra/zebra_mpls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zebra/zebra_mpls.c') diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 3ad640653f..e040808e01 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -463,7 +463,7 @@ static int fec_send(zebra_fec_t *fec, struct zserv *client) stream_put_prefix(s, &rn->p); stream_putl(s, fec->label); stream_putw_at(s, 0, stream_get_endp(s)); - return zebra_server_send_message(client, s); + return zserv_send_message(client, s); } /* @@ -2916,5 +2916,5 @@ void zebra_mpls_init(void) if (!mpls_processq_init(&zebrad)) mpls_enabled = 1; - hook_register(zapi_client_close, zebra_mpls_cleanup_fecs_for_client); + hook_register(zserv_client_close, zebra_mpls_cleanup_fecs_for_client); } -- cgit v1.2.3