proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 11:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: Vtysh support for babeld.

Browse Source
This commit is contained in:
Juliusz Chroboczek 2012-02-07 04:58:49 +01:00 committed by Paul Jakma
parent 831aeb9a87
commit feb6c53eac
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vtysh/Makefile.am
View File

@ -24,6 +24,7 @@ EXTRA_DIST = extract.pl
vtysh_cmd_FILES = $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.c \ vtysh_cmd_FILES = $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.c \
$(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \ $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
$(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c \ $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c \
$(top_srcdir)/babeld/*.c \
$(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c \ $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c \
$(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c \ $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c \
$(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c \ $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c \

1
vtysh/extract.pl.in
View File

@ -37,6 +37,7 @@ $ignore{'"router ripng"'} = "ignore";
$ignore{'"router ospf"'} = "ignore"; $ignore{'"router ospf"'} = "ignore";
$ignore{'"router ospf <0-65535>"'} = "ignore"; $ignore{'"router ospf <0-65535>"'} = "ignore";
$ignore{'"router ospf6"'} = "ignore"; $ignore{'"router ospf6"'} = "ignore";
$ignore{'"router babel"'} = "ignore";
$ignore{'"router bgp " "<1-4294967295>"'} = "ignore"; $ignore{'"router bgp " "<1-4294967295>"'} = "ignore";
$ignore{'"router bgp " "<1-4294967295>" " view WORD"'} = "ignore"; $ignore{'"router bgp " "<1-4294967295>" " view WORD"'} = "ignore";
$ignore{'"router isis WORD"'} = "ignore"; $ignore{'"router isis WORD"'} = "ignore";

23
vtysh/vtysh.c
View File

@ -58,6 +58,7 @@ struct vtysh_client
{ .fd = -1, .name = "ospf6d", .flag = VTYSH_OSPF6D, .path = OSPF6_VTYSH_PATH}, { .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 = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH},
{ .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH}, { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH},
{ .fd = -1, .name = "babeld", .flag = VTYSH_BABELD, .path = BABEL_VTYSH_PATH},
}; };
#define VTYSH_INDEX_MAX (sizeof(vtysh_client)/sizeof(vtysh_client[0])) #define VTYSH_INDEX_MAX (sizeof(vtysh_client)/sizeof(vtysh_client[0]))
@ -797,6 +798,12 @@ static struct cmd_node ospf6_node =
"%s(config-ospf6)# " "%s(config-ospf6)# "
}; };
static struct cmd_node babel_node =
{
BABEL_NODE,
"%s(config-babel)# "
};
static struct cmd_node keychain_node = static struct cmd_node keychain_node =
{ {
KEYCHAIN_NODE, KEYCHAIN_NODE,
@ -1009,6 +1016,17 @@ DEFUNSH (VTYSH_OSPF6D,
return CMD_SUCCESS; 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, DEFUNSH (VTYSH_ISISD,
router_isis, router_isis,
router_isis_cmd, router_isis_cmd,
@ -1097,6 +1115,7 @@ vtysh_exit (struct vty *vty)
case RIPNG_NODE: case RIPNG_NODE:
case OSPF_NODE: case OSPF_NODE:
case OSPF6_NODE: case OSPF6_NODE:
case BABEL_NODE:
case ISIS_NODE: case ISIS_NODE:
case MASC_NODE: case MASC_NODE:
case RMAP_NODE: case RMAP_NODE:
@ -2252,6 +2271,7 @@ vtysh_init_vty (void)
install_node (&ripng_node, NULL); install_node (&ripng_node, NULL);
install_node (&ospf6_node, NULL); install_node (&ospf6_node, NULL);
/* #endif */ /* #endif */
install_node (&babel_node, NULL);
install_node (&keychain_node, NULL); install_node (&keychain_node, NULL);
install_node (&keychain_key_node, NULL); install_node (&keychain_key_node, NULL);
install_node (&isis_node, NULL); install_node (&isis_node, NULL);
@ -2273,6 +2293,7 @@ vtysh_init_vty (void)
vtysh_install_default (OSPF_NODE); vtysh_install_default (OSPF_NODE);
vtysh_install_default (RIPNG_NODE); vtysh_install_default (RIPNG_NODE);
vtysh_install_default (OSPF6_NODE); vtysh_install_default (OSPF6_NODE);
vtysh_install_default (BABEL_NODE);
vtysh_install_default (ISIS_NODE); vtysh_install_default (ISIS_NODE);
vtysh_install_default (KEYCHAIN_NODE); vtysh_install_default (KEYCHAIN_NODE);
vtysh_install_default (KEYCHAIN_KEY_NODE); vtysh_install_default (KEYCHAIN_KEY_NODE);
@ -2327,6 +2348,7 @@ vtysh_init_vty (void)
install_element (RIPNG_NODE, &vtysh_end_all_cmd); install_element (RIPNG_NODE, &vtysh_end_all_cmd);
install_element (OSPF_NODE, &vtysh_end_all_cmd); install_element (OSPF_NODE, &vtysh_end_all_cmd);
install_element (OSPF6_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_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV4_NODE, &vtysh_end_all_cmd); install_element (BGP_IPV4_NODE, &vtysh_end_all_cmd);
install_element (BGP_IPV4M_NODE, &vtysh_end_all_cmd); install_element (BGP_IPV4M_NODE, &vtysh_end_all_cmd);
@ -2352,6 +2374,7 @@ vtysh_init_vty (void)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
install_element (CONFIG_NODE, &router_ospf6_cmd); install_element (CONFIG_NODE, &router_ospf6_cmd);
#endif #endif
install_element (CONFIG_NODE, &router_babel_cmd);
install_element (CONFIG_NODE, &router_isis_cmd); install_element (CONFIG_NODE, &router_isis_cmd);
install_element (CONFIG_NODE, &router_bgp_cmd); install_element (CONFIG_NODE, &router_bgp_cmd);
install_element (CONFIG_NODE, &router_bgp_view_cmd); install_element (CONFIG_NODE, &router_bgp_view_cmd);

7
vtysh/vtysh.h
View File

@ -29,9 +29,10 @@
#define VTYSH_OSPF6D 0x10 #define VTYSH_OSPF6D 0x10
#define VTYSH_BGPD 0x20 #define VTYSH_BGPD 0x20
#define VTYSH_ISISD 0x40 #define VTYSH_ISISD 0x40
#define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD #define VTYSH_BABELD 0x80
#define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_BABELD
#define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD #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 local configuration file. */ /* vtysh local configuration file. */
#define VTYSH_DEFAULT_CONFIG "vtysh.conf" #define VTYSH_DEFAULT_CONFIG "vtysh.conf"

2
vtysh/vtysh_config.c
View File

@ -198,6 +198,8 @@ vtysh_config_parse_line (const char *line)
config = config_get (OSPF_NODE, line); config = config_get (OSPF_NODE, line);
else if (strncmp (line, "router ospf6", strlen ("router ospf6")) == 0) else if (strncmp (line, "router ospf6", strlen ("router ospf6")) == 0)
config = config_get (OSPF6_NODE, line); config = config_get (OSPF6_NODE, line);
else if (strncmp (line, "router babel", strlen ("router babel")) == 0)
config = config_get (BABEL_NODE, line);
else if (strncmp (line, "router bgp", strlen ("router bgp")) == 0) else if (strncmp (line, "router bgp", strlen ("router bgp")) == 0)
config = config_get (BGP_NODE, line); config = config_get (BGP_NODE, line);
else if (strncmp (line, "router isis", strlen ("router isis")) == 0) else if (strncmp (line, "router isis", strlen ("router isis")) == 0)