Skip to content

Commit

Permalink
bgpd: Check 7 bytes for Long-lived Graceful-Restart capability
Browse files Browse the repository at this point in the history
It's not 4 bytes, it was assuming the same as Graceful-Restart tuples.

LLGR has more 3 bytes (Long-lived Stale Time).

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
  • Loading branch information
ton31337 committed Mar 24, 2023
1 parent 173786f commit b1d33ec
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion bgpd/bgp_open.c
Expand Up @@ -604,12 +604,24 @@ static int bgp_capability_restart(struct peer *peer,
static int bgp_capability_llgr(struct peer *peer,
struct capability_header *caphdr)
{
/*
* +--------------------------------------------------+
* | Address Family Identifier (16 bits) |
* +--------------------------------------------------+
* | Subsequent Address Family Identifier (8 bits) |
* +--------------------------------------------------+
* | Flags for Address Family (8 bits) |
* +--------------------------------------------------+
* | Long-lived Stale Time (24 bits) |
* +--------------------------------------------------+
*/
#define BGP_CAP_LLGR_MIN_PACKET_LEN 7
struct stream *s = BGP_INPUT(peer);
size_t end = stream_get_getp(s) + caphdr->length;

SET_FLAG(peer->cap, PEER_CAP_LLGR_RCV);

while (stream_get_getp(s) + 4 <= end) {
while (stream_get_getp(s) + BGP_CAP_LLGR_MIN_PACKET_LEN <= end) {
afi_t afi;
safi_t safi;
iana_afi_t pkt_afi = stream_getw(s);
Expand Down

0 comments on commit b1d33ec

Please sign in to comment.