[Olsr-cvs] olsrd-current/lib/txtinfo/src olsrd_txtinfo.c, 1.12, 1.13

[Bernd Petrovitsch]

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

Modified Files:
	olsrd_txtinfo.c 
Log Message:
Some minor and trivial cleanup: Added two functions to calculate the ETX
value from a struct tc_edge_entry and a struct link_entry, respectively.
And use them everywhere.


Index: olsrd_txtinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/txtinfo/src/olsrd_txtinfo.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** olsrd_txtinfo.c	14 Oct 2007 14:11:11 -0000	1.12
--- olsrd_txtinfo.c	2 Nov 2007 20:58:07 -0000	1.13
***************
*** 315,319 ****
                     link->total_packets,
                     link->neigh_link_quality, 
!                    (link->loss_link_quality * link->neigh_link_quality) ? 1.0 / (link->loss_link_quality * link->neigh_link_quality) : 0.0);
          link = link->next;
      }
--- 315,319 ----
                     link->total_packets,
                     link->neigh_link_quality, 
!                    olsr_calc_link_etx(link));
          link = link->next;
      }
***************
*** 388,392 ****
                         tc_edge->link_quality,
                         tc_edge->inverse_link_quality,
!                        (tc_edge->link_quality * tc_edge->inverse_link_quality) ? 1.0 / (tc_edge->link_quality * tc_edge->inverse_link_quality) : 0.0);
  
          } OLSR_FOR_ALL_TC_EDGE_ENTRIES_END(tc, tc_edge);
--- 388,392 ----
                         tc_edge->link_quality,
                         tc_edge->inverse_link_quality,
!                        olsr_calc_tc_etx(tc_edge));
  
          } OLSR_FOR_ALL_TC_EDGE_ENTRIES_END(tc, tc_edge);