Merge pull request FRRouting#16848 from enkechen-panw/ecomm-val

bgpd: define val in ecommunity_val as uint8_t
opensourcerouting · Sep 19, 2024 · cc7d3af · cc7d3af
2 parents 4d18e4a + 4b138bd
commit cc7d3af
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/bgpd/bgp_ecommunity.h b/bgpd/bgp_ecommunity.h
@@ -155,12 +155,12 @@ struct ecommunity_ip6 {
 
 /* Extended community value is eight octet.  */
 struct ecommunity_val {
-	char val[ECOMMUNITY_SIZE];
+	uint8_t val[ECOMMUNITY_SIZE];
 };
 
 /* IPv6 Extended community value is eight octet.  */
 struct ecommunity_val_ipv6 {
-	char val[IPV6_ECOMMUNITY_SIZE];
+	uint8_t val[IPV6_ECOMMUNITY_SIZE];
 };
 
 #define ecom_length_size(X, Y)    ((X)->size * (Y))

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
@@ -117,7 +117,7 @@ int vni_list_cmp(void *p1, void *p2)
 static unsigned int vrf_import_rt_hash_key_make(const void *p)
 {
 	const struct vrf_irt_node *irt = p;
-	const char *pnt = irt->rt.val;
+	const uint8_t *pnt = irt->rt.val;
 
 	return jhash(pnt, 8, 0x5abc1234);
 }
@@ -229,7 +229,7 @@ static int is_vrf_present_in_irt_vrfs(struct list *vrfs, struct bgp *bgp_vrf)
 static unsigned int import_rt_hash_key_make(const void *p)
 {
 	const struct irt_node *irt = p;
-	const char *pnt = irt->rt.val;
+	const uint8_t *pnt = irt->rt.val;
 
 	return jhash(pnt, 8, 0xdeadbeef);
 }

diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c
@@ -775,14 +775,12 @@ int bgp_pbr_build_and_validate_entry(const struct prefix *p,
 			}
 			api_action = &api->actions[action_count - 1];
 
-			if ((ecom_eval->val[1] ==
-			     (char)ECOMMUNITY_REDIRECT_VRF) &&
-			    (ecom_eval->val[0] ==
-			     (char)ECOMMUNITY_ENCODE_TRANS_EXP ||
+			if ((ecom_eval->val[1] == ECOMMUNITY_REDIRECT_VRF) &&
+			    (ecom_eval->val[0] == ECOMMUNITY_ENCODE_TRANS_EXP ||
 			     ecom_eval->val[0] ==
-			     (char)ECOMMUNITY_EXTENDED_COMMUNITY_PART_2 ||
+				     ECOMMUNITY_EXTENDED_COMMUNITY_PART_2 ||
 			     ecom_eval->val[0] ==
-			     (char)ECOMMUNITY_EXTENDED_COMMUNITY_PART_3)) {
+				     ECOMMUNITY_EXTENDED_COMMUNITY_PART_3)) {
 				struct ecommunity *eckey = ecommunity_new();
 				struct ecommunity_val ecom_copy;
 
@@ -800,9 +798,9 @@ int bgp_pbr_build_and_validate_entry(const struct prefix *p,
 								eckey);
 				ecommunity_free(&eckey);
 			} else if ((ecom_eval->val[0] ==
-				    (char)ECOMMUNITY_ENCODE_REDIRECT_IP_NH) &&
+				    ECOMMUNITY_ENCODE_REDIRECT_IP_NH) &&
 				   (ecom_eval->val[1] ==
-				    (char)ECOMMUNITY_REDIRECT_IP_NH)) {
+				    ECOMMUNITY_REDIRECT_IP_NH)) {
 				/* in case the 2 ecom present,
 				 * do not overwrite
 				 * draft-ietf-idr-flowspec-redirect
@@ -861,10 +859,9 @@ int bgp_pbr_build_and_validate_entry(const struct prefix *p,
 						= ecom_eval->val[7];
 					api_action_redirect_ip = api_action;
 				}
-			} else if ((ecom_eval->val[0] ==
-				    (char)ECOMMUNITY_ENCODE_IP) &&
+			} else if ((ecom_eval->val[0] == ECOMMUNITY_ENCODE_IP) &&
 				   (ecom_eval->val[1] ==
-				    (char)ECOMMUNITY_FLOWSPEC_REDIRECT_IPV4)) {
+				    ECOMMUNITY_FLOWSPEC_REDIRECT_IPV4)) {
 				/* in case the 2 ecom present,
 				 * overwrite simpson draft
 				 * update redirect ip fields
@@ -888,7 +885,7 @@ int bgp_pbr_build_and_validate_entry(const struct prefix *p,
 				}
 			} else {
 				if (ecom_eval->val[0] !=
-				    (char)ECOMMUNITY_ENCODE_TRANS_EXP)
+				    ECOMMUNITY_ENCODE_TRANS_EXP)
 					continue;
 				ret = ecommunity_fill_pbr_action(ecom_eval,
 								 api_action,
@@ -920,9 +917,9 @@ int bgp_pbr_build_and_validate_entry(const struct prefix *p,
 			}
 			api_action = &api->actions[action_count - 1];
 			if ((ipv6_ecom_eval->val[1] ==
-			     (char)ECOMMUNITY_FLOWSPEC_REDIRECT_IPV6) &&
+			     ECOMMUNITY_FLOWSPEC_REDIRECT_IPV6) &&
 			    (ipv6_ecom_eval->val[0] ==
-			     (char)ECOMMUNITY_ENCODE_TRANS_EXP)) {
+			     ECOMMUNITY_ENCODE_TRANS_EXP)) {
 				struct ecommunity *eckey = ecommunity_new();
 				struct ecommunity_val_ipv6 ecom_copy;