Hysteresis: detect multiple lost packets.

diff --git a/src/hysteresis.c b/src/hysteresis.c
index bc088b9..a6b9303 100644 (file)
--- a/src/hysteresis.c
+++ b/src/hysteresis.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
  * to the project. For more information see the website or contact
  * the copyright holders.
  *

- * $Id: hysteresis.c,v 1.9 2004/11/21 11:28:56 kattemat Exp $
+ * $Id: hysteresis.c,v 1.10 2004/12/02 18:03:14 tlopatic Exp $

  */
 
 
  */
 
 


@@ -176,21 +176,30 @@ update_hysteresis_incoming(union olsr_ip_addr *remote, union olsr_ip_addr *local
 #ifdef DEBUG
       olsr_printf(3, "HYST[%s]: %0.3f\n", olsr_ip_to_string(remote), link->L_link_quality);
 #endif
 #ifdef DEBUG
       olsr_printf(3, "HYST[%s]: %0.3f\n", olsr_ip_to_string(remote), link->L_link_quality);
 #endif

-      /* Check for missing packets - AVOID WRAP AROUND and FIRST TIME
-       * checking for 0 is kind of a ugly hack...
+
+      /* 
+       * see how many packets we have missed and update the link quality
+       * for each missed packet; HELLOs have already been accounted for by
+       * the timeout function and the number of missed HELLOs has already
+       * been added to olsr_seqno there

        */
        */

-      if((link->olsr_seqno + 1 < seqno) &&
-        (link->olsr_seqno != 0) &&
-        (seqno != 0))
-       {
-         //printf("HYS: packet lost.. last seqno %d received seqno %d!\n", link->olsr_seqno, seqno);
-         link->L_link_quality = olsr_hyst_calc_instability(link->L_link_quality);
+
+      if (link->olsr_seqno_valid)
+        while (link->olsr_seqno != seqno)
+          {
+            //printf("HYS: packet lost.. last seqno %d received seqno %d!\n", link->olsr_seqno, seqno);
+            link->L_link_quality =
+              olsr_hyst_calc_instability(link->L_link_quality);

 #ifdef DEBUG
 #ifdef DEBUG

-         olsr_printf(5, "HYST[%s] PACKET LOSS! %0.3f\n", olsr_ip_to_string(remote), link->L_link_quality);
+            olsr_printf(5, "HYST[%s] PACKET LOSS! %0.3f\n",
+                        olsr_ip_to_string(remote), link->L_link_quality);

 #endif
 #endif

-       }
-      /* Set seqno */
-      link->olsr_seqno = seqno;
+            link->olsr_seqno++;
+          }
+
+      link->olsr_seqno = seqno + 1;
+      link->olsr_seqno_valid = OLSR_TRUE;
+

       //printf("Updating seqno to: %d\n", link->olsr_seqno);
     }
   return;
       //printf("Updating seqno to: %d\n", link->olsr_seqno);
     }
   return;

diff --git a/src/link_set.c b/src/link_set.c
index 6152450..59272d7 100644 (file)
--- a/src/link_set.c
+++ b/src/link_set.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
  * to the project. For more information see the website or contact
  * the copyright holders.
  *

- * $Id: link_set.c,v 1.35 2004/11/29 06:28:49 kattemat Exp $
+ * $Id: link_set.c,v 1.36 2004/12/02 18:03:15 tlopatic Exp $

  */
 
 
  */
 
 


@@ -482,6 +482,7 @@ add_new_entry(union olsr_ip_addr *local, union olsr_ip_addr *remote, union olsr_
       olsr_get_timestamp((olsr_u32_t) htime*1500, &new_link->hello_timeout);
       new_link->last_htime = htime;
       new_link->olsr_seqno = 0;
       olsr_get_timestamp((olsr_u32_t) htime*1500, &new_link->hello_timeout);
       new_link->last_htime = htime;
       new_link->olsr_seqno = 0;

+      new_link->olsr_seqno_valid = OLSR_FALSE;

     }
 
   new_link->L_link_quality = 0.0;
     }
 
   new_link->L_link_quality = 0.0;

diff --git a/src/link_set.h b/src/link_set.h
index 69b5e22..64f33d6 100644 (file)
--- a/src/link_set.h
+++ b/src/link_set.h
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
  * to the project. For more information see the website or contact
  * the copyright holders.
  *

- * $Id: link_set.h,v 1.16 2004/11/21 11:28:56 kattemat Exp $
+ * $Id: link_set.h,v 1.17 2004/12/02 18:03:15 tlopatic Exp $

  */
 
 
  */
 
 


@@ -68,6 +68,7 @@ struct link_entry
   struct timeval hello_timeout; /* When we should receive a new HELLO */
   double last_htime;
   olsr_u16_t olsr_seqno;
   struct timeval hello_timeout; /* When we should receive a new HELLO */
   double last_htime;
   olsr_u16_t olsr_seqno;

+  olsr_bool olsr_seqno_valid;

 
 #if defined USE_LINK_QUALITY
   /*
 
 #if defined USE_LINK_QUALITY
   /*