From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Fri, 5 Feb 2021 14:47:55 +0000 (+0200)
Subject: bgpd: Unset only aggregator flag when AGGREGATOR_AS is 0
X-Git-Tag: base_8.0~420^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F8019%2Fhead;p=mirror%2Ffrr.git

bgpd: Unset only aggregator flag when AGGREGATOR_AS is 0

Avoid mangling packet size which is expected to be the same as received.

Stream pointer advancing is necessary to avoid changing the packet and
reseting BGP sessions.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
---

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 48315cbaab..3e63ed483a 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1750,18 +1750,16 @@ static int bgp_attr_aggregator(struct bgp_attr_parser_args *args)
 	else
 		aggregator_as = stream_getw(peer->curr);
 
+	attr->aggregator_as = aggregator_as;
+	attr->aggregator_addr.s_addr = stream_get_ipv4(peer->curr);
+
 	/* Codification of AS 0 Processing */
-	if (aggregator_as == BGP_AS_ZERO) {
+	if (aggregator_as == BGP_AS_ZERO)
 		flog_err(EC_BGP_ATTR_LEN,
 			 "%s: AGGREGATOR AS number is 0 for aspath: %s",
 			 peer->host, aspath_print(attr->aspath));
-	} else {
-		attr->aggregator_as = aggregator_as;
-		attr->aggregator_addr.s_addr = stream_get_ipv4(peer->curr);
-
-		/* Set atomic aggregate flag. */
+	else
 		attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AGGREGATOR);
-	}
 
 	return BGP_ATTR_PARSE_PROCEED;
 }
@@ -1786,17 +1784,16 @@ bgp_attr_as4_aggregator(struct bgp_attr_parser_args *args,
 
 	aggregator_as = stream_getl(peer->curr);
 
+	*as4_aggregator_as = aggregator_as;
+	as4_aggregator_addr->s_addr = stream_get_ipv4(peer->curr);
+
 	/* Codification of AS 0 Processing */
-	if (aggregator_as == BGP_AS_ZERO) {
+	if (aggregator_as == BGP_AS_ZERO)
 		flog_err(EC_BGP_ATTR_LEN,
 			 "%s: AS4_AGGREGATOR AS number is 0 for aspath: %s",
 			 peer->host, aspath_print(attr->aspath));
-	} else {
-		*as4_aggregator_as = aggregator_as;
-		as4_aggregator_addr->s_addr = stream_get_ipv4(peer->curr);
-
+	else
 		attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AS4_AGGREGATOR);
-	}
 
 	return BGP_ATTR_PARSE_PROCEED;
 }