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

bgpd: Do not check against aspath seg which is already checked before

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2021-06-11 18:37:50 +03:00
parent 707bb5a09c
commit 9c73cd41f7
1 changed files with 61 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
bgpd/bgp_aspath.c
View File

@ -910,77 +910,70 @@ size_t aspath_put(struct stream *s, struct aspath *as, int use32bit)
if (!seg || seg->length == 0) if (!seg || seg->length == 0)
return 0; return 0;
if (seg) { /*
/* * Hey, what do we do when we have > STREAM_WRITABLE(s) here?
* Hey, what do we do when we have > STREAM_WRITABLE(s) here? * At the moment, we would write out a partial aspath, and our
* At the moment, we would write out a partial aspath, and our * peer
* peer * will complain and drop the session :-/
* will complain and drop the session :-/ *
* * The general assumption here is that many things tested will
* The general assumption here is that many things tested will * never happen. And, in real live, up to now, they have not.
* never happen. And, in real live, up to now, they have not. */
*/ while (seg && (ASSEGMENT_LEN(seg, use32bit) <= STREAM_WRITEABLE(s))) {
while (seg && (ASSEGMENT_LEN(seg, use32bit) struct assegment *next = seg->next;
<= STREAM_WRITEABLE(s))) { int written = 0;
struct assegment *next = seg->next; int asns_packed = 0;
int written = 0; size_t lenp;
int asns_packed = 0;
size_t lenp;
/* Overlength segments have to be split up */ /* Overlength segments have to be split up */
while ((seg->length - written) > AS_SEGMENT_MAX) { while ((seg->length - written) > AS_SEGMENT_MAX) {
assegment_header_put(s, seg->type, assegment_header_put(s, seg->type, AS_SEGMENT_MAX);
AS_SEGMENT_MAX);
assegment_data_put(s, (seg->as + written), AS_SEGMENT_MAX,
use32bit);
written += AS_SEGMENT_MAX;
bytes += ASSEGMENT_SIZE(AS_SEGMENT_MAX,
use32bit);
}
/* write the final segment, probably is also the first
*/
lenp = assegment_header_put(s, seg->type,
seg->length - written);
assegment_data_put(s, (seg->as + written), assegment_data_put(s, (seg->as + written),
seg->length - written, use32bit); AS_SEGMENT_MAX, use32bit);
written += AS_SEGMENT_MAX;
/* Sequence-type segments can be 'packed' together bytes += ASSEGMENT_SIZE(AS_SEGMENT_MAX, use32bit);
* Case of a segment which was overlength and split up
* will be missed here, but that doesn't matter.
*/
while (next && ASSEGMENTS_PACKABLE(seg, next)) {
/* NB: We should never normally get here given
* we
* normalise aspath data when parse them.
* However, better
* safe than sorry. We potentially could call
* assegment_normalise here instead, but it's
* cheaper and
* easier to do it on the fly here rather than
* go through
* the segment list twice every time we write
* out
* aspath's.
*/
/* Next segment's data can fit in this one */
assegment_data_put(s, next->as, next->length,
use32bit);
/* update the length of the segment header */
stream_putc_at(s, lenp,
seg->length - written
+ next->length);
asns_packed += next->length;
next = next->next;
}
bytes += ASSEGMENT_SIZE(
seg->length - written + asns_packed, use32bit);
seg = next;
} }
/* write the final segment, probably is also the first
*/
lenp = assegment_header_put(s, seg->type,
seg->length - written);
assegment_data_put(s, (seg->as + written),
seg->length - written, use32bit);
/* Sequence-type segments can be 'packed' together
* Case of a segment which was overlength and split up
* will be missed here, but that doesn't matter.
*/
while (next && ASSEGMENTS_PACKABLE(seg, next)) {
/* NB: We should never normally get here given
* we
* normalise aspath data when parse them.
* However, better
* safe than sorry. We potentially could call
* assegment_normalise here instead, but it's
* cheaper and
* easier to do it on the fly here rather than
* go through
* the segment list twice every time we write
* out
* aspath's.
*/
/* Next segment's data can fit in this one */
assegment_data_put(s, next->as, next->length, use32bit);
/* update the length of the segment header */
stream_putc_at(s, lenp,
seg->length - written + next->length);
asns_packed += next->length;
next = next->next;
}
bytes += ASSEGMENT_SIZE(seg->length - written + asns_packed,
use32bit);
seg = next;
} }
return bytes; return bytes;
} }