mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-05 18:42:23 +00:00
Merge pull request #14763 from ton31337/fix/backport_591908a6d2bbcb35d53da1f615b80b5c514d0a17_9.1
A couple manual backports for dev/9.1
This commit is contained in:
commit
a3b215a82b
@ -889,8 +889,6 @@ static int bgp_capability_software_version(struct peer *peer,
|
||||
size_t end = stream_get_getp(s) + hdr->length;
|
||||
uint8_t len;
|
||||
|
||||
SET_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_RCV);
|
||||
|
||||
len = stream_getc(s);
|
||||
if (stream_get_getp(s) + len > end) {
|
||||
flog_warn(
|
||||
@ -900,6 +898,8 @@ static int bgp_capability_software_version(struct peer *peer,
|
||||
return -1;
|
||||
}
|
||||
|
||||
SET_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_RCV);
|
||||
|
||||
if (len > BGP_MAX_SOFT_VERSION) {
|
||||
flog_warn(EC_BGP_CAPABILITY_INVALID_LENGTH,
|
||||
"%s: Received Software Version, but the length is too big, truncating, from peer %s",
|
||||
|
@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_graceful_restart():
|
||||
"gracefulRestart": "advertisedAndReceived",
|
||||
"longLivedGracefulRestart": "advertisedAndReceived",
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
"gracefulRestartInfo": {
|
||||
"nBit": True,
|
||||
"timers": {
|
||||
@ -116,6 +121,11 @@ def test_bgp_dynamic_capability_graceful_restart():
|
||||
"gracefulRestart": "advertisedAndReceived",
|
||||
"longLivedGracefulRestart": "advertisedAndReceived",
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
"gracefulRestartInfo": {
|
||||
"nBit": True,
|
||||
"timers": {
|
||||
|
@ -66,6 +66,11 @@ def test_bgp_dynamic_capability_role():
|
||||
"neighborCapabilities": {
|
||||
"dynamic": "advertisedAndReceived",
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
return topotest.json_cmp(output, expected)
|
||||
@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_role():
|
||||
"dynamic": "advertisedAndReceived",
|
||||
"role": "advertisedAndReceived",
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
"messageStats": {
|
||||
"notificationsRecv": 0,
|
||||
"capabilityRecv": 1,
|
||||
|
@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_software_version():
|
||||
"receivedSoftwareVersion": None,
|
||||
},
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
return topotest.json_cmp(output, expected)
|
||||
@ -129,6 +134,11 @@ def test_bgp_dynamic_capability_software_version():
|
||||
"receivedSoftwareVersion": rcv,
|
||||
},
|
||||
},
|
||||
"addressFamilyInfo": {
|
||||
"ipv4Unicast": {
|
||||
"acceptedPrefixCounter": 2,
|
||||
}
|
||||
},
|
||||
"messageStats": {
|
||||
"notificationsRecv": 0,
|
||||
"capabilityRecv": 1,
|
||||
|
Loading…
Reference in New Issue
Block a user