Bugfixes, updates

core/net/rime/trickle.c

@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: trickle.c,v 1.4 2007/03/31 18:31:29 adamdunkels Exp $
+ * $Id: trickle.c,v 1.5 2007/05/15 08:09:21 adamdunkels Exp $
  */
 
 /**
@@ -45,156 +45,88 @@
 
 #include "net/rime/trickle.h"
 
-struct trickle_hdr {
-  u8_t seqno;
-  u8_t interval;
-};
-
-#define K 1
-
 #define INTERVAL_MIN 1
 #define INTERVAL_MAX 4
 
 #define SEQNO_LT(a, b) ((signed char)((a) - (b)) < 0)
 
-static int trickle_pt(struct trickle_conn *c);
-
 /*---------------------------------------------------------------------------*/
 static void
-send(struct trickle_conn *c)
+send(void *ptr)
 {
-  struct trickle_hdr *hdr;
+  struct trickle_conn *c = ptr;
 
   if(c->q != NULL) {
     queuebuf_to_rimebuf(c->q);
-    rimebuf_hdralloc(sizeof(struct trickle_hdr));
-    hdr = rimebuf_hdrptr();
-    hdr->seqno = c->seqno;
-    hdr->interval = c->interval;
-    abc_send(&c->c);
+    nf_send(&c->c, c->seqno);
+    ctimer_set(&c->t, c->interval << c->interval_scaling,
+	       send, c);
   }
 }
 /*---------------------------------------------------------------------------*/
-static void
-set_intervaltimer(struct trickle_conn *c)
+static int
+recv(struct nf_conn *nf, rimeaddr_t *from,
+     rimeaddr_t *originator, u8_t seqno, u8_t hops)
 {
-  ctimer_set(&c->intervaltimer,
-	     CLOCK_SECOND * (c->interval << c->interval_scaling) /
-                                                  TRICKLE_SECOND,
-	     (void (*)(void *))trickle_pt, c);
-}
-/*---------------------------------------------------------------------------*/
-static void
-set_listentimer(struct trickle_conn *c)
-{
-  ctimer_set(&c->timer,
-	     CLOCK_SECOND * (c->interval << c->interval_scaling) /
-                                            (2 * TRICKLE_SECOND),
-	     (void (*)(void *))trickle_pt, c);
-}
-/*---------------------------------------------------------------------------*/
-static void
-set_transmittimer(struct trickle_conn *c)
-{
-  clock_time_t tval;
+  struct trickle_conn *c = (struct trickle_conn *)nf;
 
-  tval = CLOCK_SECOND * (c->interval << c->interval_scaling) /
-                                        (2 * TRICKLE_SECOND);
-
-  ctimer_set(&c->timer, random_rand() & tval,
-	     (void (*)(void *))trickle_pt, c);
-}
-/*---------------------------------------------------------------------------*/
-static void
-reset_interval(struct trickle_conn *c)
-{
-  PT_INIT(&c->pt);
-  trickle_pt(c);
-}
-/*---------------------------------------------------------------------------*/
-static void
-recv(struct abc_conn *abc)
-{
-  struct trickle_conn *c = (struct trickle_conn *)abc;
-  struct trickle_hdr *hdr = rimebuf_dataptr();
-
-  rimebuf_hdrreduce(sizeof(struct trickle_hdr));
-
-  if(hdr->seqno == c->seqno) {
-    c->count++;
-    c->cb->recv(c);
-  } else if(SEQNO_LT(hdr->seqno, c->seqno)) {
+  if(seqno == c->seqno) {
+    /*    c->cb->recv(c);*/
+  } else if(SEQNO_LT(seqno, c->seqno)) {
+    c->interval_scaling = 0;
     send(c);
   } else { /* hdr->seqno > c->seqno */
-    c->interval = hdr->interval;
-    c->seqno = hdr->seqno;
+    c->seqno = seqno;
     /* Store the incoming data in the queuebuf */
     if(c->q != NULL) {
       queuebuf_free(c->q);
     }
     c->q = queuebuf_new_from_rimebuf();
-    reset_interval(c);
-
+    c->interval_scaling = 0;
+    send(c);
     c->cb->recv(c);
   }
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
-static int
-trickle_pt(struct trickle_conn *c)
+static void
+sent_or_dropped(struct nf_conn *nf)
 {
-  PT_BEGIN(&c->pt);
-
-  c->interval_scaling = INTERVAL_MIN;
-
-  while(1) {
-    c->count = 0;
-    set_intervaltimer(c);
-    set_listentimer(c);
-    PT_YIELD(&c->pt); /* Wait for listen timer to expire. */
-    set_transmittimer(c);
-    PT_YIELD(&c->pt); /* Wait for transmit timer to expire. */
-    if(c->count < K) {
-      send(c);
-    }
-    PT_YIELD(&c->pt); /* Wait for interval timer to expire. */
-    c->interval_scaling++;
-    if(c->interval_scaling > INTERVAL_MAX) {
-      c->interval_scaling = INTERVAL_MAX;
-    }
+  struct trickle_conn *c = (struct trickle_conn *)nf;
+  
+  c->interval_scaling++;
+  if(c->interval_scaling > INTERVAL_MAX) {
+    c->interval_scaling = INTERVAL_MAX;
   }
-  PT_END(&c->pt);
 }
 /*---------------------------------------------------------------------------*/
-static const struct abc_callbacks abc = {recv};
+static const struct nf_callbacks nf = {recv,
+				       sent_or_dropped,
+				       sent_or_dropped};
 /*---------------------------------------------------------------------------*/
 void
-trickle_open(struct trickle_conn *c, u16_t channel,
-	     const struct trickle_callbacks *cb)
+trickle_open(struct trickle_conn *c, clock_time_t interval,
+	     u16_t channel, const struct trickle_callbacks *cb)
 {
-  abc_open(&c->c, channel, &abc);
+  nf_open(&c->c, interval, channel, &nf);
   c->cb = cb;
   c->q = NULL;
-  c->count = 0;
+  c->interval = interval;
 }
 /*---------------------------------------------------------------------------*/
 void
 trickle_close(struct trickle_conn *c)
 {
-  abc_close(&c->c);
-  ctimer_stop(&c->intervaltimer);
-  ctimer_stop(&c->timer);
+  nf_close(&c->c);
+  ctimer_stop(&c->t);
 }
 /*---------------------------------------------------------------------------*/
 void
-trickle_send(struct trickle_conn *c, u8_t interval)
+trickle_send(struct trickle_conn *c)
 {
-  if(c->q != NULL) {
-    queuebuf_free(c->q);
-  }
   c->q = queuebuf_new_from_rimebuf();
   c->seqno++;
-  c->interval = interval;
-  reset_interval(c);
+  send(c);
 }
 /*---------------------------------------------------------------------------*/
 /** @} */