summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cumulus/start-stop-daemon.c2
-rw-r--r--debian/changelog2
-rw-r--r--ospf6d/ospf6_asbr.c112
-rw-r--r--pimd/pimd.c3
-rw-r--r--zebra/zserv.c7
5 files changed, 7 insertions, 119 deletions
diff --git a/cumulus/start-stop-daemon.c b/cumulus/start-stop-daemon.c
index a195e9e2fc..c123f87e92 100644
--- a/cumulus/start-stop-daemon.c
+++ b/cumulus/start-stop-daemon.c
@@ -51,7 +51,7 @@
#include <grp.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#include <sys/termios.h>
+#include <termios.h>
#include <fcntl.h>
#include <limits.h>
#include <assert.h>
diff --git a/debian/changelog b/debian/changelog
index ef019b4d23..88cb8df28a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-frr (2.0) Released; urgency=medium
+frr (2.1) Released; urgency=medium
* Switchover to FRR
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 88cc07e1af..643519e3fa 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1095,77 +1095,6 @@ route_map_command_status (struct vty *vty, int ret)
return CMD_WARNING;
}
-/* add "match address" */
-DEFUN (ospf6_routemap_match_address_prefixlist,
- ospf6_routemap_match_address_prefixlist_cmd,
- "match ipv6 address prefix-list WORD",
- "Match values\n"
- IPV6_STR
- "Match address of route\n"
- "Match entries of prefix-lists\n"
- "IPv6 prefix-list name\n")
-{
- VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
- int idx_word = 4;
- int ret = route_map_add_match (route_map_index,
- "ipv6 address prefix-list", argv[idx_word]->arg);
- return route_map_command_status (vty, ret);
-}
-
-/* delete "match address" */
-DEFUN (ospf6_routemap_no_match_address_prefixlist,
- ospf6_routemap_no_match_address_prefixlist_cmd,
- "no match ipv6 address prefix-list WORD",
- NO_STR
- "Match values\n"
- IPV6_STR
- "Match address of route\n"
- "Match entries of prefix-lists\n"
- "IPv6 prefix-list name\n")
-{
- VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
- int idx_word = 5;
- int ret = route_map_delete_match (route_map_index,
- "ipv6 address prefix-list", argv[idx_word]->arg);
- return route_map_command_status (vty, ret);
-}
-
-/* "match interface" */
-DEFUN (ospf6_routemap_match_interface,
- ospf6_routemap_match_interface_cmd,
- "match interface WORD",
- MATCH_STR
- "Match first hop interface of route\n"
- "Interface name\n")
-{
- VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
- int idx_word = 2;
- return route_map_add_match (route_map_index,
- "interface", argv[idx_word]->arg);
-}
-
-/* "no match interface WORD" */
-DEFUN (ospf6_routemap_no_match_interface,
- ospf6_routemap_no_match_interface_cmd,
- "no match interface [WORD]",
- NO_STR
- MATCH_STR
- "Match first hop interface of route\n"
- "Interface name\n")
-{
- VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
- int idx_word = 3;
- int ret;
-
- if (argc == 4)
- ret = route_map_delete_match (route_map_index,
- "interface", argv[idx_word]->arg);
- else
- ret = route_map_delete_match (route_map_index,
- "interface", NULL);
- return route_map_command_status (vty, ret);
-}
-
/* add "set metric-type" */
DEFUN (ospf6_routemap_set_metric_type,
ospf6_routemap_set_metric_type_cmd,
@@ -1230,35 +1159,6 @@ DEFUN (ospf6_routemap_no_set_forwarding,
return route_map_command_status (vty, ret);
}
-/* add "set tag" */
-DEFUN (ospf6_routemap_set_tag,
- ospf6_routemap_set_tag_cmd,
- "set tag (1-4294967295)",
- "Set value\n"
- "Tag value for routing protocol\n"
- "Tag value\n")
-{
- VTY_DECLVAR_CONTEXT(route_map_index, route_map_index);
- int ret = route_map_add_set (route_map_index,
- "tag", argv[2]->arg);
- return route_map_command_status (vty, ret);
-}
-
-/* delete "set tag" */
-DEFUN (ospf6_routemap_no_set_tag,
- ospf6_routemap_no_set_tag_cmd,
- "no set tag [(1-4294967295)]",
- NO_STR
- "Set value\n"
- "Tag value for routing protocol\n"
- "Tag value\n")
-{
- char *tag = (argc == 4) ? argv[3]->arg : NULL;
- VTY_DECLVAR_CONTEXT (route_map_index, index);
- int ret = route_map_delete_set (index, "tag", tag);
- return route_map_command_status (vty, ret);
-}
-
static void
ospf6_routemap_init (void)
{
@@ -1279,14 +1179,6 @@ ospf6_routemap_init (void)
route_map_install_set (&ospf6_routemap_rule_set_forwarding_cmd);
route_map_install_set (&ospf6_routemap_rule_set_tag_cmd);
- /* Match address prefix-list */
- install_element (RMAP_NODE, &ospf6_routemap_match_address_prefixlist_cmd);
- install_element (RMAP_NODE, &ospf6_routemap_no_match_address_prefixlist_cmd);
-
- /* Match interface */
- install_element (RMAP_NODE, &ospf6_routemap_match_interface_cmd);
- install_element (RMAP_NODE, &ospf6_routemap_no_match_interface_cmd);
-
/* ASE Metric Type (e.g. Type-1/Type-2) */
install_element (RMAP_NODE, &ospf6_routemap_set_metric_type_cmd);
install_element (RMAP_NODE, &ospf6_routemap_no_set_metric_type_cmd);
@@ -1294,10 +1186,6 @@ ospf6_routemap_init (void)
/* ASE Metric */
install_element (RMAP_NODE, &ospf6_routemap_set_forwarding_cmd);
install_element (RMAP_NODE, &ospf6_routemap_no_set_forwarding_cmd);
-
- /* Tag */
- install_element (RMAP_NODE, &ospf6_routemap_set_tag_cmd);
- install_element (RMAP_NODE, &ospf6_routemap_no_set_tag_cmd);
}
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 1627c4048d..e8960916a9 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -87,10 +87,9 @@ static void pim_free()
if (qpim_static_route_list)
list_free(qpim_static_route_list);
- pim_route_map_terminate();
-
pim_if_terminate ();
pim_rp_free ();
+
pim_route_map_terminate();
}
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 6f72ad1758..d8495dec09 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2472,7 +2472,7 @@ DEFUN (show_zebra_client,
"show zebra client",
SHOW_STR
"Zebra information\n"
- "Client information")
+ "Client information\n")
{
struct listnode *node;
struct zserv *client;
@@ -2488,8 +2488,9 @@ DEFUN (show_zebra_client_summary,
show_zebra_client_summary_cmd,
"show zebra client summary",
SHOW_STR
- "Zebra information brief"
- "Client information brief")
+ "Zebra information brief\n"
+ "Client information brief\n"
+ "Brief Summary\n")
{
struct listnode *node;
struct zserv *client;
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-07 23:03:08 +0000