proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16070 from Pdoijode/pdoijode/lcomm-not-found-fix

Browse Source 
bgpd: Return success if lcomm/comm/extcomm name or entry is not found
This commit is contained in:
Donatas Abraitis 2024-05-26 17:51:29 +03:00 committed by GitHub
commit ebdbb0e3fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bgpd/bgp_clist.c
View File

@ -904,9 +904,9 @@ int community_list_set(struct community_list_handler *ch, const char *name,
} }
/* Unset community-list */ /* Unset community-list */
int community_list_unset(struct community_list_handler *ch, const char *name, void community_list_unset(struct community_list_handler *ch, const char *name,
const char *str, const char *seq, int direct, const char *str, const char *seq, int direct,
int style) int style)
{ {
struct community_list_master *cm = NULL; struct community_list_master *cm = NULL;
struct community_entry *entry = NULL; struct community_entry *entry = NULL;
@ -916,14 +916,14 @@ int community_list_unset(struct community_list_handler *ch, const char *name,
/* Lookup community list. */ /* Lookup community list. */
list = community_list_lookup(ch, name, 0, COMMUNITY_LIST_MASTER); list = community_list_lookup(ch, name, 0, COMMUNITY_LIST_MASTER);
if (list == NULL) if (list == NULL)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
cm = community_list_master_lookup(ch, COMMUNITY_LIST_MASTER); cm = community_list_master_lookup(ch, COMMUNITY_LIST_MASTER);
/* Delete all of entry belongs to this community-list. */ /* Delete all of entry belongs to this community-list. */
if (!str) { if (!str) {
community_list_delete(cm, list); community_list_delete(cm, list);
route_map_notify_dependencies(name, RMAP_EVENT_CLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_CLIST_DELETED);
return 0; return;
} }
if (style == COMMUNITY_LIST_STANDARD) if (style == COMMUNITY_LIST_STANDARD)
@ -936,12 +936,10 @@ int community_list_unset(struct community_list_handler *ch, const char *name,
entry = community_list_entry_lookup(list, str, direct); entry = community_list_entry_lookup(list, str, direct);
if (!entry) if (!entry)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
community_list_entry_delete(cm, list, entry); community_list_entry_delete(cm, list, entry);
route_map_notify_dependencies(name, RMAP_EVENT_CLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_CLIST_DELETED);
return 0;
} }
bool lcommunity_list_any_match(struct lcommunity *lcom, bool lcommunity_list_any_match(struct lcommunity *lcom,
@ -1172,9 +1170,9 @@ int lcommunity_list_set(struct community_list_handler *ch, const char *name,
/* Unset community-list. When str is NULL, delete all of /* Unset community-list. When str is NULL, delete all of
community-list entry belongs to the specified name. */ community-list entry belongs to the specified name. */
int lcommunity_list_unset(struct community_list_handler *ch, const char *name, void lcommunity_list_unset(struct community_list_handler *ch, const char *name,
const char *str, const char *seq, int direct, const char *str, const char *seq, int direct,
int style) int style)
{ {
struct community_list_master *cm = NULL; struct community_list_master *cm = NULL;
struct community_entry *entry = NULL; struct community_entry *entry = NULL;
@ -1185,14 +1183,14 @@ int lcommunity_list_unset(struct community_list_handler *ch, const char *name,
/* Lookup community list. */ /* Lookup community list. */
list = community_list_lookup(ch, name, 0, LARGE_COMMUNITY_LIST_MASTER); list = community_list_lookup(ch, name, 0, LARGE_COMMUNITY_LIST_MASTER);
if (list == NULL) if (list == NULL)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
cm = community_list_master_lookup(ch, LARGE_COMMUNITY_LIST_MASTER); cm = community_list_master_lookup(ch, LARGE_COMMUNITY_LIST_MASTER);
/* Delete all of entry belongs to this community-list. */ /* Delete all of entry belongs to this community-list. */
if (!str) { if (!str) {
community_list_delete(cm, list); community_list_delete(cm, list);
route_map_notify_dependencies(name, RMAP_EVENT_LLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_LLIST_DELETED);
return 0; return;
} }
if (style == LARGE_COMMUNITY_LIST_STANDARD) if (style == LARGE_COMMUNITY_LIST_STANDARD)
@ -1201,7 +1199,7 @@ int lcommunity_list_unset(struct community_list_handler *ch, const char *name,
regex = bgp_regcomp(str); regex = bgp_regcomp(str);
if (!lcom && !regex) if (!lcom && !regex)
return COMMUNITY_LIST_ERR_MALFORMED_VAL; return;
if (lcom) if (lcom)
entry = community_list_entry_lookup(list, lcom, direct); entry = community_list_entry_lookup(list, lcom, direct);
@ -1214,12 +1212,10 @@ int lcommunity_list_unset(struct community_list_handler *ch, const char *name,
bgp_regex_free(regex); bgp_regex_free(regex);
if (!entry) if (!entry)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
community_list_entry_delete(cm, list, entry); community_list_entry_delete(cm, list, entry);
route_map_notify_dependencies(name, RMAP_EVENT_LLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_LLIST_DELETED);
return 0;
} }
/* Set extcommunity-list. */ /* Set extcommunity-list. */
@ -1299,9 +1295,9 @@ int extcommunity_list_set(struct community_list_handler *ch, const char *name,
* When str is NULL, delete all extcommunity-list entries belonging to the * When str is NULL, delete all extcommunity-list entries belonging to the
* specified name. * specified name.
*/ */
int extcommunity_list_unset(struct community_list_handler *ch, const char *name, void extcommunity_list_unset(struct community_list_handler *ch,
const char *str, const char *seq, int direct, const char *name, const char *str, const char *seq,
int style) int direct, int style)
{ {
struct community_list_master *cm = NULL; struct community_list_master *cm = NULL;
struct community_entry *entry = NULL; struct community_entry *entry = NULL;
@ -1311,14 +1307,14 @@ int extcommunity_list_unset(struct community_list_handler *ch, const char *name,
/* Lookup extcommunity list. */ /* Lookup extcommunity list. */
list = community_list_lookup(ch, name, 0, EXTCOMMUNITY_LIST_MASTER); list = community_list_lookup(ch, name, 0, EXTCOMMUNITY_LIST_MASTER);
if (list == NULL) if (list == NULL)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
cm = community_list_master_lookup(ch, EXTCOMMUNITY_LIST_MASTER); cm = community_list_master_lookup(ch, EXTCOMMUNITY_LIST_MASTER);
/* Delete all of entry belongs to this extcommunity-list. */ /* Delete all of entry belongs to this extcommunity-list. */
if (!str) { if (!str) {
community_list_delete(cm, list); community_list_delete(cm, list);
route_map_notify_dependencies(name, RMAP_EVENT_ECLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_ECLIST_DELETED);
return 0; return;
} }
if (style == EXTCOMMUNITY_LIST_STANDARD) if (style == EXTCOMMUNITY_LIST_STANDARD)
@ -1331,12 +1327,10 @@ int extcommunity_list_unset(struct community_list_handler *ch, const char *name,
entry = community_list_entry_lookup(list, str, direct); entry = community_list_entry_lookup(list, str, direct);
if (!entry) if (!entry)
return COMMUNITY_LIST_ERR_CANT_FIND_LIST; return;
community_list_entry_delete(cm, list, entry); community_list_entry_delete(cm, list, entry);
route_map_notify_dependencies(name, RMAP_EVENT_ECLIST_DELETED); route_map_notify_dependencies(name, RMAP_EVENT_ECLIST_DELETED);
return 0;
} }
/* Initializa community-list. Return community-list handler. */ /* Initializa community-list. Return community-list handler. */

26
bgpd/bgp_clist.h
View File

@ -109,11 +109,9 @@ struct community_list_handler {
}; };
/* Error code of community-list. */ /* Error code of community-list. */
#define COMMUNITY_LIST_ERR_CANT_FIND_LIST -1 #define COMMUNITY_LIST_ERR_MALFORMED_VAL -1
#define COMMUNITY_LIST_ERR_MALFORMED_VAL -2 #define COMMUNITY_LIST_ERR_STANDARD_CONFLICT -2
#define COMMUNITY_LIST_ERR_STANDARD_CONFLICT -3 #define COMMUNITY_LIST_ERR_EXPANDED_CONFLICT -3
#define COMMUNITY_LIST_ERR_EXPANDED_CONFLICT -4
/* Handler. */ /* Handler. */
extern struct community_list_handler *bgp_clist; extern struct community_list_handler *bgp_clist;
@ -124,22 +122,22 @@ extern void community_list_terminate(struct community_list_handler *ch);
extern int community_list_set(struct community_list_handler *ch, extern int community_list_set(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern int community_list_unset(struct community_list_handler *ch, extern void community_list_unset(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern int extcommunity_list_set(struct community_list_handler *ch, extern int extcommunity_list_set(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern int extcommunity_list_unset(struct community_list_handler *ch, extern void extcommunity_list_unset(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern int lcommunity_list_set(struct community_list_handler *ch, extern int lcommunity_list_set(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern bool lcommunity_list_valid(const char *community, int style); extern bool lcommunity_list_valid(const char *community, int style);
extern int lcommunity_list_unset(struct community_list_handler *ch, extern void lcommunity_list_unset(struct community_list_handler *ch,
const char *name, const char *str, const char *name, const char *str,
const char *seq, int direct, int style); const char *seq, int direct, int style);
extern struct community_list_master * extern struct community_list_master *
community_list_master_lookup(struct community_list_handler *ch, int master); community_list_master_lookup(struct community_list_handler *ch, int master);

49
bgpd/bgp_vty.c
View File

@ -21715,9 +21715,6 @@ static const char *community_direct_str(int direct)
static void community_list_perror(struct vty *vty, int ret) static void community_list_perror(struct vty *vty, int ret)
{ {
switch (ret) { switch (ret) {
case COMMUNITY_LIST_ERR_CANT_FIND_LIST:
vty_out(vty, "%% Can't find community-list\n");
break;
case COMMUNITY_LIST_ERR_MALFORMED_VAL: case COMMUNITY_LIST_ERR_MALFORMED_VAL:
vty_out(vty, "%% Malformed community-list value\n"); vty_out(vty, "%% Malformed community-list value\n");
break; break;
@ -21827,16 +21824,11 @@ DEFUN (no_community_list_standard_all,
argv_find(argv, argc, "COMMUNITY_LIST_NAME", &idx); argv_find(argv, argc, "COMMUNITY_LIST_NAME", &idx);
cl_name_or_number = argv[idx]->arg; cl_name_or_number = argv[idx]->arg;
int ret = community_list_unset(bgp_clist, cl_name_or_number, str, seq, community_list_unset(bgp_clist, cl_name_or_number, str, seq, direct,
direct, style); style);
XFREE(MTYPE_TMP, str); XFREE(MTYPE_TMP, str);
if (ret < 0) {
community_list_perror(vty, ret);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -21940,16 +21932,11 @@ DEFUN (no_community_list_expanded_all,
argv_find(argv, argc, "COMMUNITY_LIST_NAME", &idx); argv_find(argv, argc, "COMMUNITY_LIST_NAME", &idx);
cl_name_or_number = argv[idx]->arg; cl_name_or_number = argv[idx]->arg;
int ret = community_list_unset(bgp_clist, cl_name_or_number, str, seq, community_list_unset(bgp_clist, cl_name_or_number, str, seq, direct,
direct, style); style);
XFREE(MTYPE_TMP, str); XFREE(MTYPE_TMP, str);
if (ret < 0) {
community_list_perror(vty, ret);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -22105,7 +22092,6 @@ static int lcommunity_list_set_vty(struct vty *vty, int argc,
static int lcommunity_list_unset_vty(struct vty *vty, int argc, static int lcommunity_list_unset_vty(struct vty *vty, int argc,
struct cmd_token **argv, int style) struct cmd_token **argv, int style)
{ {
int ret;
int direct = 0; int direct = 0;
char *str = NULL; char *str = NULL;
int idx = 0; int idx = 0;
@ -22138,18 +22124,13 @@ static int lcommunity_list_unset_vty(struct vty *vty, int argc,
argv_find(argv, argc, "LCOMMUNITY_LIST_NAME", &idx); argv_find(argv, argc, "LCOMMUNITY_LIST_NAME", &idx);
/* Unset community list. */ /* Unset community list. */
ret = lcommunity_list_unset(bgp_clist, argv[idx]->arg, str, seq, direct, lcommunity_list_unset(bgp_clist, argv[idx]->arg, str, seq, direct,
style); style);
/* Free temporary community list string allocated by /* Free temporary community list string allocated by
argv_concat(). */ argv_concat(). */
XFREE(MTYPE_TMP, str); XFREE(MTYPE_TMP, str);
if (ret < 0) {
community_list_perror(vty, ret);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -22546,16 +22527,11 @@ DEFUN (no_extcommunity_list_standard_all,
argv_find(argv, argc, "EXTCOMMUNITY_LIST_NAME", &idx); argv_find(argv, argc, "EXTCOMMUNITY_LIST_NAME", &idx);
cl_number_or_name = argv[idx]->arg; cl_number_or_name = argv[idx]->arg;
int ret = extcommunity_list_unset(bgp_clist, cl_number_or_name, str, extcommunity_list_unset(bgp_clist, cl_number_or_name, str, seq, direct,
seq, direct, style); style);
XFREE(MTYPE_TMP, str); XFREE(MTYPE_TMP, str);
if (ret < 0) {
community_list_perror(vty, ret);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -22611,16 +22587,11 @@ DEFUN (no_extcommunity_list_expanded_all,
argv_find(argv, argc, "EXTCOMMUNITY_LIST_NAME", &idx); argv_find(argv, argc, "EXTCOMMUNITY_LIST_NAME", &idx);
cl_number_or_name = argv[idx]->arg; cl_number_or_name = argv[idx]->arg;
int ret = extcommunity_list_unset(bgp_clist, cl_number_or_name, str, extcommunity_list_unset(bgp_clist, cl_number_or_name, str, seq, direct,
seq, direct, style); style);
XFREE(MTYPE_TMP, str); XFREE(MTYPE_TMP, str);
if (ret < 0) {
community_list_perror(vty, ret);
return CMD_WARNING_CONFIG_FAILED;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }