Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

Browse source 
bgpd: define val in ecommunity_val as uint8_t
This commit is contained in:
Donatas Abraitis 2024-09-19 11:33:58 +02:00 committed by GitHub
parent 4d18e4a8b3 4b138bdd00
commit cc7d3afdd5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bgpd/bgp_ecommunity.h
View file

@ -155,12 +155,12 @@ struct ecommunity_ip6 {
/* Extended community value is eight octet. */ /* Extended community value is eight octet. */
struct ecommunity_val { struct ecommunity_val {
char val[ECOMMUNITY_SIZE]; uint8_t val[ECOMMUNITY_SIZE];
}; };
/* IPv6 Extended community value is eight octet. */ /* IPv6 Extended community value is eight octet. */
struct ecommunity_val_ipv6 { struct ecommunity_val_ipv6 {
char val[IPV6_ECOMMUNITY_SIZE]; uint8_t val[IPV6_ECOMMUNITY_SIZE];
}; };
#define ecom_length_size(X, Y) ((X)->size * (Y)) #define ecom_length_size(X, Y) ((X)->size * (Y))

4
bgpd/bgp_evpn.c
View file

@ -117,7 +117,7 @@ int vni_list_cmp(void *p1, void *p2)
static unsigned int vrf_import_rt_hash_key_make(const void *p) static unsigned int vrf_import_rt_hash_key_make(const void *p)
{ {
const struct vrf_irt_node *irt = 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); 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) static unsigned int import_rt_hash_key_make(const void *p)
{ {
const struct irt_node *irt = 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); return jhash(pnt, 8, 0xdeadbeef);
} }

25
bgpd/bgp_pbr.c
View file

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