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

Merge pull request #10147 from ton31337/fix/bgp_packet_set_size

Browse Source 
bgpd: bgp_packet_set_size int to void
This commit is contained in:
Donald Sharp 2021-11-29 17:14:19 -05:00 committed by GitHub
commit 14fb032999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bgpd/bgp_packet.c
View File

@ -106,17 +106,14 @@ int bgp_packet_set_marker(struct stream *s, uint8_t type)
* Size field is set to the size of the stream passed.
*
* @param s the stream containing the packet
* @return the size of the stream
*/
int bgp_packet_set_size(struct stream *s)
void bgp_packet_set_size(struct stream *s)
{
int cp;
/* Preserve current pointer. */
cp = stream_get_endp(s);
stream_putw_at(s, BGP_MARKER_SIZE, cp);
return cp;
}
/*
@ -561,7 +558,7 @@ void bgp_keepalive_send(struct peer *peer)
bgp_packet_set_marker(s, BGP_MSG_KEEPALIVE);
/* Set packet size. */
(void)bgp_packet_set_size(s);
bgp_packet_set_size(s);
/* Dump packet if debug option is set. */
/* bgp_packet_dump (s); */
@ -626,7 +623,7 @@ void bgp_open_send(struct peer *peer)
}
/* Set BGP packet length. */
(void)bgp_packet_set_size(s);
bgp_packet_set_size(s);
if (bgp_debug_neighbor_events(peer))
zlog_debug(
@ -953,7 +950,7 @@ void bgp_route_refresh_send(struct peer *peer, afi_t afi, safi_t safi,
}
/* Set packet size. */
(void)bgp_packet_set_size(s);
bgp_packet_set_size(s);
if (bgp_debug_neighbor_events(peer)) {
if (!orf_refresh)
@ -1011,7 +1008,7 @@ void bgp_capability_send(struct peer *peer, afi_t afi, safi_t safi,
}
/* Set packet size. */
(void)bgp_packet_set_size(s);
bgp_packet_set_size(s);
/* Add packet to the peer. */
bgp_packet_add(peer, s);

2
bgpd/bgp_packet.h
View File

@ -77,7 +77,7 @@ extern void bgp_update_implicit_eors(struct peer *);
extern void bgp_check_update_delay(struct bgp *);
extern int bgp_packet_set_marker(struct stream *s, uint8_t type);
extern int bgp_packet_set_size(struct stream *s);
extern void bgp_packet_set_size(struct stream *s);
extern int bgp_generate_updgrp_packets(struct thread *);
extern int bgp_process_packet(struct thread *);