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

Merge pull request #8320 from idryzhov/prefix-list-seqnum

Browse Source 
lib: remove "ip prefix-list sequence-number" command
This commit is contained in:
Donald Sharp 2021-04-14 09:21:28 -04:00 committed by GitHub
commit 8a2ec9102f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/user/filter.rst
View File

@ -106,17 +106,6 @@ ip prefix-list description
description to the prefix list. description to the prefix list.
.. _ip-prefix-list-sequential-number-control:
ip prefix-list sequential number control
----------------------------------------
.. clicmd:: ip prefix-list sequence-number
With this command, the IP prefix list sequential number is displayed.
This is the default behavior.
.. _showing-ip-prefix-list: .. _showing-ip-prefix-list:
Showing ip prefix-list Showing ip prefix-list

44
lib/plist.c
View File

@ -72,9 +72,6 @@ struct prefix_master {
/* List of prefix_list which name is string. */ /* List of prefix_list which name is string. */
struct prefix_list_list str; struct prefix_list_list str;
/* Whether sequential number is used. */
bool seqnum;
/* The latest update. */ /* The latest update. */
struct prefix_list *recent; struct prefix_list *recent;
@ -90,22 +87,22 @@ struct prefix_master {
/* Static structure of IPv4 prefix_list's master. */ /* Static structure of IPv4 prefix_list's master. */
static struct prefix_master prefix_master_ipv4 = { static struct prefix_master prefix_master_ipv4 = {
{NULL, NULL}, {NULL, NULL}, 1, NULL, NULL, NULL, PLC_MAXLEVELV4, {NULL, NULL}, {NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV4,
}; };
/* Static structure of IPv6 prefix-list's master. */ /* Static structure of IPv6 prefix-list's master. */
static struct prefix_master prefix_master_ipv6 = { static struct prefix_master prefix_master_ipv6 = {
{NULL, NULL}, {NULL, NULL}, 1, NULL, NULL, NULL, PLC_MAXLEVELV6, {NULL, NULL}, {NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV6,
}; };
/* Static structure of BGP ORF prefix_list's master. */ /* Static structure of BGP ORF prefix_list's master. */
static struct prefix_master prefix_master_orf_v4 = { static struct prefix_master prefix_master_orf_v4 = {
{NULL, NULL}, {NULL, NULL}, 1, NULL, NULL, NULL, PLC_MAXLEVELV4, {NULL, NULL}, {NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV4,
}; };
/* Static structure of BGP ORF prefix_list's master. */ /* Static structure of BGP ORF prefix_list's master. */
static struct prefix_master prefix_master_orf_v6 = { static struct prefix_master prefix_master_orf_v6 = {
{NULL, NULL}, {NULL, NULL}, 1, NULL, NULL, NULL, PLC_MAXLEVELV6, {NULL, NULL}, {NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV6,
}; };
static struct prefix_master *prefix_master_get(afi_t afi, int orf) static struct prefix_master *prefix_master_get(afi_t afi, int orf)
@ -1003,8 +1000,7 @@ static void vty_show_prefix_entry(struct vty *vty, afi_t afi,
vty_out(vty, " "); vty_out(vty, " ");
if (master->seqnum) vty_out(vty, "seq %" PRId64 " ", pentry->seq);
vty_out(vty, "seq %" PRId64 " ", pentry->seq);
vty_out(vty, "%s ", prefix_list_type_str(pentry)); vty_out(vty, "%s ", prefix_list_type_str(pentry));
@ -1192,19 +1188,6 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
#include "lib/plist_clippy.c" #include "lib/plist_clippy.c"
#endif #endif
DEFPY (ip_prefix_list_sequence_number,
ip_prefix_list_sequence_number_cmd,
"[no] ip prefix-list sequence-number",
NO_STR
IP_STR
PREFIX_LIST_STR
"Include/exclude sequence numbers in NVGEN\n")
{
prefix_master_ipv4.seqnum = no ? false : true;
return CMD_SUCCESS;
}
DEFPY (show_ip_prefix_list, DEFPY (show_ip_prefix_list,
show_ip_prefix_list_cmd, show_ip_prefix_list_cmd,
"show ip prefix-list [WORD [seq$dseq (1-4294967295)$arg]]", "show ip prefix-list [WORD [seq$dseq (1-4294967295)$arg]]",
@ -1281,18 +1264,6 @@ DEFPY (clear_ip_prefix_list,
return vty_clear_prefix_list(vty, AFI_IP, prefix_list, prefix_str); return vty_clear_prefix_list(vty, AFI_IP, prefix_list, prefix_str);
} }
DEFPY (ipv6_prefix_list_sequence_number,
ipv6_prefix_list_sequence_number_cmd,
"[no] ipv6 prefix-list sequence-number",
NO_STR
IPV6_STR
PREFIX_LIST_STR
"Include/exclude sequence numbers in NVGEN\n")
{
prefix_master_ipv6.seqnum = no ? false : true;
return CMD_SUCCESS;
}
DEFPY (show_ipv6_prefix_list, DEFPY (show_ipv6_prefix_list,
show_ipv6_prefix_list_cmd, show_ipv6_prefix_list_cmd,
"show ipv6 prefix-list [WORD [seq$dseq (1-4294967295)$arg]]", "show ipv6 prefix-list [WORD [seq$dseq (1-4294967295)$arg]]",
@ -1553,7 +1524,6 @@ static void prefix_list_reset_afi(afi_t afi, int orf)
assert(master->str.head == NULL); assert(master->str.head == NULL);
assert(master->str.tail == NULL); assert(master->str.tail == NULL);
master->seqnum = true;
master->recent = NULL; master->recent = NULL;
} }
@ -1597,8 +1567,6 @@ static void prefix_list_init_ipv4(void)
{ {
install_node(&prefix_node); install_node(&prefix_node);
install_element(CONFIG_NODE, &ip_prefix_list_sequence_number_cmd);
install_element(VIEW_NODE, &show_ip_prefix_list_cmd); install_element(VIEW_NODE, &show_ip_prefix_list_cmd);
install_element(VIEW_NODE, &show_ip_prefix_list_prefix_cmd); install_element(VIEW_NODE, &show_ip_prefix_list_prefix_cmd);
install_element(VIEW_NODE, &show_ip_prefix_list_summary_cmd); install_element(VIEW_NODE, &show_ip_prefix_list_summary_cmd);
@ -1618,8 +1586,6 @@ static void prefix_list_init_ipv6(void)
{ {
install_node(&prefix_ipv6_node); install_node(&prefix_ipv6_node);
install_element(CONFIG_NODE, &ipv6_prefix_list_sequence_number_cmd);
install_element(VIEW_NODE, &show_ipv6_prefix_list_cmd); install_element(VIEW_NODE, &show_ipv6_prefix_list_cmd);
install_element(VIEW_NODE, &show_ipv6_prefix_list_prefix_cmd); install_element(VIEW_NODE, &show_ipv6_prefix_list_prefix_cmd);
install_element(VIEW_NODE, &show_ipv6_prefix_list_summary_cmd); install_element(VIEW_NODE, &show_ipv6_prefix_list_summary_cmd);