Merge branch 'FRRouting:master' into venkit.bgppic

Author: venkit-nexthop

bfdd/bfd.c

@@ -2556,9 +2556,9 @@ void bfd_vrf_toggle_echo(struct bfd_vrf_global *bfd_vrf)
 	if (bfd_vrf->bg_echov6 == -1)
 		bfd_vrf->bg_echov6 = bp_echov6_socket(bfd_vrf->vrf);
 
-	if (bfd_vrf->bg_ev[4] == NULL && bfd_vrf->bg_echo != -1)
+	if (!event_is_scheduled(bfd_vrf->bg_ev[4]) && bfd_vrf->bg_echo != -1)
 		event_add_read(master, bfd_recv_cb, bfd_vrf, bfd_vrf->bg_echo, &bfd_vrf->bg_ev[4]);
-	if (bfd_vrf->bg_ev[5] == NULL && bfd_vrf->bg_echov6 != -1)
+	if (!event_is_scheduled(bfd_vrf->bg_ev[5]) && bfd_vrf->bg_echov6 != -1)
 		event_add_read(master, bfd_recv_cb, bfd_vrf, bfd_vrf->bg_echov6, &bfd_vrf->bg_ev[5]);
 }
 
@@ -2935,19 +2935,19 @@ int bfd_vrf_start_sockets(struct bfd_vrf_global *bvrf)
 	if (bvrf->bg_initv6 == -1)
 		bvrf->bg_initv6 = bp_initv6_socket(bvrf->vrf);
 
-	if (bvrf->bg_ev[0] == NULL && bvrf->bg_shop != -1)
+	if (!event_is_scheduled(bvrf->bg_ev[0]) && bvrf->bg_shop != -1)
 		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
 			       &bvrf->bg_ev[0]);
-	if (bvrf->bg_ev[1] == NULL && bvrf->bg_mhop != -1)
+	if (!event_is_scheduled(bvrf->bg_ev[1]) && bvrf->bg_mhop != -1)
 		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
 			       &bvrf->bg_ev[1]);
-	if (bvrf->bg_ev[2] == NULL && bvrf->bg_shop6 != -1)
+	if (!event_is_scheduled(bvrf->bg_ev[2]) && bvrf->bg_shop6 != -1)
 		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
 			       &bvrf->bg_ev[2]);
-	if (bvrf->bg_ev[3] == NULL && bvrf->bg_mhop6 != -1)
+	if (!event_is_scheduled(bvrf->bg_ev[3]) && bvrf->bg_mhop6 != -1)
 		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
 			       &bvrf->bg_ev[3]);
-	if (bvrf->bg_ev[6] == NULL && bvrf->bg_initv6 != -1)
+	if (!event_is_scheduled(bvrf->bg_ev[6]) && bvrf->bg_initv6 != -1)
 		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_initv6,
 			       &bvrf->bg_ev[6]);
 

bfdd/bfd_packet.c

@@ -1107,7 +1107,6 @@ static bool bfd_check_auth(struct bfd_session *bfd, const struct bfd_pkt *cp)
 		/* Zero out the 20-byte digest field in the temp packet before hashing */
 		memset(msgbuf + BFD_PKT_LEN + 8, 0, digest_len);
 
-		md_alg = EVP_sha1();
 		HMAC(md_alg, key->string, strlen(key->string), msgbuf, cp->len, computed_digest,
 		     &digest_len);
 

bfdd/dplane.c

@@ -437,7 +437,7 @@ static int bfd_dplane_enqueue(struct bfd_dplane_ctx *bdc, const void *buf,
 		bdc->out_bytes_peak = rlen;
 
 	/* Schedule if it is not yet. */
-	if (bdc->outbufev == NULL)
+	if (!event_is_scheduled(bdc->outbufev))
 		event_add_write(master, bfd_dplane_write, bdc, bdc->sock,
 				&bdc->outbufev);
 

bgpd/bgp_attr.c

@@ -1166,8 +1166,7 @@ bool attrhash_cmp(const void *p1, const void *p2)
 		    srv6_l3service_same(bgp_attr_get_srv6_l3service(attr1),
 					bgp_attr_get_srv6_l3service(attr2)) &&
 		    srv6_vpn_same(bgp_attr_get_srv6_vpn(attr1), bgp_attr_get_srv6_vpn(attr2)) &&
-		    attr1->srte_color == attr2->srte_color && attr1->nh_type == attr2->nh_type &&
-		    attr1->bh_type == attr2->bh_type &&
+		    attr1->nh_type == attr2->nh_type && attr1->bh_type == attr2->bh_type &&
 		    bgp_attr_get_otc(attr1) == bgp_attr_get_otc(attr2) &&
 		    !memcmp(&attr1->rmac, &attr2->rmac, sizeof(struct ethaddr)) &&
 		    bgp_nhc_same(bgp_attr_get_nhc(attr1), bgp_attr_get_nhc(attr2)) &&
@@ -2796,16 +2795,6 @@ bgp_attr_cluster_list(struct bgp_attr_parser_args *args)
 	return bgp_attr_ignore(peer, args->type);
 }
 
-/* get locally configure or received srte-color value*/
-uint32_t bgp_attr_get_color(struct attr *attr)
-{
-	if (attr->srte_color)
-		return attr->srte_color;
-	if (attr->ecommunity)
-		return ecommunity_select_color(attr->ecommunity);
-	return 0;
-}
-
 /* Multiprotocol reachability information parse. */
 int bgp_mp_reach_parse(struct bgp_attr_parser_args *args,
 		       struct bgp_nlri *mp_update)

bgpd/bgp_attr.h

@@ -338,9 +338,6 @@ struct attr {
 	/* EVPN ES */
 	esi_t esi;
 
-	/* SR-TE Color */
-	uint32_t srte_color;
-
 	/* Nexthop type */
 	enum nexthop_types_t nh_type;
 
@@ -512,8 +509,6 @@ extern void bgp_packet_mpunreach_end(struct stream *s, size_t attrlen_pnt);
 extern enum bgp_attr_parse_ret bgp_attr_nexthop_valid(struct peer *peer,
 						      struct attr *attr);
 
-extern uint32_t bgp_attr_get_color(struct attr *attr);
-
 static inline bool bgp_rmap_nhop_changed(uint32_t out_rmap_flags)
 {
 	return ((CHECK_FLAG(out_rmap_flags, BATTR_RMAP_NEXTHOP_PEER_ADDRESS) ||

bgpd/bgp_bmp.c

@@ -2026,8 +2026,6 @@ static void bmp_read(struct event *t)
 	char buf[1024];
 	ssize_t n;
 
-	bmp->t_read = NULL;
-
 	n = read(bmp->socket, buf, sizeof(buf));
 	if (n >= 1) {
 		zlog_info("bmp[%s]: unexpectedly received %zu bytes", bmp->remote, n);
@@ -3287,15 +3285,15 @@ DEFPY(show_bmp,
 
 				uptime[0] = '\0';
 
-				if (ba->t_timer) {
+				if (event_is_scheduled(ba->t_timer)) {
 					long trem = event_timer_remain_second(
 						ba->t_timer);
 
 					peer_uptime(monotime(NULL) - trem,
 						    uptime, sizeof(uptime),
 						    false, NULL);
 					state_str = "RetryWait";
-				} else if (ba->t_read) {
+				} else if (event_is_scheduled(ba->t_read)) {
 					state_str = "Connecting";
 				} else if (ba->resq.callback) {
 					state_str = "Resolving";

bgpd/bgp_damp.c

@@ -164,7 +164,6 @@ static void bgp_reuse_timer(struct event *t)
 	time_t t_now, t_diff;
 	struct bgp_damp_config *bdc = EVENT_ARG(t);
 
-	bdc->t_reuse = NULL;
 	event_add_timer(bm->master, bgp_reuse_timer, bdc, DELTA_REUSE,
 			&bdc->t_reuse);
 

bgpd/bgp_evpn_mh.c

@@ -4457,7 +4457,8 @@ void bgp_evpn_es_evi_show_vni(struct vty *vty, vni_t vni,
  */
 static void bgp_evpn_es_cons_checks_timer_start(void)
 {
-	if (!bgp_mh_info->consistency_checking || bgp_mh_info->t_cons_check)
+	if (!bgp_mh_info->consistency_checking ||
+	    event_is_scheduled(bgp_mh_info->t_cons_check))
 		return;
 
 	if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
@@ -5270,8 +5271,7 @@ void bgp_evpn_mh_finish(void)
 		/* Clear local info (attempts normal cleanup and may free es) */
 		bgp_evpn_es_local_info_clear(es, true);
 	}
-	if (bgp_mh_info->t_cons_check)
-		event_cancel(&bgp_mh_info->t_cons_check);
+	event_cancel(&bgp_mh_info->t_cons_check);
 	list_delete(&bgp_mh_info->local_es_list);
 	list_delete(&bgp_mh_info->pend_es_list);
 	list_delete(&bgp_mh_info->ead_es_export_rtl);

bgpd/bgp_fsm.c

@@ -929,7 +929,7 @@ void bgp_start_tier2_deferral_timer(struct bgp *bgp, afi_t afi, safi_t safi)
 	/*
 	 * tier-2 deferral timer is already running
 	 */
-	if (gr_info->t_select_deferral_tier2) {
+	if (event_is_scheduled(gr_info->t_select_deferral_tier2)) {
 		if (BGP_DEBUG(graceful_restart, GRACEFUL_RESTART))
 			zlog_debug("%s: tier-2 path-select deferral timer for %s, duration %d is running",
 				   bgp->name_pretty, get_afi_safi_str(afi, safi, false),
@@ -1022,7 +1022,7 @@ static bool bgp_update_delay_applicable(struct bgp *bgp)
 
 bool bgp_update_delay_active(struct bgp *bgp)
 {
-	if (bgp->t_update_delay)
+	if (event_is_scheduled(bgp->t_update_delay))
 		return true;
 	return false;
 }
@@ -1046,7 +1046,7 @@ bool bgp_advertisement_delay_applicable(struct bgp *bgp)
 
 bool bgp_advertisement_delay_active(struct bgp *bgp)
 {
-	if (bgp->t_advertisement_delay)
+	if (event_is_scheduled(bgp->t_advertisement_delay))
 		return true;
 	return false;
 }
@@ -1208,7 +1208,7 @@ void bgp_adjust_routeadv(struct peer *peer)
 	 *
 	 *                     (MRAI - m) < r
 	 */
-	if (connection->t_routeadv)
+	if (event_is_scheduled(connection->t_routeadv))
 		remain = event_timer_remain_second(connection->t_routeadv);
 	else
 		remain = peer->v_routeadv;
@@ -1235,7 +1235,7 @@ bool bgp_maxmed_onstartup_configured(struct bgp *bgp)
 
 bool bgp_maxmed_onstartup_active(struct bgp *bgp)
 {
-	if (bgp->t_maxmed_onstartup)
+	if (event_is_scheduled(bgp->t_maxmed_onstartup))
 		return true;
 	return false;
 }
@@ -1248,7 +1248,7 @@ void bgp_maxmed_update(struct bgp *bgp)
 	if (bgp->v_maxmed_admin) {
 		maxmed_active = 1;
 		maxmed_value = bgp->maxmed_admin_value;
-	} else if (bgp->t_maxmed_onstartup) {
+	} else if (event_is_scheduled(bgp->t_maxmed_onstartup)) {
 		maxmed_active = 1;
 		maxmed_value = bgp->maxmed_onstartup_value;
 	} else {
@@ -1673,7 +1673,7 @@ void bgp_gr_check_path_select(struct bgp *bgp, afi_t afi, safi_t safi)
 		 */
 		if (!BGP_SUPPRESS_FIB_ENABLED(bgp) || !bgp->gr_info[afi][safi].gr_deferred ||
 		    !bgp_fibupd_safi(safi)) {
-			if (gr_info->t_select_deferral) {
+			if (event_is_scheduled(gr_info->t_select_deferral)) {
 				void *info = EVENT_ARG(gr_info->t_select_deferral);
 
 				XFREE(MTYPE_TMP, info);
@@ -1686,7 +1686,7 @@ void bgp_gr_check_path_select(struct bgp *bgp, afi_t afi, safi_t safi)
 		 * then cancel the timer.
 		 */
 		if (!multihop_eors_pending) {
-			if (gr_info->t_select_deferral_tier2) {
+			if (event_is_scheduled(gr_info->t_select_deferral_tier2)) {
 				void *info = EVENT_ARG(gr_info->t_select_deferral_tier2);
 
 				XFREE(MTYPE_TMP, info);
@@ -1858,7 +1858,7 @@ void bgp_gr_start_all_deferral_timers(struct bgp *bgp)
 			continue;
 
 		gr_info = &(bgp->gr_info[afi][safi]);
-		if (!gr_info->t_select_deferral)
+		if (!event_is_scheduled(gr_info->t_select_deferral))
 			bgp_start_deferral_timer(bgp, afi, safi, gr_info);
 	}
 }
@@ -1904,7 +1904,8 @@ static void bgp_gr_process_peer_up_include(struct bgp *bgp, struct peer *peer)
 		} else {
 			SET_FLAG(peer->af_sflags[afi][safi], PEER_STATUS_GR_WAIT_EOR);
 			gr_info = &(bgp->gr_info[afi][safi]);
-			if (!gr_info->t_select_deferral && !gr_info->select_defer_over)
+			if (!event_is_scheduled(gr_info->t_select_deferral) &&
+			    !gr_info->select_defer_over)
 				bgp_start_deferral_timer(bgp, afi, safi, gr_info);
 		}
 	}
@@ -1974,7 +1975,7 @@ static bool gr_path_select_deferral_applicable(struct bgp *bgp)
 	 * settings and GR is not complete and path selection
 	 * deferral not yet done for this instance
 	 */
-	if (!bgp->t_startup && !bgp_in_graceful_restart())
+	if (!event_is_scheduled(bgp->t_startup) && !bgp_in_graceful_restart())
 		return false;
 
 	FOREACH_AFI_SAFI_NSF (afi, safi) {
@@ -2183,7 +2184,7 @@ enum bgp_fsm_state_progress bgp_stop(struct peer_connection *connection)
 		}
 
 		/* graceful restart */
-		if (connection->t_gr_stale) {
+		if (event_is_scheduled(connection->t_gr_stale)) {
 			event_cancel(&connection->t_gr_stale);
 			if (bgp_debug_neighbor_events(peer))
 				zlog_debug("%pBP graceful restart stalepath timer stopped for %s",
@@ -2212,7 +2213,7 @@ enum bgp_fsm_state_progress bgp_stop(struct peer_connection *connection)
 		}
 
 		/* Stop route-refresh stalepath timer */
-		if (peer->t_refresh_stalepath) {
+		if (event_is_scheduled(peer->t_refresh_stalepath)) {
 			event_cancel(&peer->t_refresh_stalepath);
 
 			if (bgp_debug_neighbor_events(peer))
@@ -2551,7 +2552,7 @@ bgp_connect_success_w_delayopen(struct peer_connection *connection)
 	peer->v_delayopen = peer->delayopen;
 
 	/* Start the DelayOpenTimer if it is not already running */
-	if (!connection->t_delayopen)
+	if (!event_is_scheduled(connection->t_delayopen))
 		BGP_TIMER_ON(connection->t_delayopen, bgp_delayopen_timer, peer->v_delayopen);
 
 	frrtrace(2, frr_bgp, session_state_change, peer, 6);
@@ -2837,7 +2838,7 @@ static void bgp_peer_process_gr_cap_clear_stale(struct peer *peer)
 	safi_t safi;
 	int nsf_af_count = 0;
 
-	if (peer->connection->t_gr_restart) {
+	if (event_is_scheduled(peer->connection->t_gr_restart)) {
 		event_cancel(&peer->connection->t_gr_restart);
 		if (bgp_debug_neighbor_events(peer))
 			zlog_debug("%pBP: graceful restart timer stopped", peer);
@@ -2880,7 +2881,7 @@ static void bgp_peer_process_gr_cap_clear_stale(struct peer *peer)
 		SET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE);
 	else {
 		UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE);
-		if (peer->connection->t_gr_stale) {
+		if (event_is_scheduled(peer->connection->t_gr_stale)) {
 			event_cancel(&peer->connection->t_gr_stale);
 			if (bgp_debug_neighbor_events(peer))
 				zlog_debug("%s: graceful restart stalepath timer stopped",
@@ -2977,7 +2978,7 @@ bgp_establish(struct peer_connection *connection)
 	 * Stop Long-lived Graceful Restart timers.
 	 */
 	FOREACH_AFI_SAFI (afi, safi) {
-		if (peer->t_llgr_stale[afi][safi]) {
+		if (event_is_scheduled(peer->t_llgr_stale[afi][safi])) {
 			event_cancel(&peer->t_llgr_stale[afi][safi]);
 			if (bgp_debug_neighbor_events(peer))
 				zlog_debug("%pBP Long-lived stale timer stopped for afi/safi: %d/%d for %s",

bgpd/bgp_labelpool.c

@@ -1485,8 +1485,7 @@ static void lptest_stop(void)
 		return;
 	}
 
-	if (tcb->event_thread)
-		event_cancel(&tcb->event_thread);
+	event_cancel(&tcb->event_thread);
 
 	lpt_inprogress = false;
 }
@@ -1774,8 +1773,7 @@ static void lptest_delete(void *val)
 		tcb->timestamps_dealloc = NULL;
 	}
 
-	if (tcb->event_thread)
-		event_cancel(&tcb->event_thread);
+	event_cancel(&tcb->event_thread);
 
 	memset(tcb, 0, sizeof(*tcb));