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

lib: Fix vrf_id_t data type

Browse Source 
We were reading a u_int16_t for vrf_id_t.  While technically
the same thing, I'd like to make sure we think about vrf_id_t's
as vrf_id_t's.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-05-26 19:52:10 -04:00
parent 705d6afb05
commit e7a2870b47
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zclient.c
View File

@ -336,7 +336,7 @@ zclient_create_header (struct stream *s, uint16_t command, vrf_id_t vrf_id)
int int
zclient_read_header (struct stream *s, int sock, u_int16_t *size, u_char *marker, zclient_read_header (struct stream *s, int sock, u_int16_t *size, u_char *marker,
u_char *version, u_int16_t *vrf_id, u_int16_t *cmd) u_char *version, vrf_id_t *vrf_id, u_int16_t *cmd)
{ {
if (stream_read (s, sock, ZEBRA_HEADER_SIZE) != ZEBRA_HEADER_SIZE) if (stream_read (s, sock, ZEBRA_HEADER_SIZE) != ZEBRA_HEADER_SIZE)
return -1; return -1;

2
lib/zclient.h
View File

@ -198,7 +198,7 @@ extern int zclient_send_message(struct zclient *);
extern void zclient_create_header (struct stream *, uint16_t, vrf_id_t); extern void zclient_create_header (struct stream *, uint16_t, vrf_id_t);
extern int zclient_read_header (struct stream *s, int sock, u_int16_t *size, extern int zclient_read_header (struct stream *s, int sock, u_int16_t *size,
u_char *marker, u_char *version, u_char *marker, u_char *version,
u_int16_t *vrf_id, u_int16_t *cmd); vrf_id_t *vrf_id, u_int16_t *cmd);
extern struct interface *zebra_interface_add_read (struct stream *, vrf_id_t); extern struct interface *zebra_interface_add_read (struct stream *, vrf_id_t);
extern struct interface *zebra_interface_state_read (struct stream *s, vrf_id_t); extern struct interface *zebra_interface_state_read (struct stream *s, vrf_id_t);

2
pimd/pim_zlookup.c
View File

@ -153,7 +153,7 @@ static int zclient_read_nexthop(struct zclient *zlookup,
uint16_t length; uint16_t length;
u_char marker; u_char marker;
u_char version; u_char version;
uint16_t vrf_id; vrf_id_t vrf_id;
uint16_t command; uint16_t command;
struct in_addr raddr; struct in_addr raddr;
uint8_t distance; uint8_t distance;