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

Merge pull request #11090 from ton31337/fix/plist_alist_duplicate

Browse Source 
lib: Ignore duplicate alist/plist entries in CLI
This commit is contained in:
Donald Sharp 2022-04-28 12:42:18 -04:00 committed by GitHub
commit 4c53ec41b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 121 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/filter_cli.c
View File

@ -151,7 +151,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
ada.ada_type = "ipv4"; ada.ada_type = "ipv4";
ada.ada_name = name; ada.ada_name = name;
ada.ada_action = action; ada.ada_action = action;
@ -168,10 +167,8 @@ DEFPY_YANG(
ada.ada_value[0] = ""; ada.ada_value[0] = "";
} }
/* Duplicated entry without sequence, just quit. */
if (acl_is_dup(vty->candidate_config->dnode, &ada)) if (acl_is_dup(vty->candidate_config->dnode, &ada))
return CMD_SUCCESS; return CMD_SUCCESS;
}
/* /*
* Create the access-list first, so we can generate sequence if * Create the access-list first, so we can generate sequence if
@ -280,7 +277,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
ada.ada_type = "ipv4"; ada.ada_type = "ipv4";
ada.ada_name = name; ada.ada_name = name;
ada.ada_action = action; ada.ada_action = action;
@ -318,10 +314,8 @@ DEFPY_YANG(
idx++; idx++;
} }
/* Duplicated entry without sequence, just quit. */
if (acl_is_dup(vty->candidate_config->dnode, &ada)) if (acl_is_dup(vty->candidate_config->dnode, &ada))
return CMD_SUCCESS; return CMD_SUCCESS;
}
/* /*
* Create the access-list first, so we can generate sequence if * Create the access-list first, so we can generate sequence if
@ -466,7 +460,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
ada.ada_type = "ipv4"; ada.ada_type = "ipv4";
ada.ada_name = name; ada.ada_name = name;
ada.ada_action = action; ada.ada_action = action;
@ -483,10 +476,8 @@ DEFPY_YANG(
ada.ada_value[0] = ""; ada.ada_value[0] = "";
} }
/* Duplicated entry without sequence, just quit. */
if (acl_is_dup(vty->candidate_config->dnode, &ada)) if (acl_is_dup(vty->candidate_config->dnode, &ada))
return CMD_SUCCESS; return CMD_SUCCESS;
}
/* /*
* Create the access-list first, so we can generate sequence if * Create the access-list first, so we can generate sequence if
@ -656,7 +647,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
ada.ada_type = "ipv6"; ada.ada_type = "ipv6";
ada.ada_name = name; ada.ada_name = name;
ada.ada_action = action; ada.ada_action = action;
@ -673,10 +663,8 @@ DEFPY_YANG(
ada.ada_value[0] = ""; ada.ada_value[0] = "";
} }
/* Duplicated entry without sequence, just quit. */
if (acl_is_dup(vty->candidate_config->dnode, &ada)) if (acl_is_dup(vty->candidate_config->dnode, &ada))
return CMD_SUCCESS; return CMD_SUCCESS;
}
/* /*
* Create the access-list first, so we can generate sequence if * Create the access-list first, so we can generate sequence if
@ -850,7 +838,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
ada.ada_type = "mac"; ada.ada_type = "mac";
ada.ada_name = name; ada.ada_name = name;
ada.ada_action = action; ada.ada_action = action;
@ -863,10 +850,8 @@ DEFPY_YANG(
ada.ada_value[0] = ""; ada.ada_value[0] = "";
} }
/* Duplicated entry without sequence, just quit. */
if (acl_is_dup(vty->candidate_config->dnode, &ada)) if (acl_is_dup(vty->candidate_config->dnode, &ada))
return CMD_SUCCESS; return CMD_SUCCESS;
}
/* /*
* Create the access-list first, so we can generate sequence if * Create the access-list first, so we can generate sequence if
@ -1272,7 +1257,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
pda.pda_type = "ipv4"; pda.pda_type = "ipv4";
pda.pda_name = name; pda.pda_name = name;
pda.pda_action = action; pda.pda_action = action;
@ -1284,10 +1268,8 @@ DEFPY_YANG(
pda.any = true; pda.any = true;
} }
/* Duplicated entry without sequence, just quit. */
if (plist_is_dup(vty->candidate_config->dnode, &pda)) if (plist_is_dup(vty->candidate_config->dnode, &pda))
return CMD_SUCCESS; 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
@ -1476,7 +1458,6 @@ DEFPY_YANG(
* Backward compatibility: don't complain about duplicated values, * Backward compatibility: don't complain about duplicated values,
* just silently accept. * just silently accept.
*/ */
if (seq_str == NULL) {
pda.pda_type = "ipv6"; pda.pda_type = "ipv6";
pda.pda_name = name; pda.pda_name = name;
pda.pda_action = action; pda.pda_action = action;
@ -1488,10 +1469,8 @@ DEFPY_YANG(
pda.any = true; pda.any = true;
} }
/* Duplicated entry without sequence, just quit. */
if (plist_is_dup(vty->candidate_config->dnode, &pda)) if (plist_is_dup(vty->candidate_config->dnode, &pda))
return CMD_SUCCESS; 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