diff options
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/ChangeLog | 11 | ||||
| -rw-r--r-- | isisd/Makefile.am | 7 | ||||
| -rw-r--r-- | isisd/isis_lsp.c | 2 | ||||
| -rw-r--r-- | isisd/isisd.c | 10 | ||||
| -rw-r--r-- | isisd/isisd.h | 3 | ||||
| -rw-r--r-- | isisd/topology/Makefile.am | 2 |
6 files changed, 21 insertions, 14 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog index 6f4f3958..f3339016 100644 --- a/isisd/ChangeLog +++ b/isisd/ChangeLog @@ -1,3 +1,14 @@ +2005-04-02 Hasso Tepper <hasso at quagga.net> + + * Makefile.am: Variables to handle conditonal compiling of topology + generator code. + * isis_lsp.c: lsppdu_realloc() is used by topology generator. + * isisd.c: Rename show_isis_topology_cmd to not conflict the one in + the isis_spf.c. + * isisd.h: Remove TOPOLOGY_GENERATE define, it will be defined in + toplevel config.h if topology generator is enabled. + * topology/Makefile.am: Handle the libtoolized Quagga libraries. + 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * isis_zebra.c: (isis_zebra_if_del) Call if_delete_retain instead diff --git a/isisd/Makefile.am b/isisd/Makefile.am index 7993643d..ceb948c5 100644 --- a/isisd/Makefile.am +++ b/isisd/Makefile.am @@ -1,12 +1,13 @@ ## Process this file with automake to produce Makefile.in. -# INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -Itopology -INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib +INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib \ + @ISIS_TOPOLOGY_INCLUDES@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 LIBS = @LIBS@ noinst_LIBRARIES = libisis.a sbin_PROGRAMS = isisd +SUBDIRS = @ISIS_TOPOLOGY_DIR@ libisis_a_SOURCES = \ isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \ @@ -25,7 +26,7 @@ noinst_HEADERS = \ isisd_SOURCES = \ isis_main.c $(libisis_a_SOURCES) -isisd_LDADD = ../lib/libzebra.la @LIBCAP@ +isisd_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ examplesdir = $(exampledir) dist_examples_DATA = isisd.conf.sample diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 52d8884d..987a9b32 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -913,7 +913,6 @@ lsp_print_all (struct vty *vty, dict_t * lspdb, char detail, char dynhost) return lsp_count; } -#if 0 /* Seems to be old code */ /* this function reallocate memory to an lsp pdu, with an additional * size of memory, it scans the lsp and moves all pointers the * way they should */ @@ -940,7 +939,6 @@ lsppdu_realloc (struct isis_lsp * lsp, int memorytype, int size) return STREAM_DATA (lsp->pdu) + (lsp->lsp_header->pdu_len - size); #endif /* LSP_MEMORY_PREASSIGN */ } -#endif /* 0 */ #if 0 /* Saving the old one just in case :) */ /* 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); diff --git a/isisd/isisd.h b/isisd/isisd.h index c347bf0c..77de12ec 100644 --- a/isisd/isisd.h +++ b/isisd/isisd.h @@ -29,9 +29,6 @@ /* #define EXTREME_DEBUG */ /* #define EXTREME_TLV_DEBUG */ -/* If you want topology stuff compiled in */ -/* #define TOPOLOGY_GENERATE */ - struct rmap { char *name; diff --git a/isisd/topology/Makefile.am b/isisd/topology/Makefile.am index 045c15c8..ae6fa821 100644 --- a/isisd/topology/Makefile.am +++ b/isisd/topology/Makefile.am @@ -10,7 +10,7 @@ libtopology_a_SOURCES = \ libtopology_a_DEPENDENCIES = @LIB_REGEX@ -libtopology_a_LIBADD = @LIB_REGEX@ ../../lib/libzebra.a +libtopology_a_LIBADD = @LIB_REGEX@ ../../lib/libzebra.la noinst_HEADERS = \ spgrid.h |