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

bgpd: Avoid padding for bgp_paths_limit_capability struct

Browse Source 
When sending the packets over the network (dynamic capability) it reports 6 bytes
instead of 5 bytes, and causes some issues between little/big endian machines.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-03-14 09:45:18 +02:00
parent 6ff16b3439
commit 081f6520ff
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_addpath.h
View File

@ -25,7 +25,7 @@ struct bgp_paths_limit_capability {
uint16_t afi; uint16_t afi;
uint8_t safi; uint8_t safi;
uint16_t paths_limit; uint16_t paths_limit;
}; } __attribute__((packed));
#define BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE 1 #define BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE 1

7
bgpd/bgp_packet.c
View File

@ -3240,11 +3240,13 @@ static void bgp_dynamic_capability_paths_limit(uint8_t *pnt, int action,
safi_t safi; safi_t safi;
iana_afi_t pkt_afi; iana_afi_t pkt_afi;
iana_safi_t pkt_safi; iana_safi_t pkt_safi;
uint16_t paths_limit = 0;
struct bgp_paths_limit_capability bpl = {}; struct bgp_paths_limit_capability bpl = {};
memcpy(&bpl, data, sizeof(bpl)); memcpy(&bpl, data, sizeof(bpl));
pkt_afi = ntohs(bpl.afi); pkt_afi = ntohs(bpl.afi);
pkt_safi = safi_int2iana(bpl.safi); pkt_safi = safi_int2iana(bpl.safi);
paths_limit = ntohs(bpl.paths_limit);
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_debug("%s OPEN has %s capability for afi/safi: %s/%s limit: %u", zlog_debug("%s OPEN has %s capability for afi/safi: %s/%s limit: %u",
@ -3252,8 +3254,7 @@ static void bgp_dynamic_capability_paths_limit(uint8_t *pnt, int action,
lookup_msg(capcode_str, hdr->code, lookup_msg(capcode_str, hdr->code,
NULL), NULL),
iana_afi2str(pkt_afi), iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi), iana_safi2str(pkt_safi), paths_limit);
bpl.paths_limit);
if (bgp_map_afi_safi_iana2int(pkt_afi, pkt_safi, &afi, if (bgp_map_afi_safi_iana2int(pkt_afi, pkt_safi, &afi,
&safi)) { &safi)) {
@ -3275,7 +3276,7 @@ static void bgp_dynamic_capability_paths_limit(uint8_t *pnt, int action,
SET_FLAG(peer->af_cap[afi][safi], SET_FLAG(peer->af_cap[afi][safi],
PEER_CAP_PATHS_LIMIT_AF_RCV); PEER_CAP_PATHS_LIMIT_AF_RCV);
peer->addpath_paths_limit[afi][safi].receive = peer->addpath_paths_limit[afi][safi].receive =
bpl.paths_limit; paths_limit;
ignore: ignore:
data += CAPABILITY_CODE_PATHS_LIMIT_LEN; data += CAPABILITY_CODE_PATHS_LIMIT_LEN;
} }