diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-05-19 00:35:04 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-05-20 00:34:21 +0200 |
| commit | 5460baef7f0014f2d0c3459aa9c4180da19d6850 (patch) | |
| tree | 43c44fde298e4fbaf1de87a6dc287b0c82a4f515 /vtysh/vtysh.c | |
| parent | 336724d628be71022f80cfe3dfb34274ad95ec14 (diff) | |
| download | quagga-5460baef7f0014f2d0c3459aa9c4180da19d6850.tar.bz2 quagga-5460baef7f0014f2d0c3459aa9c4180da19d6850.tar.xz | |
*: fix "babeld: Remove babeld from Quagga" (336724d)
This removes some more bits of babeld, particularly from:
- buildtest.sh
- redhat/ build files
- vtysh integration (which actively broke the build)
The memtype and zclient/route type are kept in place since these don't
break anything and -theoretically- make it possible to build babeld
with some Quagga integration externally.
(Keeping vtysh integration is unfortunately not as easy.)
Reported-by: Donald Sharp <sharpd@cumulusnetworks.com>
Fixes: 336724d ("babeld: Remove babeld from Quagga")
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
Acked-by: Paul Jakma <paul@quagga.net>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'vtysh/vtysh.c')
| -rw-r--r-- | vtysh/vtysh.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index fbbc88d0..e2d63f9f 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -58,7 +58,6 @@ struct vtysh_client { .fd = -1, .name = "ospf6d", .flag = VTYSH_OSPF6D, .path = OSPF6_VTYSH_PATH}, { .fd = -1, .name = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH}, { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH}, - { .fd = -1, .name = "babeld", .flag = VTYSH_BABELD, .path = BABEL_VTYSH_PATH}, { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH}, }; @@ -799,12 +798,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, @@ -1017,17 +1010,6 @@ DEFUNSH (VTYSH_OSPF6D, return CMD_SUCCESS; } -DEFUNSH (VTYSH_BABELD, - router_babel, - router_babel_cmd, - "router babel", - ROUTER_STR - "Babel") -{ - vty->node = BABEL_NODE; - return CMD_SUCCESS; -} - DEFUNSH (VTYSH_ISISD, router_isis, router_isis_cmd, @@ -2266,7 +2248,6 @@ vtysh_init_vty (void) install_node (&ripng_node, NULL); install_node (&ospf6_node, NULL); /* #endif */ - install_node (&babel_node, NULL); install_node (&keychain_node, NULL); install_node (&keychain_key_node, NULL); install_node (&isis_node, NULL); @@ -2369,7 +2350,6 @@ vtysh_init_vty (void) #ifdef HAVE_IPV6 install_element (CONFIG_NODE, &router_ospf6_cmd); #endif - install_element (CONFIG_NODE, &router_babel_cmd); install_element (CONFIG_NODE, &router_isis_cmd); install_element (CONFIG_NODE, &router_bgp_cmd); install_element (CONFIG_NODE, &router_bgp_view_cmd); |