Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / bgpd / bgp_clist.c

diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index 1d2ba3bf5845eff39742cd91bff8670c8b5545d9..f3c308afb9e3e0f7a66ce9c6ad7c96a46a7f26d0 100644 (file)
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -659,9 +659,6 @@ bool community_list_match(struct community *com, struct community_list *list)
        struct community_entry *entry;
 
        for (entry = list->head; entry; entry = entry->next) {
-               if (entry->any)
-                       return entry->direct == COMMUNITY_PERMIT;
-
                if (entry->style == COMMUNITY_LIST_STANDARD) {
                        if (community_include(entry->u.com, COMMUNITY_INTERNET))
                                return entry->direct == COMMUNITY_PERMIT;
@@ -681,9 +678,6 @@ bool lcommunity_list_match(struct lcommunity *lcom, struct community_list *list)
        struct community_entry *entry;
 
        for (entry = list->head; entry; entry = entry->next) {
-               if (entry->any)
-                       return entry->direct == COMMUNITY_PERMIT;
-
                if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) {
                        if (lcommunity_match(lcom, entry->u.lcom))
                                return entry->direct == COMMUNITY_PERMIT;
@@ -705,9 +699,6 @@ bool lcommunity_list_exact_match(struct lcommunity *lcom,
        struct community_entry *entry;
 
        for (entry = list->head; entry; entry = entry->next) {
-               if (entry->any)
-                       return entry->direct == COMMUNITY_PERMIT;
-
                if (entry->style == LARGE_COMMUNITY_LIST_STANDARD) {
                        if (lcommunity_cmp(lcom, entry->u.lcom))
                                return entry->direct == COMMUNITY_PERMIT;
@@ -724,9 +715,6 @@ bool ecommunity_list_match(struct ecommunity *ecom, struct community_list *list)
        struct community_entry *entry;
 
        for (entry = list->head; entry; entry = entry->next) {
-               if (entry->any)
-                       return entry->direct == COMMUNITY_PERMIT;
-
                if (entry->style == EXTCOMMUNITY_LIST_STANDARD) {
                        if (ecommunity_match(ecom, entry->u.ecom))
                                return entry->direct == COMMUNITY_PERMIT;
@@ -746,9 +734,6 @@ bool community_list_exact_match(struct community *com,
        struct community_entry *entry;
 
        for (entry = list->head; entry; entry = entry->next) {
-               if (entry->any)
-                       return entry->direct == COMMUNITY_PERMIT;
-
                if (entry->style == COMMUNITY_LIST_STANDARD) {
                        if (community_include(entry->u.com, COMMUNITY_INTERNET))
                                return entry->direct == COMMUNITY_PERMIT;
@@ -781,28 +766,18 @@ struct community *community_list_match_delete(struct community *com,
                val = community_val_get(com, i);
 
                for (entry = list->head; entry; entry = entry->next) {
-                       if (entry->any) {
+                       if ((entry->style == COMMUNITY_LIST_STANDARD) &&
+                           (community_include(entry->u.com,
+                                              COMMUNITY_INTERNET) ||
+                            community_include(entry->u.com, val))) {
                                if (entry->direct == COMMUNITY_PERMIT) {
                                        com_index_to_delete[delete_index] = i;
                                        delete_index++;
                                }
                                break;
-                       }
-
-                       else if ((entry->style == COMMUNITY_LIST_STANDARD)
-                                && (community_include(entry->u.com,
-                                                      COMMUNITY_INTERNET)
-                                    || community_include(entry->u.com, val))) {
-                               if (entry->direct == COMMUNITY_PERMIT) {
-                                       com_index_to_delete[delete_index] = i;
-                                       delete_index++;
-                               }
-                               break;
-                       }
-
-                       else if ((entry->style == COMMUNITY_LIST_EXPANDED)
-                                && community_regexp_include(entry->reg, com,
-                                                            i)) {
+                       } else if ((entry->style == COMMUNITY_LIST_EXPANDED) &&
+                                  community_regexp_include(entry->reg, com,
+                                                           i)) {
                                if (entry->direct == COMMUNITY_PERMIT) {
                                        com_index_to_delete[delete_index] = i;
                                        delete_index++;
@@ -836,12 +811,6 @@ static bool community_list_dup_check(struct community_list *list,
                if (entry->direct != new->direct)
                        continue;
 
-               if (entry->any != new->any)
-                       continue;
-
-               if (entry->any)
-                       return true;
-
                switch (entry->style) {
                case COMMUNITY_LIST_STANDARD:
                        if (community_cmp(entry->u.com, new->u.com))
@@ -899,20 +868,17 @@ int community_list_set(struct community_list_handler *ch, const char *name,
                }
        }
 
-       if (str) {
-               if (style == COMMUNITY_LIST_STANDARD)
-                       com = community_str2com(str);
-               else
-                       regex = bgp_regcomp(str);
+       if (style == COMMUNITY_LIST_STANDARD)
+               com = community_str2com(str);
+       else
+               regex = bgp_regcomp(str);
 
-               if (!com && !regex)
-                       return COMMUNITY_LIST_ERR_MALFORMED_VAL;
-       }
+       if (!com && !regex)
+               return COMMUNITY_LIST_ERR_MALFORMED_VAL;
 
        entry = community_entry_new();
        entry->direct = direct;
        entry->style = style;
-       entry->any = (str ? false : true);
        entry->u.com = com;
        entry->reg = regex;
        entry->seq = seqnum;
@@ -989,16 +955,8 @@ struct lcommunity *lcommunity_list_match_delete(struct lcommunity *lcom,
        for (i = 0; i < lcom->size; i++) {
                ptr = lcom->val + (i * LCOMMUNITY_SIZE);
                for (entry = list->head; entry; entry = entry->next) {
-                       if (entry->any) {
-                               if (entry->direct == COMMUNITY_PERMIT) {
-                                       com_index_to_delete[delete_index] = i;
-                                       delete_index++;
-                               }
-                               break;
-                       }
-
-                       else if ((entry->style == LARGE_COMMUNITY_LIST_STANDARD)
-                                && lcommunity_include(entry->u.lcom, ptr)) {
+                       if ((entry->style == LARGE_COMMUNITY_LIST_STANDARD) &&
+                           lcommunity_include(entry->u.lcom, ptr)) {
                                if (entry->direct == COMMUNITY_PERMIT) {
                                        com_index_to_delete[delete_index] = i;
                                        delete_index++;
@@ -1006,9 +964,10 @@ struct lcommunity *lcommunity_list_match_delete(struct lcommunity *lcom,
                                break;
                        }
 
-                       else if ((entry->style == LARGE_COMMUNITY_LIST_EXPANDED)
-                                && lcommunity_regexp_include(entry->reg, lcom,
-                                                             i)) {
+                       else if ((entry->style ==
+                                 LARGE_COMMUNITY_LIST_EXPANDED) &&
+                                lcommunity_regexp_include(entry->reg, lcom,
+                                                          i)) {
                                if (entry->direct == COMMUNITY_PERMIT) {
                                        com_index_to_delete[delete_index] = i;
                                        delete_index++;
@@ -1127,7 +1086,6 @@ int lcommunity_list_set(struct community_list_handler *ch, const char *name,
        entry = community_entry_new();
        entry->direct = direct;
        entry->style = style;
-       entry->any = (str ? false : true);
        entry->u.lcom = lcom;
        entry->reg = regex;
        entry->seq = seqnum;
@@ -1248,7 +1206,6 @@ int extcommunity_list_set(struct community_list_handler *ch, const char *name,
        entry = community_entry_new();
        entry->direct = direct;
        entry->style = style;
-       entry->any = false;
        if (ecom)
                entry->config = ecommunity_ecom2str(
                        ecom, ECOMMUNITY_FORMAT_COMMUNITY_LIST, 0);