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/isis_lsp.c b/isisd/isis_lsp.c
index 88d4886..f59e804 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -2295,7 +2295,7 @@
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 @@
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 @@
}
/* 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))
{