proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:13:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
paul 2005-04-10 15:58:10 +00:00
parent 57a1477bc7
commit a8f03df06c
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
isisd/ChangeLog
View File

@ -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> 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* isis_zebra.c: (isis_zebra_if_del) Must use if_lookup_by_name_len. * isis_zebra.c: (isis_zebra_if_del) Must use if_lookup_by_name_len.

2
isisd/Makefile.am
View File

@ -7,7 +7,7 @@ INSTALL_SDATA=@INSTALL@ -m 600
LIBS = @LIBS@ LIBS = @LIBS@
noinst_LIBRARIES = libisis.a noinst_LIBRARIES = libisis.a
sbin_PROGRAMS = isisd sbin_PROGRAMS = isisd
SUBDIRS = @ISIS_TOPOLOGY_DIR@ SUBDIRS = topology
libisis_a_SOURCES = \ libisis_a_SOURCES = \
isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \ isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \

6
isisd/isis_lsp.c
View File

@ -2295,7 +2295,7 @@ generate_topology_lsps (struct isis_area *area)
struct isis_lsp *lsp; struct isis_lsp *lsp;
/* first we find the maximal node */ /* 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) if (arc->from_node > max)
max = arc->from_node; max = arc->from_node;
@ -2355,7 +2355,7 @@ void
build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area, build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
int lsp_top_num) int lsp_top_num)
{ {
struct listnode *node; struct listnode *node, *nnode;
struct arc *arc; struct arc *arc;
u_char *tlv_ptr; u_char *tlv_ptr;
struct is_neigh *is_neigh; struct is_neigh *is_neigh;
@ -2399,7 +2399,7 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
} }
/* addding is reachabilities */ /* 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)) if ((arc->from_node == lsp_top_num) || (arc->to_node == lsp_top_num))
{ {

2
isisd/isisd.c
View File

@ -1602,7 +1602,7 @@ DEFUN (show_isis_generated_topology,
{ {
vty_out (vty, "Topology for isis area:%s%s", area->area_tag, vty_out (vty, "Topology for isis area:%s%s", area->area_tag,
VTY_NEWLINE); 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, vty_out (vty, "a %ld %ld %ld%s", arc->from_node, arc->to_node,
arc->distance, VTY_NEWLINE); arc->distance, VTY_NEWLINE);

2
isisd/topology/Makefile.am
View File

@ -15,8 +15,6 @@ libtopology_a_LIBADD = @LIB_REGEX@ ../../lib/libzebra.la
noinst_HEADERS = \ noinst_HEADERS = \
spgrid.h spgrid.h
EXTRA_DIST = regex.c regex-gnu.h
depend: depend:
@$(CPP) -MM $(INCLUDES) $(LDFLAGS) *.c @$(CPP) -MM $(INCLUDES) $(LDFLAGS) *.c