[Linux-decnet-commit] CVS: dnprogs/dnroute get_neigh.c,1.8,1.9

[Patrick C. <pa...@us...>]

Update of /cvsroot/linux-decnet/dnprogs/dnroute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18831

Modified Files:
	get_neigh.c 
Log Message:
Don't show nodes that have been removed, sigh.


Index: get_neigh.c
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/dnroute/get_neigh.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** get_neigh.c	5 Apr 2006 08:13:24 -0000	1.8
--- get_neigh.c	5 Apr 2006 10:32:59 -0000	1.9
***************
*** 249,259 ****
  			int interface = 0;
  
- 			if (first)
- 			{
- 				first = 0;
- 				fprintf(fp, "     Node              Cost    Hops   Next hop to node\n");
- 			}
  			addr = exec_addr->a_addr[1] << 8 | i;
  			n = dm_hash_lookup_binary(node_hash, (void *)&addr, 2);
  			dn_addr[0] = addr & 0xFF;
  			dn_addr[1] = addr>>8;
--- 249,257 ----
  			int interface = 0;
  
  			addr = exec_addr->a_addr[1] << 8 | i;
  			n = dm_hash_lookup_binary(node_hash, (void *)&addr, 2);
+ 			if (!n || n->deleted)
+ 				continue;
+ 
  			dn_addr[0] = addr & 0xFF;
  			dn_addr[1] = addr>>8;
***************
*** 285,288 ****
--- 283,292 ----
  			}
  
+ 			if (first)
+ 			{
+ 				first = 0;
+ 				fprintf(fp, "     Node              Cost    Hops   Next hop to node\n");
+ 			}
+ 
  			fprintf(fp, "  %2d.%-3d  %-12s  %3d    %3d    %-5s   ->  %2d.%-3d  %-12s\n",
  				exec_addr->a_addr[1]>>2, i,