diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 20:04:08 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 20:04:08 +0100 |
| commit | 7ddcfca4fb5246c5e211f7e37d98a8c9a51b4e70 (patch) | |
| tree | ea8dead406e7963c4b8283477daea4d5224845ac /zebra/zebra_vrf.c | |
| parent | Merge branch 'stable/2.0' (diff) | |
| parent | lib: Macroize CLI matcher tracing (diff) | |
| download | frr-7ddcfca4fb5246c5e211f7e37d98a8c9a51b4e70.tar.xz frr-7ddcfca4fb5246c5e211f7e37d98a8c9a51b4e70.zip | |
Merge branch 'queue/osr/vtysh-generic'
WARNING: Merge contains nontrivial fixups in vrf_cmd handling.
Conflicts:
lib/if.c
zebra/interface.c
Diffstat (limited to 'zebra/zebra_vrf.c')
| -rw-r--r-- | zebra/zebra_vrf.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index d06b0c03d..bf42792cf 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -520,26 +520,6 @@ zebra_vrf_other_route_table (afi_t afi, u_int32_t table_id, vrf_id_t vrf_id) return zvrf->table[afi][SAFI_UNICAST]; } -/* Wrapper hook point for zebra daemon so that ifindex can be set - * DEFUN macro not used as extract.pl HAS to ignore this - * See also interface_cmd in lib/if.c - */ -DEFUN_NOSH (zebra_vrf, - zebra_vrf_cmd, - "vrf NAME", - "Select a VRF to configure\n" - "VRF's name\n") -{ - // VTY_DECLVAR_CONTEXT (vrf, vrfp); - int ret; - - /* Call lib vrf() */ - if ((ret = vrf_cmd.func (self, vty, argc, argv)) != CMD_SUCCESS) - return ret; - - return ret; -} - static int vrf_config_write (struct vty *vty) { @@ -558,13 +538,6 @@ vrf_config_write (struct vty *vty) return 0; } -struct cmd_node vrf_node = -{ - VRF_NODE, - "%s(config-vrf)# ", - 1 -}; - /* Zebra VRF initialization. */ void zebra_vrf_init (void) @@ -575,9 +548,5 @@ zebra_vrf_init (void) vrf_add_hook (VRF_DELETE_HOOK, zebra_vrf_delete); vrf_init (); - - install_node (&vrf_node, vrf_config_write); - install_default (VRF_NODE); - install_element (CONFIG_NODE, &zebra_vrf_cmd); - install_element (CONFIG_NODE, &no_vrf_cmd); + vrf_cmd_init (vrf_config_write); } |