2005-04-10 Paul Jakma <paul@dishone.st>

	* Makefile.am: topology should not be a conditional SUBDIR,
	  otherwise make dist breaks.
	* topology/Makefile.am: remove EXTRA_DIST of files which dont
	  exist in that directory, broke make dist.
	* isisd.c: (show_isis_generated_topology_cmd) convert LIST_LOOP
	* isis_lsp.c: (generate_topology_lsps) ditto
	  (build_topology_lsp_data) ditto

diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 3bc94ccfe3c3c11e7fb3c17514d63fd93250f77c..38ab2fcb57446fe82fe431e71984f872b1a5857c 100644 (file)
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-10 Paul Jakma <paul@dishone.st>
+
+       * Makefile.am: topology should not be a conditional SUBDIR,
+         otherwise make dist breaks.
+       * topology/Makefile.am: remove EXTRA_DIST of files which dont
+         exist in that directory, broke make dist.
+       * isisd.c: (show_isis_generated_topology_cmd) convert LIST_LOOP
+       * isis_lsp.c: (generate_topology_lsps) ditto
+         (build_topology_lsp_data) ditto
+
 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * isis_zebra.c: (isis_zebra_if_del) Must use if_lookup_by_name_len.

diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index ceb948c5bec9fa35d730e78b2af6c09c04cd8a2a..1dd54930dc3951f8989b45e11a174a667e35343f 100644 (file)
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -7,7 +7,7 @@ INSTALL_SDATA=@INSTALL@ -m 600
 LIBS = @LIBS@ 
 noinst_LIBRARIES = libisis.a
 sbin_PROGRAMS = isisd 
-SUBDIRS = @ISIS_TOPOLOGY_DIR@
+SUBDIRS = topology
 
 libisis_a_SOURCES = \
        isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 88d4886bcb1d21e54a9d2651d6ae25dceb93813d..f59e804b98445d39f2a111921f2689c62823f80f 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -2295,7 +2295,7 @@ generate_topology_lsps (struct isis_area *area)
   struct isis_lsp *lsp;
 
   /* first we find the maximal node */
-  LIST_LOOP (area->topology, arc, node)
+  for (ALL_LIST_ELEMENTS_RO (area->topology, node, arc))
   {
     if (arc->from_node > max)
       max = arc->from_node;
@@ -2355,7 +2355,7 @@ void
 build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
                         int lsp_top_num)
 {
-  struct listnode *node;
+  struct listnode *node, *nnode;
   struct arc *arc;
   u_char *tlv_ptr;
   struct is_neigh *is_neigh;
@@ -2399,7 +2399,7 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
     }
 
   /* addding is reachabilities */
-  LIST_LOOP (area->topology, arc, node)
+  for (ALL_LIST_ELEMENTS (area->topology, node, nnode, arc))
   {
     if ((arc->from_node == lsp_top_num) || (arc->to_node == lsp_top_num))
       {

diff --git a/isisd/isisd.c b/isisd/isisd.c
index c2bb90644e5f1157f6374b7d03c365587e3b6f58..aeebee6898b34fdd9adc043604b6bbe2b91fbb51 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1602,7 +1602,7 @@ DEFUN (show_isis_generated_topology,
       {
        vty_out (vty, "Topology for isis area:%s%s", area->area_tag,
                 VTY_NEWLINE);
-       LIST_LOOP (area->topology, arc, node2)
+       for (ALL_LIST_ELEMENTS (area->topology, node2, arc))
        {
          vty_out (vty, "a  %ld   %ld   %ld%s", arc->from_node, arc->to_node,
                   arc->distance, VTY_NEWLINE);

diff --git a/isisd/topology/Makefile.am b/isisd/topology/Makefile.am
index ae6fa82191218e692cc81454b4298db1db76e12b..442052109a4dcd698809c167995fc08bd39d0714 100644 (file)
--- a/isisd/topology/Makefile.am
+++ b/isisd/topology/Makefile.am
@@ -15,8 +15,6 @@ libtopology_a_LIBADD = @LIB_REGEX@ ../../lib/libzebra.la
 noinst_HEADERS = \
        spgrid.h
 
-EXTRA_DIST = regex.c regex-gnu.h
-
 depend:
        @$(CPP) -MM $(INCLUDES) $(LDFLAGS) *.c