[Olsr-cvs] olsrd-current/lib/bmf/src NetworkInterfaces.c,1.8,1.9

[Bernd Petrovitsch]

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

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

Index: NetworkInterfaces.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/bmf/src/NetworkInterfaces.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NetworkInterfaces.c	11 Sep 2007 23:22:38 -0000	1.8
--- NetworkInterfaces.c	13 Sep 2007 15:31:58 -0000	1.9
***************
*** 863,876 ****
          if (tcLastHop != NULL)
          {
!           struct topo_dst* tcDest;
  
!           /* TODO: olsr_tc_lookup_dst() is not thread-safe. */
!           tcDest = olsr_tc_lookup_dst(tcLastHop, MainAddressOf(&walker->neighbor_iface_addr));
  
!           if (tcDest != NULL)
            {
              float tcEtx = CalcEtx(
!               tcDest->link_quality,
!               tcDest->inverse_link_quality);
  
              if (previousLinkEtx + currEtx > tcEtx)
--- 863,876 ----
          if (tcLastHop != NULL)
          {
!           struct tc_edge_entry* tc_edge;
  
!           /* TODO: olsr_lookup_tc_edge() is not thread-safe. */
!           tc_edge = olsr_lookup_tc_edge(tcLastHop, MainAddressOf(&walker->neighbor_iface_addr));
  
!           if (tc_edge != NULL)
            {
              float tcEtx = CalcEtx(
!               tc_edge->link_quality,
!               tc_edge->inverse_link_quality);
  
              if (previousLinkEtx + currEtx > tcEtx)