[Olsr-cvs] olsrd-current/lib/dot_draw/src olsrd_dot_draw.c, 1.26, 1.27

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/dot_draw/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16823/lib/dot_draw/src

Modified Files:
	olsrd_dot_draw.c 
Log Message:
* patch by Hannes Gredler <(spam-protected)> to consolidate the the link-state database and the spf-calculation

Index: olsrd_dot_draw.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/dot_draw/src/olsrd_dot_draw.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** olsrd_dot_draw.c	23 Jul 2007 12:58:38 -0000	1.26
--- olsrd_dot_draw.c	13 Sep 2007 15:31:58 -0000	1.27
***************
*** 103,107 ****
  
  static void
! ipc_print_tc_link(struct tc_entry *entry, struct topo_dst *dst_entry);
  
  static void
--- 103,107 ----
  
  static void
! ipc_print_tc_link(struct tc_entry *entry, struct tc_edge_entry *dst_entry);
  
  static void
***************
*** 298,303 ****
    olsr_u8_t index;
    struct neighbor_entry *neighbor_table_tmp;
!   struct tc_entry *entry;
!   struct topo_dst *dst_entry;
    struct hna_entry *tmp_hna;
    struct hna_net *tmp_net;
--- 298,303 ----
    olsr_u8_t index;
    struct neighbor_entry *neighbor_table_tmp;
!   struct tc_entry *tc;
!   struct tc_edge_entry *tc_edge;
    struct hna_entry *tmp_hna;
    struct hna_net *tmp_net;
***************
*** 324,343 ****
  
        /* Topology */  
!       for(index=0;index<HASHSIZE;index++)
! 	{
! 	  /* For all TC entries */
! 	  entry = tc_table[index].next;
! 	  while(entry != &tc_table[index])
! 	    {
! 	      /* For all destination entries of that TC entry */
! 	      dst_entry = entry->destinations.next;
! 	      while(dst_entry != &entry->destinations)
! 		{
! 		  ipc_print_tc_link(entry, dst_entry);
! 		  dst_entry = dst_entry->next;
! 		}
! 	      entry = entry->next;
! 	    }
! 	}
  
        /* HNA entries */
--- 324,332 ----
  
        /* Topology */  
!       OLSR_FOR_ALL_TC_ENTRIES(tc) {
!           OLSR_FOR_ALL_TC_EDGE_ENTRIES(tc, tc_edge) {
!               ipc_print_tc_link(tc, tc_edge);
!           } OLSR_FOR_ALL_TC_EDGE_ENTRIES_END(tc, tc_edge);
!       } OLSR_FOR_ALL_TC_ENTRIES_END(tc);
  
        /* HNA entries */
***************
*** 389,393 ****
  
  static void
! ipc_print_tc_link(struct tc_entry *entry, struct topo_dst *dst_entry)
  {
    char buf[256];
--- 378,382 ----
  
  static void
! ipc_print_tc_link(struct tc_entry *entry, struct tc_edge_entry *dst_entry)
  {
    char buf[256];
***************
*** 395,399 ****
    double etx = calc_etx( dst_entry->link_quality, dst_entry->inverse_link_quality );
  
!   adr = olsr_ip_to_string(&entry->T_last_addr);
    sprintf( buf, "\"%s\" -> ", adr );
    ipc_send_str(buf);
--- 384,388 ----
    double etx = calc_etx( dst_entry->link_quality, dst_entry->inverse_link_quality );
  
!   adr = olsr_ip_to_string(&entry->addr);
    sprintf( buf, "\"%s\" -> ", adr );
    ipc_send_str(buf);