[Olsr-cvs] olsrd-current/src link_set.c,1.71,1.72

[Bernd Petrovitsch]

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

Modified Files:
	link_set.c 
Log Message:
applied patch by Andreas Jacobs <(spam-protected)>
fixing the broken window size calculation.
I'm taking this solution as it is the (IMHO) most consistent one.


Index: link_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/link_set.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** link_set.c	11 Sep 2007 23:49:02 -0000	1.71
--- link_set.c	16 Sep 2007 21:45:25 -0000	1.72
***************
*** 1046,1050 ****
      (float)(entry->total_packets - entry->lost_packets) /
      (float)(entry->loss_window_size < (2 * 4) ? entry->loss_window_size: 
!     4 * ((entry->loss_window_size / 4 - 1) * entry->total_packets + entry->loss_window_size) / entry->loss_window_size);
      
    // multiply the calculated link quality with the user-specified multiplier
--- 1046,1050 ----
      (float)(entry->total_packets - entry->lost_packets) /
      (float)(entry->loss_window_size < (2 * 4) ? entry->loss_window_size: 
!     4 * (((float)entry->loss_window_size / 4 - 1) * entry->total_packets + entry->loss_window_size) / entry->loss_window_size);
      
    // multiply the calculated link quality with the user-specified multiplier