babeld is gone in commit 336724d628be, let's remove all related code.
Note that this patch fixes vtysh, which cannot start after this commit:
$ vtysh
Command node 17 doesn't exist, please check it
Fixes: 336724d628be ("babeld: Remove babeld from Quagga")
Signed-off-by: Nicolas Dichtel <nicolas.dich...@6wind.com>
---
lib/command.c | 2 --
lib/command.h | 1 -
lib/distribute.c | 5 +----
lib/log.c | 5 -----
lib/log.h | 1 -
lib/memory.c | 14 --------------
lib/memtypes.c | 7 -------
lib/route_types.txt | 2 --
lib/routemap.h | 1 -
lib/vty.c | 2 --
redhat/quagga.sysconfig | 1 -
ripd/rip_zebra.c | 1 -
ripngd/ripng_zebra.c | 1 -
tests/test-commands.c | 7 -------
tests/testcommands.refout | 48 +++++++++++++++++++++++------------------------
vtysh/vtysh.c | 3 ---
vtysh/vtysh.h | 9 ++++-----
zebra/client_main.c | 1 -
zebra/zebra_rib.c | 2 --
zebra/zebra_vty.c | 4 ----
20 files changed, 29 insertions(+), 88 deletions(-)
diff --git a/lib/command.c b/lib/command.c
index 8ae27de920fa..53cfe07a649b 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2883,7 +2883,6 @@ DEFUN (config_exit,
case BGP_NODE:
case RIP_NODE:
case RIPNG_NODE:
- case BABEL_NODE:
case OSPF_NODE:
case OSPF6_NODE:
case ISIS_NODE:
@@ -2934,7 +2933,6 @@ DEFUN (config_end,
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
- case BABEL_NODE:
case BGP_NODE:
case BGP_VPNV4_NODE:
case BGP_IPV4_NODE:
diff --git a/lib/command.h b/lib/command.h
index a36a524a048f..0d2c93b4d4a4 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -78,7 +78,6 @@ enum node_type
TABLE_NODE, /* rtm_table selection node. */
RIP_NODE, /* RIP protocol mode node. */
RIPNG_NODE, /* RIPng protocol mode node. */
- BABEL_NODE, /* Babel protocol mode node. */
BGP_NODE, /* BGP protocol mode which includes BGP4+ */
BGP_VPNV4_NODE, /* BGP MPLS-VPN PE exchange. */
BGP_IPV4_NODE, /* BGP IPv4 unicast address family. */
diff --git a/lib/distribute.c b/lib/distribute.c
index ba8043cf9e08..e660599c0e18 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -766,10 +766,7 @@ distribute_list_init (int node)
install_element (node, &no_distribute_list_prefix_all_cmd);
install_element (node, &distribute_list_prefix_cmd);
install_element (node, &no_distribute_list_prefix_cmd);
- } else if (node == RIPNG_NODE || node == BABEL_NODE) {
- /* WARNING: two identical commands installed do a crash, so be worry with
- aliases. For this reason, and because all these commands are aliases,
Babel
- is not set with RIP. */
+ } else if (node == RIPNG_NODE) {
install_element (node, &ipv6_distribute_list_all_cmd);
install_element (node, &no_ipv6_distribute_list_all_cmd);
install_element (node, &ipv6_distribute_list_cmd);
diff --git a/lib/log.c b/lib/log.c
index f02e4c7361e4..8dae8caf99bc 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -48,7 +48,6 @@ const char *zlog_proto_names[] =
"BGP",
"OSPF",
"RIPNG",
- "BABEL",
"OSPF6",
"ISIS",
"PIM",
@@ -977,8 +976,6 @@ proto_redistnum(int afi, const char *s)
return ZEBRA_ROUTE_ISIS;
else if (strncmp (s, "bg", 2) == 0)
return ZEBRA_ROUTE_BGP;
- else if (strncmp (s, "ba", 2) == 0)
- return ZEBRA_ROUTE_BABEL;
}
if (afi == AFI_IP6)
{
@@ -996,8 +993,6 @@ proto_redistnum(int afi, const char *s)
return ZEBRA_ROUTE_ISIS;
else if (strncmp (s, "bg", 2) == 0)
return ZEBRA_ROUTE_BGP;
- else if (strncmp (s, "ba", 2) == 0)
- return ZEBRA_ROUTE_BABEL;
}
return -1;
}
diff --git a/lib/log.h b/lib/log.h
index 77cd53bc2e77..e88282a4a4d2 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -50,7 +50,6 @@ typedef enum
ZLOG_BGP,
ZLOG_OSPF,
ZLOG_RIPNG,
- ZLOG_BABEL,
ZLOG_OSPF6,
ZLOG_ISIS,
ZLOG_PIM,
diff --git a/lib/memory.c b/lib/memory.c
index 84daeeef936b..35994b0d6414 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -466,17 +466,6 @@ DEFUN (show_memory_ripng,
return CMD_SUCCESS;
}
-DEFUN (show_memory_babel,
- show_memory_babel_cmd,
- "show memory babel",
- SHOW_STR
- "Memory statistics\n"
- "Babel memory\n")
-{
- show_memory_vty (vty, memory_list_babel);
- return CMD_SUCCESS;
-}
-
DEFUN (show_memory_bgp,
show_memory_bgp_cmd,
"show memory bgp",
@@ -540,7 +529,6 @@ memory_init (void)
install_element (RESTRICTED_NODE, &show_memory_lib_cmd);
install_element (RESTRICTED_NODE, &show_memory_rip_cmd);
install_element (RESTRICTED_NODE, &show_memory_ripng_cmd);
- install_element (RESTRICTED_NODE, &show_memory_babel_cmd);
install_element (RESTRICTED_NODE, &show_memory_bgp_cmd);
install_element (RESTRICTED_NODE, &show_memory_ospf_cmd);
install_element (RESTRICTED_NODE, &show_memory_ospf6_cmd);
@@ -551,7 +539,6 @@ memory_init (void)
install_element (VIEW_NODE, &show_memory_lib_cmd);
install_element (VIEW_NODE, &show_memory_rip_cmd);
install_element (VIEW_NODE, &show_memory_ripng_cmd);
- install_element (VIEW_NODE, &show_memory_babel_cmd);
install_element (VIEW_NODE, &show_memory_bgp_cmd);
install_element (VIEW_NODE, &show_memory_ospf_cmd);
install_element (VIEW_NODE, &show_memory_ospf6_cmd);
@@ -564,7 +551,6 @@ memory_init (void)
install_element (ENABLE_NODE, &show_memory_zebra_cmd);
install_element (ENABLE_NODE, &show_memory_rip_cmd);
install_element (ENABLE_NODE, &show_memory_ripng_cmd);
- install_element (ENABLE_NODE, &show_memory_babel_cmd);
install_element (ENABLE_NODE, &show_memory_bgp_cmd);
install_element (ENABLE_NODE, &show_memory_ospf_cmd);
install_element (ENABLE_NODE, &show_memory_ospf6_cmd);
diff --git a/lib/memtypes.c b/lib/memtypes.c
index 1a0c11fee342..b40b5138d701 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -177,13 +177,6 @@ struct memory_list memory_list_ripng[] =
{ -1, NULL }
};
-struct memory_list memory_list_babel[] =
-{
- { MTYPE_BABEL, "Babel structure" },
- { MTYPE_BABEL_IF, "Babel interface" },
- { -1, NULL }
-};
-
struct memory_list memory_list_ospf[] =
{
{ MTYPE_OSPF_TOP, "OSPF top" },
diff --git a/lib/route_types.txt b/lib/route_types.txt
index 1b85607936dd..fa394c9b8c6d 100644
--- a/lib/route_types.txt
+++ b/lib/route_types.txt
@@ -59,7 +59,6 @@ ZEBRA_ROUTE_PIM, pim, pimd, 'P', 1, 0, "PIM"
# possible).
ZEBRA_ROUTE_HSLS, hsls, hslsd, 'H', 0, 0, "HSLS"
ZEBRA_ROUTE_OLSR, olsr, olsrd, 'o', 0, 0, "OLSR"
-ZEBRA_ROUTE_BABEL, babel, babeld, 'A', 1, 1, "Babel"
## help strings
ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only"
@@ -75,4 +74,3 @@ ZEBRA_ROUTE_BGP, "Border Gateway Protocol (BGP)"
ZEBRA_ROUTE_PIM, "Protocol Independent Multicast (PIM)"
ZEBRA_ROUTE_HSLS, "Hazy-Sighted Link State Protocol (HSLS)"
ZEBRA_ROUTE_OLSR, "Optimised Link State Routing (OLSR)"
-ZEBRA_ROUTE_BABEL, "Babel routing protocol (Babel)"
diff --git a/lib/routemap.h b/lib/routemap.h
index ba64553f3cf8..1402f5c84bd2 100644
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -43,7 +43,6 @@ typedef enum
{
RMAP_RIP,
RMAP_RIPNG,
- RMAP_BABEL,
RMAP_OSPF,
RMAP_OSPF6,
RMAP_BGP,
diff --git a/lib/vty.c b/lib/vty.c
index d623b85331a7..e5f9fe8c45b0 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -699,7 +699,6 @@ vty_end_config (struct vty *vty)
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
- case BABEL_NODE:
case BGP_NODE:
case BGP_VPNV4_NODE:
case BGP_IPV4_NODE:
@@ -1109,7 +1108,6 @@ vty_stop_input (struct vty *vty)
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
- case BABEL_NODE:
case BGP_NODE:
case RMAP_NODE:
case OSPF_NODE:
diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig
index 4d6ec5ad1b09..1621154bb3d0 100644
--- a/redhat/quagga.sysconfig
+++ b/redhat/quagga.sysconfig
@@ -1,7 +1,6 @@
#
# Default: Bind all daemon vtys to the loopback(s) only
#
-BABELD_OPTS="-A 127.0.0.1"
BGPD_OPTS="-A 127.0.0.1"
ISISD_OPTS="-A ::1"
OSPF6D_OPTS="-A ::1"
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index b005ece96719..c2b08e420b23 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -240,7 +240,6 @@ static struct {
{ZEBRA_ROUTE_STATIC, 1, "static"},
{ZEBRA_ROUTE_OSPF, 1, "ospf"},
{ZEBRA_ROUTE_BGP, 2, "bgp"},
- {ZEBRA_ROUTE_BABEL, 2, "babel"},
{0, 0, NULL}
};
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index 68f37be324c4..1341863070ad 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -218,7 +218,6 @@ static struct {
{ZEBRA_ROUTE_STATIC, 1, "static"},
{ZEBRA_ROUTE_OSPF6, 1, "ospf6"},
{ZEBRA_ROUTE_BGP, 2, "bgp"},
- {ZEBRA_ROUTE_BABEL, 2, "babel"},
{0, 0, NULL}
};
diff --git a/tests/test-commands.c b/tests/test-commands.c
index 18b3b50d79f2..b4613a567d01 100644
--- a/tests/test-commands.c
+++ b/tests/test-commands.c
@@ -133,12 +133,6 @@ static struct cmd_node ospf6_node =
"%s(config-ospf6)# "
};
-static struct cmd_node babel_node =
-{
- BABEL_NODE,
- "%s(config-babel)# "
-};
-
static struct cmd_node keychain_node =
{
KEYCHAIN_NODE,
@@ -217,7 +211,6 @@ test_init(void)
install_node (&ospf_node, NULL);
install_node (&ripng_node, NULL);
install_node (&ospf6_node, NULL);
- install_node (&babel_node, NULL);
install_node (&keychain_node, NULL);
install_node (&keychain_key_node, NULL);
install_node (&isis_node, NULL);
diff --git a/tests/testcommands.refout b/tests/testcommands.refout
index 11483b84b6f0..dd9c88c9a4d9 100644
--- a/tests/testcommands.refout
+++ b/tests/testcommands.refout
@@ -299,14 +299,14 @@ complete 'no neighbor VARIABLE maximum-prefix'@22: rv==7
'maximum-prefix'
describe 'no neighbor VARIABLE maximum-prefix'@22: rv==0
'maximum-prefix' 'Maximum number of prefix accept from this peer'
-execute relaxed 'redistribute isis route-map VARIABLE metric 0 metric-type
2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel)
{metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2',
'VARIABLE'
-execute strict 'redistribute isis route-map VARIABLE metric 0 metric-type
2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel)
{metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2',
'VARIABLE'
+execute relaxed 'redistribute isis route-map VARIABLE metric 0 metric-type
2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2', 'VARIABLE'
+execute strict 'redistribute isis route-map VARIABLE metric 0 metric-type
2'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'isis', '0', '2', 'VARIABLE'
complete 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23:
rv==7
'2'
describe 'redistribute isis route-map VARIABLE metric 0 metric-type 2'@23:
rv==0
'2' 'Set OSPF External Type 2 metrics'
-execute relaxed 'redistribute rip metric 0 route-map VARIABLE metric-type
1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel)
{metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1',
'VARIABLE'
-execute strict 'redistribute rip metric 0 route-map VARIABLE metric-type
1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp|babel)
{metric <0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1',
'VARIABLE'
+execute relaxed 'redistribute rip metric 0 route-map VARIABLE metric-type
1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1', 'VARIABLE'
+execute strict 'redistribute rip metric 0 route-map VARIABLE metric-type
1'@23: rv==0, 'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'rip', '0', '1', 'VARIABLE'
complete 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==7
'1'
describe 'redistribute rip metric 0 route-map VARIABLE metric-type 1'@23: rv==0
@@ -910,14 +910,14 @@ execute strict 'show ipv6 bgp community wARIBLE VARIABLE
8ARIABLE'@4: rv==0, 'sh
complete 'show ipv6 bgp community wARIBLE VARIABLE 8ARIABLE'@4: rv==2
describe 'show ipv6 bgp community wARIBLE VARIABLE 8ARIABLE'@4: rv==0
'AA:NN' 'community number'
-execute relaxed 'redistribute bgp'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp|babel)': 'bgp'
-execute strict 'redistribute bgp'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp|babel)': 'bgp'
+execute relaxed 'redistribute bgp'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp)': 'bgp'
+execute strict 'redistribute bgp'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp)': 'bgp'
complete 'redistribute bgp'@14: rv==7
'bgp'
describe 'redistribute bgp'@14: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
-execute relaxed 'redistribute bgp'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp|babel)': 'bgp'
-execute strict 'redistribute bgp'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp|babel)': 'bgp'
+execute relaxed 'redistribute bgp'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp)': 'bgp'
+execute strict 'redistribute bgp'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp)': 'bgp'
complete 'redistribute bgp'@15: rv==7
'bgp'
describe 'redistribute bgp'@15: rv==0
@@ -928,24 +928,24 @@ complete 'redistribute bgp'@16: rv==7
'bgp'
describe 'redistribute bgp'@16: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
-execute relaxed 'redistribute bgp'@23: rv==0, 'redistribute
(kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type
(1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
-execute strict 'redistribute bgp'@23: rv==0, 'redistribute
(kernel|connected|static|rip|isis|bgp|babel) {metric <0-16777214>|metric-type
(1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
+execute relaxed 'redistribute bgp'@23: rv==0, 'redistribute
(kernel|connected|static|rip|isis|bgp) {metric <0-16777214>|metric-type
(1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
+execute strict 'redistribute bgp'@23: rv==0, 'redistribute
(kernel|connected|static|rip|isis|bgp) {metric <0-16777214>|metric-type
(1|2)|route-map WORD}': 'bgp', '(null)', '(null)', '(null)'
complete 'redistribute bgp'@23: rv==7
'bgp'
describe 'redistribute bgp'@23: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
-execute relaxed 'redistribute bgp'@24: rv==0, 'redistribute
(kernel|connected|static|ripng|isis|bgp|babel)': 'bgp'
-execute strict 'redistribute bgp'@24: rv==0, 'redistribute
(kernel|connected|static|ripng|isis|bgp|babel)': 'bgp'
+execute relaxed 'redistribute bgp'@24: rv==0, 'redistribute
(kernel|connected|static|ripng|isis|bgp)': 'bgp'
+execute strict 'redistribute bgp'@24: rv==0, 'redistribute
(kernel|connected|static|ripng|isis|bgp)': 'bgp'
complete 'redistribute bgp'@24: rv==7
'bgp'
describe 'redistribute bgp'@24: rv==0
'bgp' 'Border Gateway Protocol (BGP)'
-execute relaxed 'redistribute bgp m 10'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp|babel) metric <0-16>': 'bgp', '10'
+execute relaxed 'redistribute bgp m 10'@14: rv==0, 'redistribute
(kernel|connected|static|ospf|isis|bgp) metric <0-16>': 'bgp', '10'
execute strict 'redistribute bgp m 10'@14: rv==2
complete 'redistribute bgp m 10'@14: rv==2
describe 'redistribute bgp m 10'@14: rv==0
'<0-16>' 'Metric value'
-execute relaxed 'redistribute bgp m 10'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp|babel) metric <0-16>': 'bgp', '10'
+execute relaxed 'redistribute bgp m 10'@15: rv==0, 'redistribute
(kernel|connected|static|ospf6|isis|bgp) metric <0-16>': 'bgp', '10'
execute strict 'redistribute bgp m 10'@15: rv==2
complete 'redistribute bgp m 10'@15: rv==2
describe 'redistribute bgp m 10'@15: rv==0
@@ -954,29 +954,29 @@ execute relaxed 'redistribute bgp m 10'@23: rv==3
execute strict 'redistribute bgp m 10'@23: rv==2
complete 'redistribute bgp m 10'@23: rv==3
describe 'redistribute bgp m 10'@23: rv==3
-execute relaxed 'redistribute bgp metric 10 metric-type 1'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
-execute strict 'redistribute bgp metric 10 metric-type 1'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
+execute relaxed 'redistribute bgp metric 10 metric-type 1'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
+execute strict 'redistribute bgp metric 10 metric-type 1'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '10', '1', '(null)'
complete 'redistribute bgp metric 10 metric-type 1'@23: rv==7
'1'
describe 'redistribute bgp metric 10 metric-type 1'@23: rv==0
'1' 'Set OSPF External Type 1 metrics'
-execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0,
'redistribute (kernel|connected|static|ospf|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
-execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0,
'redistribute (kernel|connected|static|ospf|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
+execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0,
'redistribute (kernel|connected|static|ospf|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
+execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0,
'redistribute (kernel|connected|static|ospf|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@14: rv==0
'WORD' 'Pointer to route-map entries'
-execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0,
'redistribute (kernel|connected|static|ospf6|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
-execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0,
'redistribute (kernel|connected|static|ospf6|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
+execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0,
'redistribute (kernel|connected|static|ospf6|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
+execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0,
'redistribute (kernel|connected|static|ospf6|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@15: rv==0
'WORD' 'Pointer to route-map entries'
-execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)',
'RMAP_REDIST_BGP'
-execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp|babel) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)',
'RMAP_REDIST_BGP'
+execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)',
'RMAP_REDIST_BGP'
+execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0,
'redistribute (kernel|connected|static|rip|isis|bgp) {metric
<0-16777214>|metric-type (1|2)|route-map WORD}': 'bgp', '(null)', '(null)',
'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@23: rv==0
'WORD' 'Pointer to route-map entries'
-execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0,
'redistribute (kernel|connected|static|ripng|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
-execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0,
'redistribute (kernel|connected|static|ripng|isis|bgp|babel) route-map WORD':
'bgp', 'RMAP_REDIST_BGP'
+execute relaxed 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0,
'redistribute (kernel|connected|static|ripng|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
+execute strict 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0,
'redistribute (kernel|connected|static|ripng|isis|bgp) route-map WORD': 'bgp',
'RMAP_REDIST_BGP'
complete 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==2
describe 'redistribute bgp route-map RMAP_REDIST_BGP'@24: rv==0
'WORD' 'Route map name'
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index e2d63f9f05b4..f9d81f0d779e 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1098,7 +1098,6 @@ vtysh_exit (struct vty *vty)
case RIPNG_NODE:
case OSPF_NODE:
case OSPF6_NODE:
- case BABEL_NODE:
case ISIS_NODE:
case MASC_NODE:
case RMAP_NODE:
@@ -2269,7 +2268,6 @@ vtysh_init_vty (void)
vtysh_install_default (OSPF_NODE);
vtysh_install_default (RIPNG_NODE);
vtysh_install_default (OSPF6_NODE);
- vtysh_install_default (BABEL_NODE);
vtysh_install_default (ISIS_NODE);
vtysh_install_default (KEYCHAIN_NODE);
vtysh_install_default (KEYCHAIN_KEY_NODE);
@@ -2324,7 +2322,6 @@ vtysh_init_vty (void)
install_element (RIPNG_NODE, &vtysh_end_all_cmd);
install_element (OSPF_NODE, &vtysh_end_all_cmd);
install_element (OSPF6_NODE, &vtysh_end_all_cmd);
- install_element (BABEL_NODE, &vtysh_end_all_cmd);
install_element (BGP_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV4_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV4M_NODE, &vtysh_end_all_cmd);
diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index 1681a71aea76..620d35a3adb7 100644
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -29,11 +29,10 @@
#define VTYSH_OSPF6D 0x10
#define VTYSH_BGPD 0x20
#define VTYSH_ISISD 0x40
-#define VTYSH_BABELD 0x80
-#define VTYSH_PIMD 0x100
-#define VTYSH_ALL
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_BABELD|VTYSH_PIMD
-#define VTYSH_RMAP
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_BABELD
-#define VTYSH_INTERFACE
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_BABELD|VTYSH_PIMD
+#define VTYSH_PIMD 0x80
+#define VTYSH_ALL
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD
+#define VTYSH_RMAP
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD
+#define VTYSH_INTERFACE
VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD
/* vtysh local configuration file. */
#define VTYSH_DEFAULT_CONFIG "vtysh.conf"
diff --git a/zebra/client_main.c b/zebra/client_main.c
index 8b95907bc6c4..ce01231f0724 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -115,7 +115,6 @@ struct zebra_info
{ "static", ZEBRA_ROUTE_STATIC },
{ "rip", ZEBRA_ROUTE_RIP },
{ "ripng", ZEBRA_ROUTE_RIPNG },
- { "babel", ZEBRA_ROUTE_BABEL },
{ "ospf", ZEBRA_ROUTE_OSPF },
{ "ospf6", ZEBRA_ROUTE_OSPF6 },
{ "bgp", ZEBRA_ROUTE_BGP },
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index cc7f48fa5bbd..410eb3eb3ca0 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -68,7 +68,6 @@ static const struct
[ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110},
[ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115},
[ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */},
- [ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95},
/* no entry/default: 150 */
};
@@ -1631,7 +1630,6 @@ static const u_char meta_queue_map[ZEBRA_ROUTE_MAX] = {
[ZEBRA_ROUTE_ISIS] = 2,
[ZEBRA_ROUTE_BGP] = 3,
[ZEBRA_ROUTE_HSLS] = 4,
- [ZEBRA_ROUTE_BABEL] = 2,
};
/* Look into the RN and queue it into one or more priority queues,
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 1e39ebdd03ff..f398fad7d6ee 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -729,7 +729,6 @@ vty_show_ip_route_detail (struct vty *vty, struct
route_node *rn, int mcast)
#define ONE_WEEK_SECOND 60*60*24*7
if (rib->type == ZEBRA_ROUTE_RIP
|| rib->type == ZEBRA_ROUTE_OSPF
- || rib->type == ZEBRA_ROUTE_BABEL
|| rib->type == ZEBRA_ROUTE_ISIS
|| rib->type == ZEBRA_ROUTE_BGP)
{
@@ -924,7 +923,6 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn,
struct rib *rib)
if (rib->type == ZEBRA_ROUTE_RIP
|| rib->type == ZEBRA_ROUTE_OSPF
- || rib->type == ZEBRA_ROUTE_BABEL
|| rib->type == ZEBRA_ROUTE_ISIS
|| rib->type == ZEBRA_ROUTE_BGP)
{
@@ -1825,7 +1823,6 @@ vty_show_ipv6_route_detail (struct vty *vty, struct
route_node *rn)
#define ONE_WEEK_SECOND 60*60*24*7
if (rib->type == ZEBRA_ROUTE_RIPNG
|| rib->type == ZEBRA_ROUTE_OSPF6
- || rib->type == ZEBRA_ROUTE_BABEL
|| rib->type == ZEBRA_ROUTE_ISIS
|| rib->type == ZEBRA_ROUTE_BGP)
{
@@ -1967,7 +1964,6 @@ vty_show_ipv6_route (struct vty *vty, struct route_node
*rn,
if (rib->type == ZEBRA_ROUTE_RIPNG
|| rib->type == ZEBRA_ROUTE_OSPF6
- || rib->type == ZEBRA_ROUTE_BABEL
|| rib->type == ZEBRA_ROUTE_ISIS
|| rib->type == ZEBRA_ROUTE_BGP)
{
--
2.2.2
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
