proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 14:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, zebra: Fix overlapping message types

Browse Source 
We had duplicate message id's.  Shit's broke yo.

Fix.  I have no idea how this properly worked.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2020-12-07 12:13:06 -05:00
parent 6a684109ae
commit aab4eca1c0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/zclient.h
View File

@ -389,14 +389,13 @@ struct zclient {
/* Backup nexthops are present */ /* Backup nexthops are present */
#define ZAPI_MESSAGE_BACKUP_NEXTHOPS 0x40 #define ZAPI_MESSAGE_BACKUP_NEXTHOPS 0x40
#define ZAPI_MESSAGE_NHG 0x80 #define ZAPI_MESSAGE_NHG 0x80
/* /*
* This should only be used by a DAEMON that needs to communicate * This should only be used by a DAEMON that needs to communicate
* the table being used is not in the VRF. You must pass the * the table being used is not in the VRF. You must pass the
* default vrf, else this will be ignored. * default vrf, else this will be ignored.
*/ */
#define ZAPI_MESSAGE_TABLEID 0x0080 #define ZAPI_MESSAGE_TABLEID 0x0100
#define ZAPI_MESSAGE_SRTE 0x0100 #define ZAPI_MESSAGE_SRTE 0x0200
#define ZSERV_VERSION 6 #define ZSERV_VERSION 6
/* Zserv protocol message header */ /* Zserv protocol message header */

10
zebra/zebra_rib.c
View File

@ -2748,7 +2748,7 @@ static void _route_entry_dump_nh(const struct route_entry *re,
if (nexthop->weight) if (nexthop->weight)
snprintf(wgt_str, sizeof(wgt_str), "wgt %d,", nexthop->weight); snprintf(wgt_str, sizeof(wgt_str), "wgt %d,", nexthop->weight);
zlog_debug("%s: %s %s[%u] vrf %s(%u) %s%s with flags %s%s%s%s%s", zlog_debug("%s: %s %s[%u] vrf %s(%u) %s%s with flags %s%s%s%s%s%s%s%s",
straddr, (nexthop->rparent ? " NH" : "NH"), nhname, straddr, (nexthop->rparent ? " NH" : "NH"), nhname,
nexthop->ifindex, vrf ? vrf->name : "Unknown", nexthop->ifindex, vrf ? vrf->name : "Unknown",
nexthop->vrf_id, nexthop->vrf_id,
@ -2767,7 +2767,13 @@ static void _route_entry_dump_nh(const struct route_entry *re,
: ""), : ""),
(CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE) (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE)
? "DUPLICATE " ? "DUPLICATE "
: "")); : ""),
(CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RNH_FILTERED)
? "FILTERED " : ""),
(CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP)
? "BACKUP " : ""),
(CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_SRTE)
? "SRTE " : ""));
} }