From 41903a407407bcdf73dbd471dea3f53d2d056b0b Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Fri, 9 Mar 2018 17:40:16 -0500 Subject: [PATCH] lib, zebra: slight cleanup after rebase Rebased zapi-cleanup, needs a bit of poking. Signed-off-by: Quentin Young --- lib/zclient.h | 2 +- zebra/zserv.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/zclient.h b/lib/zclient.h index dd9c8973fa..8033488444 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -237,7 +237,7 @@ struct zclient { */ #define ZAPI_MESSAGE_TABLEID 0x80 -#define ZSERV_VERSION 5 +#define ZSERV_VERSION 5 /* Zserv protocol message header */ struct zmsghdr { uint16_t length; diff --git a/zebra/zserv.c b/zebra/zserv.c index 4cdb97be42..f53baf65d0 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -636,7 +636,7 @@ static int zsend_ipv4_nexthop_lookup_mrib(struct zserv *client, * chain of nexthops. */ for (nexthop = re->ng.nexthop; nexthop; nexthop = nexthop->next) if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)) - num += zsend_write_nexthop(s, nexthop); + num += zserv_encode_nexthop(s, nexthop); stream_putc_at(s, nump, num); /* store nexthop_num */ } else { @@ -706,8 +706,8 @@ void zsend_rule_notify_owner(struct zebra_pbr_rule *rule, struct stream *s; if (IS_ZEBRA_DEBUG_PACKET) { - zlog_debug("%s: Notifying %u", - __PRETTY_FUNCTION__, rule->unique); + zlog_debug("%s: Notifying %u", __PRETTY_FUNCTION__, + rule->unique); } for (ALL_LIST_ELEMENTS_RO(zebrad.client_list, node, client)) { @@ -1091,7 +1091,6 @@ stream_failure: } - /* * Register zebra server interface information. * Send current all interface and address information. -- 2.39.5