proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: silently ignore duplicated values

Browse Source 
Keep the previous CLI behavior of silently ignoring access lists which
contain the same value.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2020-12-07 12:10:42 -03:00
parent 54d153f786
commit 866f48f2df
1 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/filter_cli.c
View File

@ -1319,9 +1319,44 @@ DEFPY_YANG(
"Maximum prefix length\n") "Maximum prefix length\n")
{ {
int64_t sseq; int64_t sseq;
int arg_idx = 0;
struct plist_dup_args pda = {};
char xpath[XPATH_MAXLEN]; char xpath[XPATH_MAXLEN];
char xpath_entry[XPATH_MAXLEN + 128]; char xpath_entry[XPATH_MAXLEN + 128];
/*
* Backward compatibility: don't complain about duplicated values,
* just silently accept.
*/
if (seq_str == NULL) {
pda.pda_type = "ipv4";
pda.pda_name = name;
if (prefix_str) {
pda.pda_xpath[arg_idx] = "./ipv4-prefix";
pda.pda_value[arg_idx] = prefix_str;
arg_idx++;
if (ge_str) {
pda.pda_xpath[arg_idx] =
"./ipv4-prefix-length-greater-or-equal";
pda.pda_value[arg_idx] = ge_str;
arg_idx++;
}
if (le_str) {
pda.pda_xpath[arg_idx] =
"./ipv4-prefix-length-lesser-or-equal";
pda.pda_value[arg_idx] = le_str;
arg_idx++;
}
} else {
pda.pda_xpath[0] = "./any";
pda.pda_value[0] = "";
}
/* Duplicated entry without sequence, just quit. */
if (plist_is_dup(vty->candidate_config->dnode, &pda))
return CMD_SUCCESS;
}
/* /*
* Create the prefix-list first, so we can generate sequence if * Create the prefix-list first, so we can generate sequence if
* none given (backward compatibility). * none given (backward compatibility).
@ -1479,9 +1514,44 @@ DEFPY_YANG(
"Minimum prefix length\n") "Minimum prefix length\n")
{ {
int64_t sseq; int64_t sseq;
int arg_idx = 0;
struct plist_dup_args pda = {};
char xpath[XPATH_MAXLEN]; char xpath[XPATH_MAXLEN];
char xpath_entry[XPATH_MAXLEN + 128]; char xpath_entry[XPATH_MAXLEN + 128];
/*
* Backward compatibility: don't complain about duplicated values,
* just silently accept.
*/
if (seq_str == NULL) {
pda.pda_type = "ipv6";
pda.pda_name = name;
if (prefix_str) {
pda.pda_xpath[arg_idx] = "./ipv6-prefix";
pda.pda_value[arg_idx] = prefix_str;
arg_idx++;
if (ge_str) {
pda.pda_xpath[arg_idx] =
"./ipv6-prefix-length-greater-or-equal";
pda.pda_value[arg_idx] = ge_str;
arg_idx++;
}
if (le_str) {
pda.pda_xpath[arg_idx] =
"./ipv6-prefix-length-lesser-or-equal";
pda.pda_value[arg_idx] = le_str;
arg_idx++;
}
} else {
pda.pda_xpath[0] = "./any";
pda.pda_value[0] = "";
}
/* Duplicated entry without sequence, just quit. */
if (plist_is_dup(vty->candidate_config->dnode, &pda))
return CMD_SUCCESS;
}
/* /*
* Create the prefix-list first, so we can generate sequence if * Create the prefix-list first, so we can generate sequence if
* none given (backward compatibility). * none given (backward compatibility).