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

lib, zebra: Fix last write command written

Browse Source 
With commit: a9ff90c41b
the vrf_id_t was changed from a uint16_t to a uint32_t

Zebra tracked the last command sent to it's peer via peeking
into the data it was sending to each client ( since we had
lost the idea of what the command was when it was time to track
the data ).

Add a define to track this and add a bit of verbiage
to the code to allow us to notice when we screw with
the header again so that this is just fixed correctly
when it happens again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-10-11 08:56:39 -04:00
parent bfc2d87696
commit 6e8e092521
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/zclient.c
View File

@ -293,6 +293,10 @@ int zclient_send_message(struct zclient *zclient)
return 0; return 0;
} }
/*
* If we add more data to this structure please ensure that
* struct zmsghdr in lib/zclient.h is updated as appropriate.
*/
void zclient_create_header(struct stream *s, uint16_t command, vrf_id_t vrf_id) void zclient_create_header(struct stream *s, uint16_t command, vrf_id_t vrf_id)
{ {
/* length placeholder, caller can update */ /* length placeholder, caller can update */

3
lib/zclient.h
View File

@ -298,7 +298,8 @@ struct zmsghdr {
uint8_t version; uint8_t version;
vrf_id_t vrf_id; vrf_id_t vrf_id;
uint16_t command; uint16_t command;
}; } __attribute__((packed));
#define ZAPI_HEADER_CMD_LOCATION offsetof(struct zmsghdr, command)
struct zapi_nexthop { struct zapi_nexthop {
enum nexthop_types_t type; enum nexthop_types_t type;

2
zebra/zserv.c
View File

@ -240,7 +240,7 @@ static int zserv_write(struct thread *thread)
if (cache->tail) { if (cache->tail) {
msg = cache->tail; msg = cache->tail;
stream_set_getp(msg, 0); stream_set_getp(msg, 0);
wcmd = stream_getw_from(msg, 6); wcmd = stream_getw_from(msg, ZAPI_HEADER_CMD_LOCATION);
} }
while (stream_fifo_head(cache)) { while (stream_fifo_head(cache)) {