Merge pull request #2497 from ppmathis/backport/5.0-pgo-efas

[5.0] bgpd: Backport peer-attribute overrides, peer-level enforce-first-as and filtered-routes fix
FRRouting · Jun 20, 2018 · ea780a6 · ea780a6
2 parents f0adaee + ca81257
commit ea780a6
Show file tree

Hide file tree

Showing 13 changed files with 3,479 additions and 1,343 deletions.
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
@@ -1177,7 +1177,6 @@ static bgp_attr_parse_ret_t bgp_attr_aspath_check(struct peer *const peer,
 	 * not right.
 	 * So do the checks later, i.e. here
 	 */
-	struct bgp *bgp = peer->bgp;
 	struct aspath *aspath;
 
 	/* Confederation sanity check. */
@@ -1192,7 +1191,7 @@ static bgp_attr_parse_ret_t bgp_attr_aspath_check(struct peer *const peer,
 	}
 
 	/* First AS check for EBGP. */
-	if (bgp != NULL && bgp_flag_check(bgp, BGP_FLAG_ENFORCE_FIRST_AS)) {
+	if (CHECK_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS)) {
 		if (peer->sort == BGP_PEER_EBGP
 		    && !aspath_firstas_check(attr->aspath, peer->as)) {
 			zlog_err("%s incorrect first AS (must be %u)",

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
@@ -193,7 +193,6 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
 	peer->as = from_peer->as;
 	peer->v_holdtime = from_peer->v_holdtime;
 	peer->v_keepalive = from_peer->v_keepalive;
-	peer->routeadv = from_peer->routeadv;
 	peer->v_routeadv = from_peer->v_routeadv;
 	peer->v_gr_restart = from_peer->v_gr_restart;
 	peer->cap = from_peer->cap;
@@ -1143,7 +1142,7 @@ int bgp_stop(struct peer *peer)
 	}
 
 	/* Reset keepalive and holdtime */
-	if (PEER_OR_GROUP_TIMER_SET(peer)) {
+	if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER)) {
 		peer->v_keepalive = peer->keepalive;
 		peer->v_holdtime = peer->holdtime;
 	} else {

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
@@ -503,7 +503,7 @@ void bgp_open_send(struct peer *peer)
 	uint16_t send_holdtime;
 	as_t local_as;
 
-	if (PEER_OR_GROUP_TIMER_SET(peer))
+	if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
 		send_holdtime = peer->holdtime;
 	else
 		send_holdtime = peer->bgp->default_holdtime;
@@ -1237,7 +1237,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
 	   implementation MAY adjust the rate at which it sends KEEPALIVE
 	   messages as a function of the Hold Time interval. */
 
-	if (PEER_OR_GROUP_TIMER_SET(peer))
+	if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
 		send_holdtime = peer->holdtime;
 	else
 		send_holdtime = peer->bgp->default_holdtime;
@@ -1247,7 +1247,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
 	else
 		peer->v_holdtime = send_holdtime;
 
-	if ((PEER_OR_GROUP_TIMER_SET(peer))
+	if ((CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
 	    && (peer->keepalive < peer->v_holdtime / 3))
 		peer->v_keepalive = peer->keepalive;
 	else

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -1169,12 +1169,8 @@ static int bgp_input_modifier(struct peer *peer, struct prefix *p,
 
 		peer->rmap_type = 0;
 
-		if (ret == RMAP_DENYMATCH) {
-			/* Free newly generated AS path and community by
-			 * route-map. */
-			bgp_attr_flush(attr);
+		if (ret == RMAP_DENYMATCH)
 			return RMAP_DENY;
-		}
 	}
 	return RMAP_PERMIT;
 }

diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
@@ -487,17 +487,17 @@ static int write_bgpPeerTable(int action, uint8_t *var_val,
 			return SNMP_ERR_NOSUCHNAME;
 		break;
 	case BGPPEERCONNECTRETRYINTERVAL:
-		SET_FLAG(peer->config, PEER_CONFIG_CONNECT);
+		peer_flag_set(peer, PEER_FLAG_TIMER_CONNECT);
 		peer->connect = intval;
 		peer->v_connect = intval;
 		break;
 	case BGPPEERHOLDTIMECONFIGURED:
-		SET_FLAG(peer->config, PEER_CONFIG_TIMER);
+		peer_flag_set(peer, PEER_FLAG_TIMER);
 		peer->holdtime = intval;
 		peer->v_holdtime = intval;
 		break;
 	case BGPPEERKEEPALIVECONFIGURED:
-		SET_FLAG(peer->config, PEER_CONFIG_TIMER);
+		peer_flag_set(peer, PEER_FLAG_TIMER);
 		peer->keepalive = intval;
 		peer->v_keepalive = intval;
 		break;
@@ -617,14 +617,14 @@ static uint8_t *bgpPeerTable(struct variable *v, oid name[], size_t *length,
 		break;
 	case BGPPEERHOLDTIMECONFIGURED:
 		*write_method = write_bgpPeerTable;
-		if (PEER_OR_GROUP_TIMER_SET(peer))
+		if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
 			return SNMP_INTEGER(peer->holdtime);
 		else
 			return SNMP_INTEGER(peer->v_holdtime);
 		break;
 	case BGPPEERKEEPALIVECONFIGURED:
 		*write_method = write_bgpPeerTable;
-		if (PEER_OR_GROUP_TIMER_SET(peer))
+		if (CHECK_FLAG(peer->flags, PEER_FLAG_TIMER))
 			return SNMP_INTEGER(peer->keepalive);
 		else
 			return SNMP_INTEGER(peer->v_keepalive);