Tweak cost calculation to be more tolerant of occasional loss.

1ec85ef8 · Juliusz Chroboczek · 5c7f5d1e · 1ec85ef8
Commit 1ec85ef8 authored Sep 21, 2008 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

neighbour.c neighbour.c +6 -3

No files found.
--- a/neighbour.c
+++ b/neighbour.c
@@ -311,9 +311,12 @@ neighbour_rxcost(struct neighbour *neigh)
        else
            return INFINITY;
    } else {
-        int sreach = (reach & 0x7FFF) + ((reach & 0x8000) >> 1);
+        int sreach =
-        /* 0 <= sreach <= 0xBFFF */
+            ((reach & 0x8000) >> 2) +
-        int cost = (0xC000 * neigh->network->cost) / (sreach + 1);
+            ((reach & 0x4000) >> 1) +
+            (reach & 0x3FFF);
+        /* 0 <= sreach <= 0x7FFF */
+        int cost = (0x8000 * neigh->network->cost) / (sreach + 1);
        /* cost >= network->cost */
        if(delay >= 40000)
            cost = (cost * (delay - 20000) + 10000) / 20000;