summaryrefslogtreecommitdiffstats
path: root/isisd/isisd.c
diff options
context:
space:
mode:
authorhasso <hasso>2005-04-02 19:03:39 +0000
committerhasso <hasso>2005-04-02 19:03:39 +0000
commit14ccf58c68f8a1328f187384a2b498cda02155a0 (patch)
tree256370a9a459af17bbe98a5eaf682b82309beb1e /isisd/isisd.c
parent1f587c70d318ef705e7bbee8bd449c040b0e79fc (diff)
downloadquagga-14ccf58c68f8a1328f187384a2b498cda02155a0.tar.bz2
quagga-14ccf58c68f8a1328f187384a2b498cda02155a0.tar.xz
* configure.ac: Add --enable-isis-topology to enable isisd topology
generator code. * isisd/Makefile.am: Variables to handle conditonal compiling of topology generator code. * isisd/isis_lsp.c: lsppdu_realloc() is used by topology generator. * isisd/isisd.c: Rename show_isis_topology_cmd to not conflict the one in the isis_spf.c. * isisd/isisd.h: Remove TOPOLOGY_GENERATE define, it will be defined in toplevel config.h if topology generator is enabled. * isisd/topology/Makefile.am: Handle the libtoolized Quagga libraries.
Diffstat (limited to 'isisd/isisd.c')
-rw-r--r--isisd/isisd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/isisd/isisd.c b/isisd/isisd.c
index e4d73c30..229f1356 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1595,9 +1595,9 @@ DEFUN (topology_generate_grid,
return CMD_SUCCESS;
}
-DEFUN (show_isis_topology,
- show_isis_topology_cmd,
- "show isis topology",
+DEFUN (show_isis_generated_topology,
+ show_isis_generated_topology_cmd,
+ "show isis generated-topology",
SHOW_STR
"clns network information\n"
"CLNS neighbor adjacencies\n")
@@ -2138,8 +2138,8 @@ isis_init ()
install_element (ISIS_NODE, &topology_generate_grid_cmd);
install_element (ISIS_NODE, &topology_baseis_cmd);
install_element (ISIS_NODE, &no_topology_baseis_cmd);
- install_element (VIEW_NODE, &show_isis_topology_cmd);
- install_element (ENABLE_NODE, &show_isis_topology_cmd);
+ install_element (VIEW_NODE, &show_isis_generated_topology_cmd);
+ install_element (ENABLE_NODE, &show_isis_generated_topology_cmd);
#endif /* TOPOLOGY_GENERATE */
isis_new (0);