matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

bgpd: Convert some community related functions to bool type

Browse source 
They return 0/1, hence changing the return type to bool.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2020-03-19 21:48:25 +02:00
parent 218326d04a
commit 88f1c94718
2 changed files with 66 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
bgpd/bgp_clist.c
View file

@ -311,9 +311,9 @@ static void community_list_delete(struct community_list_master *cm,
community_list_free(list); community_list_free(list);
} }
static int community_list_empty_p(struct community_list *list) static bool community_list_empty_p(struct community_list *list)
{ {
return (list->head == NULL && list->tail == NULL) ? 1 : 0; return list->head == NULL && list->tail == NULL;
} }
/* Delete community-list entry from the list. */ /* Delete community-list entry from the list. */
@ -497,7 +497,7 @@ static char *community_str_get(struct community *com, int i)
/* Internal function to perform regular expression match for /* Internal function to perform regular expression match for
* a single community. */ * a single community. */
static int community_regexp_include(regex_t *reg, struct community *com, int i) static bool community_regexp_include(regex_t *reg, struct community *com, int i)
{ {
char *str; char *str;
int rv; int rv;
@ -514,16 +514,12 @@ static int community_regexp_include(regex_t *reg, struct community *com, int i)
XFREE(MTYPE_COMMUNITY_STR, str); XFREE(MTYPE_COMMUNITY_STR, str);
if (rv == 0) return rv == 0;
return 1;
/* No match. */
return 0;
} }
/* Internal function to perform regular expression match for community /* Internal function to perform regular expression match for community
attribute. */ attribute. */
static int community_regexp_match(struct community *com, regex_t *reg) static bool community_regexp_match(struct community *com, regex_t *reg)
{ {
const char *str; const char *str;
@ -536,10 +532,10 @@ static int community_regexp_match(struct community *com, regex_t *reg)
/* Regular expression match. */ /* Regular expression match. */
if (regexec(reg, str, 0, NULL, 0) == 0) if (regexec(reg, str, 0, NULL, 0) == 0)
return 1; return true;
/* No match. */ /* No match. */
return 0; return false;
} }
static char *lcommunity_str_get(struct lcommunity *lcom, int i) static char *lcommunity_str_get(struct lcommunity *lcom, int i)
@ -574,8 +570,8 @@ static char *lcommunity_str_get(struct lcommunity *lcom, int i)
/* Internal function to perform regular expression match for /* Internal function to perform regular expression match for
* a single community. */ * a single community. */
static int lcommunity_regexp_include(regex_t *reg, struct lcommunity *lcom, static bool lcommunity_regexp_include(regex_t *reg, struct lcommunity *lcom,
int i) int i)
{ {
char *str; char *str;
@ -589,15 +585,15 @@ static int lcommunity_regexp_include(regex_t *reg, struct lcommunity *lcom,
/* Regular expression match. */ /* Regular expression match. */
if (regexec(reg, str, 0, NULL, 0) == 0) { if (regexec(reg, str, 0, NULL, 0) == 0) {
XFREE(MTYPE_LCOMMUNITY_STR, str); XFREE(MTYPE_LCOMMUNITY_STR, str);
return 1; return true;
} }
XFREE(MTYPE_LCOMMUNITY_STR, str); XFREE(MTYPE_LCOMMUNITY_STR, str);
/* No match. */ /* No match. */
return 0; return false;
} }
static int lcommunity_regexp_match(struct lcommunity *com, regex_t *reg) static bool lcommunity_regexp_match(struct lcommunity *com, regex_t *reg)
{ {
const char *str; const char *str;
@ -610,14 +606,14 @@ static int lcommunity_regexp_match(struct lcommunity *com, regex_t *reg)
/* Regular expression match. */ /* Regular expression match. */
if (regexec(reg, str, 0, NULL, 0) == 0) if (regexec(reg, str, 0, NULL, 0) == 0)
return 1; return true;
/* No match. */ /* No match. */
return 0; return false;
} }
static int ecommunity_regexp_match(struct ecommunity *ecom, regex_t *reg) static bool ecommunity_regexp_match(struct ecommunity *ecom, regex_t *reg)
{ {
const char *str; const char *str;
@ -630,10 +626,10 @@ static int ecommunity_regexp_match(struct ecommunity *ecom, regex_t *reg)
/* Regular expression match. */ /* Regular expression match. */
if (regexec(reg, str, 0, NULL, 0) == 0) if (regexec(reg, str, 0, NULL, 0) == 0)
return 1; return true;
/* No match. */ /* No match. */
return 0; return false;
} }
#if 0 #if 0
@ -718,125 +714,113 @@ community_regexp_delete (struct community *com, regex_t * reg)
/* When given community attribute matches to the community-list return /* When given community attribute matches to the community-list return
1 else return 0. */ 1 else return 0. */
int community_list_match(struct community *com, struct community_list *list) bool community_list_match(struct community *com, struct community_list *list)
{ {
struct community_entry *entry; struct community_entry *entry;
for (entry = list->head; entry; entry = entry->next) { for (entry = list->head; entry; entry = entry->next) {
if (entry->any) if (entry->any)
return entry->direct == COMMUNITY_PERMIT ? 1 : 0; return entry->direct == COMMUNITY_PERMIT;
if (entry->style == COMMUNITY_LIST_STANDARD) { if (entry->style == COMMUNITY_LIST_STANDARD) {
if (community_include(entry->u.com, COMMUNITY_INTERNET)) if (community_include(entry->u.com, COMMUNITY_INTERNET))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
if (community_match(com, entry->u.com)) if (community_match(com, entry->u.com))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} else if (entry->style == COMMUNITY_LIST_EXPANDED) { } else if (entry->style == COMMUNITY_LIST_EXPANDED) {
if (community_regexp_match(com, entry->reg)) if (community_regexp_match(com, entry->reg))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} }
} }
return 0; return false;
} }
int lcommunity_list_match(struct lcommunity *lcom, struct community_list *list) bool lcommunity_list_match(struct lcommunity *lcom, struct community_list *list)
{ {
struct community_entry *entry; struct community_entry *entry;
for (entry = list->head; entry; entry = entry->next) { for (entry = list->head; entry; entry = entry->next) {
if (entry->any) if (entry->any)
return entry->direct == COMMUNITY_PERMIT ? 1 : 0; return entry->direct == COMMUNITY_PERMIT;
if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) { if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) {
if (lcommunity_match(lcom, entry->u.lcom)) if (lcommunity_match(lcom, entry->u.lcom))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} else if (entry->style == LARGE_COMMUNITY_LIST_EXPANDED) { } else if (entry->style == LARGE_COMMUNITY_LIST_EXPANDED) {
if (lcommunity_regexp_match(lcom, entry->reg)) if (lcommunity_regexp_match(lcom, entry->reg))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} }
} }
return 0; return false;
} }
/* Perform exact matching. In case of expanded large-community-list, do /* Perform exact matching. In case of expanded large-community-list, do
* same thing as lcommunity_list_match(). * same thing as lcommunity_list_match().
*/ */
int lcommunity_list_exact_match(struct lcommunity *lcom, bool lcommunity_list_exact_match(struct lcommunity *lcom,
struct community_list *list) struct community_list *list)
{ {
struct community_entry *entry; struct community_entry *entry;
for (entry = list->head; entry; entry = entry->next) { for (entry = list->head; entry; entry = entry->next) {
if (entry->any) if (entry->any)
return entry->direct == COMMUNITY_PERMIT ? 1 : 0; return entry->direct == COMMUNITY_PERMIT;
if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) { if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) {
if (lcommunity_cmp(lcom, entry->u.com)) if (lcommunity_cmp(lcom, entry->u.com))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} else if (entry->style == LARGE_COMMUNITY_LIST_EXPANDED) { } else if (entry->style == LARGE_COMMUNITY_LIST_EXPANDED) {
if (lcommunity_regexp_match(lcom, entry->reg)) if (lcommunity_regexp_match(lcom, entry->reg))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} }
} }
return 0; return false;
} }
int ecommunity_list_match(struct ecommunity *ecom, struct community_list *list) bool ecommunity_list_match(struct ecommunity *ecom, struct community_list *list)
{ {
struct community_entry *entry; struct community_entry *entry;
for (entry = list->head; entry; entry = entry->next) { for (entry = list->head; entry; entry = entry->next) {
if (entry->any) if (entry->any)
return entry->direct == COMMUNITY_PERMIT ? 1 : 0; return entry->direct == COMMUNITY_PERMIT;
if (entry->style == EXTCOMMUNITY_LIST_STANDARD) { if (entry->style == EXTCOMMUNITY_LIST_STANDARD) {
if (ecommunity_match(ecom, entry->u.ecom)) if (ecommunity_match(ecom, entry->u.ecom))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} else if (entry->style == EXTCOMMUNITY_LIST_EXPANDED) { } else if (entry->style == EXTCOMMUNITY_LIST_EXPANDED) {
if (ecommunity_regexp_match(ecom, entry->reg)) if (ecommunity_regexp_match(ecom, entry->reg))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} }
} }
return 0; return false;
} }
/* Perform exact matching. In case of expanded community-list, do /* Perform exact matching. In case of expanded community-list, do
same thing as community_list_match(). */ same thing as community_list_match(). */
int community_list_exact_match(struct community *com, bool community_list_exact_match(struct community *com,
struct community_list *list) struct community_list *list)
{ {
struct community_entry *entry; struct community_entry *entry;
for (entry = list->head; entry; entry = entry->next) { for (entry = list->head; entry; entry = entry->next) {
if (entry->any) if (entry->any)
return entry->direct == COMMUNITY_PERMIT ? 1 : 0; return entry->direct == COMMUNITY_PERMIT;
if (entry->style == COMMUNITY_LIST_STANDARD) { if (entry->style == COMMUNITY_LIST_STANDARD) {
if (community_include(entry->u.com, COMMUNITY_INTERNET)) if (community_include(entry->u.com, COMMUNITY_INTERNET))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
if (community_cmp(com, entry->u.com)) if (community_cmp(com, entry->u.com))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} else if (entry->style == COMMUNITY_LIST_EXPANDED) { } else if (entry->style == COMMUNITY_LIST_EXPANDED) {
if (community_regexp_match(com, entry->reg)) if (community_regexp_match(com, entry->reg))
return entry->direct == COMMUNITY_PERMIT ? 1 return entry->direct == COMMUNITY_PERMIT;
: 0;
} }
} }
return 0; return false;
} }
/* Delete all permitted communities in the list from com. */ /* Delete all permitted communities in the list from com. */
@ -900,8 +884,8 @@ struct community *community_list_match_delete(struct community *com,
/* To avoid duplicated entry in the community-list, this function /* To avoid duplicated entry in the community-list, this function
compares specified entry to existing entry. */ compares specified entry to existing entry. */
static int community_list_dup_check(struct community_list *list, static bool community_list_dup_check(struct community_list *list,
struct community_entry *new) struct community_entry *new)
{ {
struct community_entry *entry; struct community_entry *entry;
@ -916,32 +900,32 @@ static int community_list_dup_check(struct community_list *list,
continue; continue;
if (entry->any) if (entry->any)
return 1; return true;
switch (entry->style) { switch (entry->style) {
case COMMUNITY_LIST_STANDARD: case COMMUNITY_LIST_STANDARD:
if (community_cmp(entry->u.com, new->u.com)) if (community_cmp(entry->u.com, new->u.com))
return 1; return true;
break; break;
case LARGE_COMMUNITY_LIST_STANDARD: case LARGE_COMMUNITY_LIST_STANDARD:
if (lcommunity_cmp(entry->u.lcom, new->u.lcom)) if (lcommunity_cmp(entry->u.lcom, new->u.lcom))
return 1; return true;
break; break;
case EXTCOMMUNITY_LIST_STANDARD: case EXTCOMMUNITY_LIST_STANDARD:
if (ecommunity_cmp(entry->u.ecom, new->u.ecom)) if (ecommunity_cmp(entry->u.ecom, new->u.ecom))
return 1; return true;
break; break;
case COMMUNITY_LIST_EXPANDED: case COMMUNITY_LIST_EXPANDED:
case EXTCOMMUNITY_LIST_EXPANDED: case EXTCOMMUNITY_LIST_EXPANDED:
case LARGE_COMMUNITY_LIST_EXPANDED: case LARGE_COMMUNITY_LIST_EXPANDED:
if (strcmp(entry->config, new->config) == 0) if (strcmp(entry->config, new->config) == 0)
return 1; return true;
break; break;
default: default:
break; break;
} }
} }
return 0; return false;
} }
/* Set community-list. */ /* Set community-list. */
@ -1104,7 +1088,7 @@ struct lcommunity *lcommunity_list_match_delete(struct lcommunity *lcom,
} }
/* Helper to check if every octet do not exceed UINT_MAX */ /* Helper to check if every octet do not exceed UINT_MAX */
static int lcommunity_list_valid(const char *community) static bool lcommunity_list_valid(const char *community)
{ {
int octets = 0; int octets = 0;
char **splits; char **splits;
@ -1114,10 +1098,10 @@ static int lcommunity_list_valid(const char *community)
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
if (strtoul(splits[i], NULL, 10) > UINT_MAX) if (strtoul(splits[i], NULL, 10) > UINT_MAX)
return 0; return false;
if (strlen(splits[i]) == 0) if (strlen(splits[i]) == 0)
return 0; return false;
octets++; octets++;
XFREE(MTYPE_TMP, splits[i]); XFREE(MTYPE_TMP, splits[i]);
@ -1125,9 +1109,9 @@ static int lcommunity_list_valid(const char *community)
XFREE(MTYPE_TMP, splits); XFREE(MTYPE_TMP, splits);
if (octets < 3) if (octets < 3)
return 0; return false;
return 1; return true;
} }
/* Set lcommunity-list. */ /* Set lcommunity-list. */

14
bgpd/bgp_clist.h
View file

@ -165,13 +165,13 @@ extern struct community_list *
community_list_lookup(struct community_list_handler *c, const char *name, community_list_lookup(struct community_list_handler *c, const char *name,
uint32_t name_hash, int master); uint32_t name_hash, int master);
extern int community_list_match(struct community *, struct community_list *); extern bool community_list_match(struct community *, struct community_list *);
extern int ecommunity_list_match(struct ecommunity *, struct community_list *); extern bool ecommunity_list_match(struct ecommunity *, struct community_list *);
extern int lcommunity_list_match(struct lcommunity *, struct community_list *); extern bool lcommunity_list_match(struct lcommunity *, struct community_list *);
extern int community_list_exact_match(struct community *, extern bool community_list_exact_match(struct community *,
struct community_list *); struct community_list *);
extern int lcommunity_list_exact_match(struct lcommunity *lcom, extern bool lcommunity_list_exact_match(struct lcommunity *lcom,
struct community_list *list); struct community_list *list);
extern struct community *community_list_match_delete(struct community *, extern struct community *community_list_match_delete(struct community *,
struct community_list *); struct community_list *);
extern struct lcommunity * extern struct lcommunity *