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

lib, zebra: slight cleanup after rebase

Browse Source 
Rebased zapi-cleanup, needs a bit of poking.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-03-09 17:40:16 -05:00
parent 107afcd10b
commit 41903a4074
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zclient.h
View File

@ -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;

7
zebra/zserv.c
View File

@ -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.