[Olsr-cvs] olsrd-current/lib/pgraph/src olsrd_pgraph.c,1.8,1.9

[Bernd Petrovitsch]

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

Modified Files:
	olsrd_pgraph.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_pgraph.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/pgraph/src/olsrd_pgraph.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** olsrd_pgraph.c	13 Sep 2007 15:31:59 -0000	1.8
--- olsrd_pgraph.c	2 Nov 2007 20:58:07 -0000	1.9
***************
*** 185,189 ****
  //      link = olsr_neighbor_best_link(&neighbor->neighbor_main_addr);
  //      if (link) {
! //        etx = calc_etx( link->loss_link_quality, link->neigh_link_quality);
  //      }
  //    }
--- 185,189 ----
  //      link = olsr_neighbor_best_link(&neighbor->neighbor_main_addr);
  //      if (link) {
! //        etx = olsr_calc_etx(link);
  //      }
  //    }
***************
*** 406,410 ****
    const char* main_adr;
    const char* adr;
! //  double etx = calc_etx( dst_entry->link_quality, dst_entry->inverse_link_quality );
  
    main_adr = olsr_ip_to_string(&entry->addr);
--- 406,410 ----
    const char* main_adr;
    const char* adr;
! //  double etx = olsr_calc_tc_etx(dst_entry);
  
    main_adr = olsr_ip_to_string(&entry->addr);