indentation

3 files changed, 325 insertions, 367 deletions

diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index 8aad86003..35d59854f 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -69,7 +69,7 @@ struct MessageContext
   /**
    * Pointer to the assembled message, allocated at the
    * end of this struct.
-   */ 
+   */
   const struct GNUNET_MessageHeader *msg;
 
   /**
@@ -183,7 +183,7 @@ struct GNUNET_DEFRAGMENT_Context
 
   /**
    * Maximum message size for each fragment.
-   */ 
+   */
   uint16_t mtu;
 };
 
@@ -203,11 +203,11 @@ struct GNUNET_DEFRAGMENT_Context
  */
 struct GNUNET_DEFRAGMENT_Context *
 GNUNET_DEFRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
-                                  uint16_t mtu,
-                                  unsigned int num_msgs,
-                                  void *cls,
-                                  GNUNET_FRAGMENT_MessageProcessor proc,
-                                  GNUNET_DEFRAGMENT_AckProcessor ackp)
+                                  uint16_t mtu,
+                                  unsigned int num_msgs,
+                                  void *cls,
+                                  GNUNET_FRAGMENT_MessageProcessor proc,
+                                  GNUNET_DEFRAGMENT_AckProcessor ackp)
 {
   struct GNUNET_DEFRAGMENT_Context *dc;
 
@@ -218,7 +218,7 @@ GNUNET_DEFRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
   dc->ackp = ackp;
   dc->num_msgs = num_msgs;
   dc->mtu = mtu;
-  dc->latency = GNUNET_TIME_UNIT_SECONDS; /* start with likely overestimate */
+  dc->latency = GNUNET_TIME_UNIT_SECONDS;       /* start with likely overestimate */
   return dc;
 }
 
@@ -228,24 +228,22 @@ GNUNET_DEFRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
  *
  * @param dc defragmentation context
  */
-void 
+void
 GNUNET_DEFRAGMENT_context_destroy (struct GNUNET_DEFRAGMENT_Context *dc)
 {
   struct MessageContext *mc;
 
   while (NULL != (mc = dc->head))
+  {
+    GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, mc);
+    dc->list_size--;
+    if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
     {
-      GNUNET_CONTAINER_DLL_remove (dc->head,
-                                   dc->tail,
-                                   mc);
-      dc->list_size--;
-      if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
-        {
-          GNUNET_SCHEDULER_cancel (mc->ack_task);
-          mc->ack_task = GNUNET_SCHEDULER_NO_TASK;
-        }
-      GNUNET_free (mc);
+      GNUNET_SCHEDULER_cancel (mc->ack_task);
+      mc->ack_task = GNUNET_SCHEDULER_NO_TASK;
     }
+    GNUNET_free (mc);
+  }
   GNUNET_assert (0 == dc->list_size);
   GNUNET_free (dc);
 }
@@ -258,8 +256,7 @@ GNUNET_DEFRAGMENT_context_destroy (struct GNUNET_DEFRAGMENT_Context *dc)
  * @param tc the scheduler context
  */
 static void
-send_ack (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+send_ack (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct MessageContext *mc = cls;
   struct GNUNET_DEFRAGMENT_Context *dc = mc->dc;
@@ -271,9 +268,8 @@ send_ack (void *cls,
   fa.fragment_id = htonl (mc->fragment_id);
   fa.bits = GNUNET_htonll (mc->bits);
   GNUNET_STATISTICS_update (mc->dc->stats,
-                            _("# acknowledgements sent for fragment"),
-                            1,
-                            GNUNET_NO);
+                            _("# acknowledgements sent for fragment"),
+                            1, GNUNET_NO);
   dc->ackp (dc->cls, mc->fragment_id, &fa.header);
 }
 
@@ -285,27 +281,26 @@ send_ack (void *cls,
 static void
 gsl_fit_mul (const double *x, const size_t xstride,
              const double *y, const size_t ystride,
-             const size_t n, 
-             double *c1, double *cov_11, double *sumsq)
+             const size_t n, double *c1, double *cov_11, double *sumsq)
 {
   double m_x = 0, m_y = 0, m_dx2 = 0, m_dxdy = 0;
 
   size_t i;
 
   for (i = 0; i < n; i++)
-    {
-      m_x += (x[i * xstride] - m_x) / (i + 1.0);
-      m_y += (y[i * ystride] - m_y) / (i + 1.0);
-    }
+  {
+    m_x += (x[i * xstride] - m_x) / (i + 1.0);
+    m_y += (y[i * ystride] - m_y) / (i + 1.0);
+  }
 
   for (i = 0; i < n; i++)
-    {
-      const double dx = x[i * xstride] - m_x;
-      const double dy = y[i * ystride] - m_y;
+  {
+    const double dx = x[i * xstride] - m_x;
+    const double dy = y[i * ystride] - m_y;
 
-      m_dx2 += (dx * dx - m_dx2) / (i + 1.0);
-      m_dxdy += (dx * dy - m_dxdy) / (i + 1.0);
-    }
+    m_dx2 += (dx * dx - m_dx2) / (i + 1.0);
+    m_dxdy += (dx * dy - m_dxdy) / (i + 1.0);
+  }
 
   /* In terms of y =  b x */
 
@@ -318,12 +313,13 @@ gsl_fit_mul (const double *x, const size_t xstride,
     /* Compute chi^2 = \sum (y_i -  b * x_i)^2 */
 
     for (i = 0; i < n; i++)
-      {
-        const double dx = x[i * xstride] - m_x;
-        const double dy = y[i * ystride] - m_y;
-        const double d = (m_y - b * m_x) + dy - b * dx;
-        d2 += d * d;
-      }
+    {
+      const double dx = x[i * xstride] - m_x;
+      const double dy = y[i * ystride] - m_y;
+      const double d = (m_y - b * m_x) + dy - b * dx;
+
+      d2 += d * d;
+    }
 
     s2 = d2 / (n - 1.0);        /* chisq per degree of freedom */
 
@@ -356,16 +352,16 @@ estimate_latency (struct MessageContext *mc)
 
   first = &mc->frag_times[mc->frag_times_start_offset];
   GNUNET_assert (total > 1);
-  for (i=0;i<total;i++)
-    {
-      x[i] = (double) i;
-      y[i] = (double) (first[i].time.abs_value - first[0].time.abs_value);
-    }
-  gsl_fit_mul (x, 1, y, 1, total,  &c1, &cov11, &sumsq);
-  c1 += sqrt (sumsq); /* add 1 std dev */
+  for (i = 0; i < total; i++)
+  {
+    x[i] = (double) i;
+    y[i] = (double) (first[i].time.abs_value - first[0].time.abs_value);
+  }
+  gsl_fit_mul (x, 1, y, 1, total, &c1, &cov11, &sumsq);
+  c1 += sqrt (sumsq);           /* add 1 std dev */
   ret.rel_value = (uint64_t) c1;
   if (ret.rel_value == 0)
-    ret = GNUNET_TIME_UNIT_MILLISECONDS; /* always at least 1 */
+    ret = GNUNET_TIME_UNIT_MILLISECONDS;        /* always at least 1 */
   return ret;
 };
 
@@ -384,22 +380,20 @@ discard_oldest_mc (struct GNUNET_DEFRAGMENT_Context *dc)
   old = NULL;
   pos = dc->head;
   while (NULL != pos)
-    {
-      if ( (old == NULL) ||
-           (old->last_update.abs_value > pos->last_update.abs_value) )
-        old = pos;
-      pos = pos->next;
-    }
+  {
+    if ((old == NULL) ||
+        (old->last_update.abs_value > pos->last_update.abs_value))
+      old = pos;
+    pos = pos->next;
+  }
   GNUNET_assert (NULL != old);
-  GNUNET_CONTAINER_DLL_remove (dc->head,
-                               dc->tail,
-                               old);
+  GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, old);
   dc->list_size--;
   if (GNUNET_SCHEDULER_NO_TASK != old->ack_task)
-    {
-      GNUNET_SCHEDULER_cancel (old->ack_task);
-      old->ack_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (old->ack_task);
+    old->ack_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_free (old);
 }
 
@@ -411,9 +405,9 @@ discard_oldest_mc (struct GNUNET_DEFRAGMENT_Context *dc)
  * @param msg the message that was received
  * @return GNUNET_OK on success, GNUNET_NO if this was a duplicate, GNUNET_SYSERR on error
  */
-int 
+int
 GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
-                                    const struct GNUNET_MessageHeader *msg)
+                                    const struct GNUNET_MessageHeader *msg)
 {
   struct MessageContext *mc;
   const struct FragmentHeader *fh;
@@ -429,135 +423,122 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc,
   unsigned int n;
   int duplicate;
 
-  if (ntohs(msg->size) < sizeof (struct FragmentHeader))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+  if (ntohs (msg->size) < sizeof (struct FragmentHeader))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   if (ntohs (msg->size) > dc->mtu)
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-  fh = (const struct FragmentHeader*) msg;
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  fh = (const struct FragmentHeader *) msg;
   msize = ntohs (fh->total_size);
   if (msize < sizeof (struct GNUNET_MessageHeader))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   fid = ntohl (fh->fragment_id);
   foff = ntohs (fh->offset);
   if (foff >= msize)
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   if (0 != (foff % (dc->mtu - sizeof (struct FragmentHeader))))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-  GNUNET_STATISTICS_update (dc->stats,
-                            _("# fragments received"),
-                            1,
-                            GNUNET_NO);
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_STATISTICS_update (dc->stats, _("# fragments received"), 1, GNUNET_NO);
   mc = dc->head;
-  while ( (NULL != mc) &&
-          (fid != mc->fragment_id) )
+  while ((NULL != mc) && (fid != mc->fragment_id))
     mc = mc->next;
   bit = foff / (dc->mtu - sizeof (struct FragmentHeader));
-  if (bit * (dc->mtu - sizeof (struct FragmentHeader)) + ntohs (msg->size) 
+  if (bit * (dc->mtu - sizeof (struct FragmentHeader)) + ntohs (msg->size)
       - sizeof (struct FragmentHeader) > msize)
-    {
-      /* payload extends past total message size */
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-  if ( (NULL != mc) && (msize != mc->total_size) )
-    {
-      /* inconsistent message size */
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+  {
+    /* payload extends past total message size */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ((NULL != mc) && (msize != mc->total_size))
+  {
+    /* inconsistent message size */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   now = GNUNET_TIME_absolute_get ();
   if (NULL == mc)
-    {
-      mc = GNUNET_malloc (sizeof (struct MessageContext) + msize);
-      mc->msg = (const struct GNUNET_MessageHeader*) &mc[1];
-      mc->dc = dc;
-      mc->total_size = msize;
-      mc->fragment_id = fid;      
-      mc->last_update = now;
-      n = (msize + dc->mtu - sizeof (struct FragmentHeader) - 1) / (dc->mtu - sizeof (struct FragmentHeader));   
-      if (n == 64)
-        mc->bits = UINT64_MAX;      /* set all 64 bit */
-      else
-        mc->bits = (1LL << n) - 1; /* set lowest 'bits' bit */
-      if (dc->list_size >= dc->num_msgs)
-        discard_oldest_mc (dc);
-      GNUNET_CONTAINER_DLL_insert (dc->head,
-                                   dc->tail,
-                                   mc);
-      dc->list_size++;
-    }
+  {
+    mc = GNUNET_malloc (sizeof (struct MessageContext) + msize);
+    mc->msg = (const struct GNUNET_MessageHeader *) &mc[1];
+    mc->dc = dc;
+    mc->total_size = msize;
+    mc->fragment_id = fid;
+    mc->last_update = now;
+    n = (msize + dc->mtu - sizeof (struct FragmentHeader) - 1) / (dc->mtu -
+                                                                  sizeof (struct
+                                                                          FragmentHeader));
+    if (n == 64)
+      mc->bits = UINT64_MAX;    /* set all 64 bit */
+    else
+      mc->bits = (1LL << n) - 1;        /* set lowest 'bits' bit */
+    if (dc->list_size >= dc->num_msgs)
+      discard_oldest_mc (dc);
+    GNUNET_CONTAINER_DLL_insert (dc->head, dc->tail, mc);
+    dc->list_size++;
+  }
 
   /* copy data to 'mc' */
   if (0 != (mc->bits & (1LL << bit)))
-    {
-      mc->bits -= 1LL << bit;
-      mbuf = (char* )&mc[1];
-      memcpy (&mbuf[bit * (dc->mtu - sizeof (struct FragmentHeader))],
-              &fh[1],
-              ntohs (msg->size) - sizeof (struct FragmentHeader));
-      mc->last_update = now;
-      if (bit < mc->last_bit)
-        mc->frag_times_start_offset = mc->frag_times_write_offset;
-      mc->last_bit = bit;
-      mc->frag_times[mc->frag_times_write_offset].time = now;
-      mc->frag_times[mc->frag_times_write_offset].bit = bit;
-      mc->frag_times_write_offset++;
-      duplicate = GNUNET_NO;
-    }
+  {
+    mc->bits -= 1LL << bit;
+    mbuf = (char *) &mc[1];
+    memcpy (&mbuf[bit * (dc->mtu - sizeof (struct FragmentHeader))],
+            &fh[1], ntohs (msg->size) - sizeof (struct FragmentHeader));
+    mc->last_update = now;
+    if (bit < mc->last_bit)
+      mc->frag_times_start_offset = mc->frag_times_write_offset;
+    mc->last_bit = bit;
+    mc->frag_times[mc->frag_times_write_offset].time = now;
+    mc->frag_times[mc->frag_times_write_offset].bit = bit;
+    mc->frag_times_write_offset++;
+    duplicate = GNUNET_NO;
+  }
   else
-    {
-      duplicate = GNUNET_YES;
-      GNUNET_STATISTICS_update (dc->stats,
-                                _("# duplicate fragments received"),
-                                1,
-                                GNUNET_NO);
-    }
+  {
+    duplicate = GNUNET_YES;
+    GNUNET_STATISTICS_update (dc->stats,
+                              _("# duplicate fragments received"),
+                              1, GNUNET_NO);
+  }
 
   /* count number of missing fragments */
   bc = 0;
-  for (b=0;b<64;b++)
-    if (0 != (mc->bits & (1LL << b))) bc++;
+  for (b = 0; b < 64; b++)
+    if (0 != (mc->bits & (1LL << b)))
+      bc++;
   if (mc->frag_times_write_offset - mc->frag_times_start_offset > 1)
     dc->latency = estimate_latency (mc);
-  delay = GNUNET_TIME_relative_multiply (dc->latency,
-                                         bc + 1);
-  if ( (0 == mc->bits) || (GNUNET_YES == duplicate) ) /* message complete or duplicate, ACK now! */
+  delay = GNUNET_TIME_relative_multiply (dc->latency, bc + 1);
+  if ((0 == mc->bits) || (GNUNET_YES == duplicate))     /* message complete or duplicate, ACK now! */
     delay = GNUNET_TIME_UNIT_ZERO;
   if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task)
     GNUNET_SCHEDULER_cancel (mc->ack_task);
-  mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay,
-                                               &send_ack,
-                                               mc);
-  if ( (duplicate == GNUNET_NO) &&
-       (0 == mc->bits) )
-    {
-      GNUNET_STATISTICS_update (dc->stats,
-                                _("# messages defragmented"),
-                                1,
-                                GNUNET_NO);
-      /* message complete, notify! */
-      dc->proc (dc->cls,
-                mc->msg);      
-    }
+  mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc);
+  if ((duplicate == GNUNET_NO) && (0 == mc->bits))
+  {
+    GNUNET_STATISTICS_update (dc->stats,
+                              _("# messages defragmented"), 1, GNUNET_NO);
+    /* message complete, notify! */
+    dc->proc (dc->cls, mc->msg);
+  }
   if (duplicate == GNUNET_YES)
     return GNUNET_NO;
   return GNUNET_YES;
 }
 
 /* end of defragmentation.c */
-
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index 81db1b831..d3483fc8d 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -113,7 +113,7 @@ struct GNUNET_FRAGMENT_Context
    * Target fragment size.
    */
   uint16_t mtu;
-  
+
 };
 
 
@@ -124,8 +124,7 @@ struct GNUNET_FRAGMENT_Context
  * @param tc scheduler context
  */
 static void
-transmit_next (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_FRAGMENT_Context *fc = cls;
   char msg[fc->mtu];
@@ -140,56 +139,53 @@ transmit_next (void *cls,
   fc->task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_assert (GNUNET_NO == fc->proc_busy);
   if (0 == fc->acks)
-    return; /* all done */
+    return;                     /* all done */
 
   /* calculate delay */
   wrap = 0;
-  while (0 == (fc->acks & (1LL << fc->next_transmission)))    
-    {
-      fc->next_transmission = (fc->next_transmission + 1) % 64;
-      wrap |= (fc->next_transmission == 0);
-    }
+  while (0 == (fc->acks & (1LL << fc->next_transmission)))
+  {
+    fc->next_transmission = (fc->next_transmission + 1) % 64;
+    wrap |= (fc->next_transmission == 0);
+  }
   bit = fc->next_transmission;
   size = ntohs (fc->msg->size);
   if (bit == size / (fc->mtu - sizeof (struct FragmentHeader)))
-    fsize = size % (fc->mtu - sizeof (struct FragmentHeader)) + sizeof (struct FragmentHeader);
+    fsize =
+        size % (fc->mtu - sizeof (struct FragmentHeader)) +
+        sizeof (struct FragmentHeader);
   else
     fsize = fc->mtu;
   if (fc->tracker != NULL)
-    delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker,
-                                                fsize);
+    delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize);
   else
     delay = GNUNET_TIME_UNIT_ZERO;
   if (delay.rel_value > 0)
-    {
-      fc->task = GNUNET_SCHEDULER_add_delayed (delay,
-                                               &transmit_next,
-                                               fc);
-      return;
-    }
+  {
+    fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc);
+    return;
+  }
   fc->next_transmission = (fc->next_transmission + 1) % 64;
   wrap |= (fc->next_transmission == 0);
 
   /* assemble fragmentation message */
-  mbuf = (const char*) &fc[1];
-  fh = (struct FragmentHeader*) msg;
+  mbuf = (const char *) &fc[1];
+  fh = (struct FragmentHeader *) msg;
   fh->header.size = htons (fsize);
   fh->header.type = htons (GNUNET_MESSAGE_TYPE_FRAGMENT);
   fh->fragment_id = htonl (fc->fragment_id);
-  fh->total_size = fc->msg->size; /* already in big-endian */
+  fh->total_size = fc->msg->size;       /* already in big-endian */
   fh->offset = htons ((fc->mtu - sizeof (struct FragmentHeader)) * bit);
   memcpy (&fh[1],
-          &mbuf[bit * (fc->mtu - sizeof (struct FragmentHeader))], 
-          fsize - sizeof (struct FragmentHeader));
+          &mbuf[bit * (fc->mtu - sizeof (struct FragmentHeader))],
+          fsize - sizeof (struct FragmentHeader));
   if (NULL != fc->tracker)
-    GNUNET_BANDWIDTH_tracker_consume (fc->tracker, fsize);    
+    GNUNET_BANDWIDTH_tracker_consume (fc->tracker, fsize);
   GNUNET_STATISTICS_update (fc->stats,
-                            _("# fragments transmitted"),
-                            1, GNUNET_NO);
+                            _("# fragments transmitted"), 1, GNUNET_NO);
   if (0 != fc->last_round.abs_value)
     GNUNET_STATISTICS_update (fc->stats,
-                              _("# fragments retransmitted"),
-                              1, GNUNET_NO);
+                              _("# fragments retransmitted"), 1, GNUNET_NO);
 
   /* select next message to calculate delay */
   bit = fc->next_transmission;
@@ -199,21 +195,19 @@ transmit_next (void *cls,
   else
     fsize = fc->mtu;
   if (NULL != fc->tracker)
-    delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker,
-                                                fsize);
+    delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize);
   else
     delay = GNUNET_TIME_UNIT_ZERO;
   if (wrap)
-    {
-      /* full round transmitted wait 2x delay for ACK before going again */
-      delay = GNUNET_TIME_relative_max (GNUNET_TIME_relative_multiply (delay, 2),
-                                        fc->delay);
-      /* never use zero, need some time for ACK always */
-      delay = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS,
-                                        delay);
-      fc->last_round = GNUNET_TIME_absolute_get ();
-      fc->wack = GNUNET_YES;
-    }
+  {
+    /* full round transmitted wait 2x delay for ACK before going again */
+    delay = GNUNET_TIME_relative_max (GNUNET_TIME_relative_multiply (delay, 2),
+                                      fc->delay);
+    /* never use zero, need some time for ACK always */
+    delay = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS, delay);
+    fc->last_round = GNUNET_TIME_absolute_get ();
+    fc->wack = GNUNET_YES;
+  }
   fc->proc_busy = GNUNET_YES;
   fc->delay_until = GNUNET_TIME_relative_to_absolute (delay);
   fc->proc (fc->proc_cls, &fh->header);
@@ -240,46 +234,46 @@ transmit_next (void *cls,
  */
 struct GNUNET_FRAGMENT_Context *
 GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats,
-                                uint16_t mtu,
-                                struct GNUNET_BANDWIDTH_Tracker *tracker,
-                                struct GNUNET_TIME_Relative delay,
-                                const struct GNUNET_MessageHeader *msg,
-                                GNUNET_FRAGMENT_MessageProcessor proc,
-                                void *proc_cls)
+                                uint16_t mtu,
+                                struct GNUNET_BANDWIDTH_Tracker *tracker,
+                                struct GNUNET_TIME_Relative delay,
+                                const struct GNUNET_MessageHeader *msg,
+                                GNUNET_FRAGMENT_MessageProcessor proc,
+                                void *proc_cls)
 {
   struct GNUNET_FRAGMENT_Context *fc;
   size_t size;
   uint64_t bits;
-  
-  GNUNET_STATISTICS_update (stats,
-                            _("# messages fragmented"),
-                            1, GNUNET_NO);
+
+  GNUNET_STATISTICS_update (stats, _("# messages fragmented"), 1, GNUNET_NO);
   GNUNET_assert (mtu >= 1024 + sizeof (struct FragmentHeader));
-  size = ntohs (msg->size); 
+  size = ntohs (msg->size);
   GNUNET_STATISTICS_update (stats,
-                            _("# total size of fragmented messages"),
-                            size, GNUNET_NO);
+                            _("# total size of fragmented messages"),
+                            size, GNUNET_NO);
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   fc = GNUNET_malloc (sizeof (struct GNUNET_FRAGMENT_Context) + size);
   fc->stats = stats;
   fc->mtu = mtu;
   fc->tracker = tracker;
   fc->delay = delay;
-  fc->msg = (const struct GNUNET_MessageHeader*)&fc[1];
+  fc->msg = (const struct GNUNET_MessageHeader *) &fc[1];
   fc->proc = proc;
   fc->proc_cls = proc_cls;
   fc->fragment_id = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                              UINT32_MAX);
+                                              UINT32_MAX);
   memcpy (&fc[1], msg, size);
-  bits = (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu - sizeof (struct FragmentHeader));
+  bits =
+      (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu -
+                                                           sizeof (struct
+                                                                   FragmentHeader));
   GNUNET_assert (bits <= 64);
   if (bits == 64)
-    fc->acks_mask = UINT64_MAX;      /* set all 64 bit */
+    fc->acks_mask = UINT64_MAX; /* set all 64 bit */
   else
-    fc->acks_mask = (1LL << bits) - 1; /* set lowest 'bits' bit */
+    fc->acks_mask = (1LL << bits) - 1;  /* set lowest 'bits' bit */
   fc->acks = fc->acks_mask;
-  fc->task = GNUNET_SCHEDULER_add_now (&transmit_next,
-                                       fc);
+  fc->task = GNUNET_SCHEDULER_add_now (&transmit_next, fc);
   return fc;
 }
 
@@ -297,9 +291,9 @@ GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc)
   GNUNET_assert (fc->proc_busy == GNUNET_YES);
   fc->proc_busy = GNUNET_NO;
   GNUNET_assert (fc->task == GNUNET_SCHEDULER_NO_TASK);
-  fc->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (fc->delay_until),
-                                           &transmit_next,
-                                           fc);
+  fc->task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
+                                    (fc->delay_until), &transmit_next, fc);
 }
 
 
@@ -314,72 +308,68 @@ GNUNET_FRAGMENT_context_transmission_done (struct GNUNET_FRAGMENT_Context *fc)
  *         GNUNET_NO if more messages are pending
  *         GNUNET_SYSERR if this ack is not valid for this fc
  */
-int 
+int
 GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
-                             const struct GNUNET_MessageHeader *msg)
+                             const struct GNUNET_MessageHeader *msg)
 {
   const struct FragmentAcknowledgement *fa;
   uint64_t abits;
   struct GNUNET_TIME_Relative ndelay;
 
-  if (sizeof (struct FragmentAcknowledgement) !=
-      ntohs (msg->size))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+  if (sizeof (struct FragmentAcknowledgement) != ntohs (msg->size))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   fa = (const struct FragmentAcknowledgement *) msg;
   if (ntohl (fa->fragment_id) != fc->fragment_id)
-    return GNUNET_SYSERR; /* not our ACK */
+    return GNUNET_SYSERR;       /* not our ACK */
   abits = GNUNET_ntohll (fa->bits);
   if (GNUNET_YES == fc->wack)
-    {
-      /* normal ACK, can update running average of delay... */
-      fc->wack = GNUNET_NO;
-      ndelay = GNUNET_TIME_absolute_get_duration (fc->last_round);
-      fc->delay.rel_value = (ndelay.rel_value + 3 * fc->delay.rel_value) / 4;
-    }
+  {
+    /* normal ACK, can update running average of delay... */
+    fc->wack = GNUNET_NO;
+    ndelay = GNUNET_TIME_absolute_get_duration (fc->last_round);
+    fc->delay.rel_value = (ndelay.rel_value + 3 * fc->delay.rel_value) / 4;
+  }
   GNUNET_STATISTICS_update (fc->stats,
-                            _("# fragment acknowledgements received"),
-                            1,
-                            GNUNET_NO);
+                            _("# fragment acknowledgements received"),
+                            1, GNUNET_NO);
   if (abits != (fc->acks & abits))
-    {
-      /* ID collission or message reordering, count! This should be rare! */
-      GNUNET_STATISTICS_update (fc->stats,
-                                _("# bits removed from fragmentation ACKs"),
-                                1, GNUNET_NO);
-    }
+  {
+    /* ID collission or message reordering, count! This should be rare! */
+    GNUNET_STATISTICS_update (fc->stats,
+                              _("# bits removed from fragmentation ACKs"),
+                              1, GNUNET_NO);
+  }
   fc->acks = abits & fc->acks_mask;
   if (0 != fc->acks)
+  {
+    /* more to transmit, do so right now (if tracker permits...) */
+    if (fc->task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      /* schedule next transmission now, no point in waiting... */
+      GNUNET_SCHEDULER_cancel (fc->task);
+      fc->task = GNUNET_SCHEDULER_add_now (&transmit_next, fc);
+    }
+    else
     {
-      /* more to transmit, do so right now (if tracker permits...) */
-      if (fc->task != GNUNET_SCHEDULER_NO_TASK)
-        {
-          /* schedule next transmission now, no point in waiting... */
-          GNUNET_SCHEDULER_cancel (fc->task);
-          fc->task = GNUNET_SCHEDULER_add_now (&transmit_next,
-                                               fc);
-        }
-      else
-        {
-          /* only case where there is no task should be if we're waiting
-             for the right to transmit again (proc_busy set to YES) */
-          GNUNET_assert (GNUNET_YES == fc->proc_busy);
-        }
-      return GNUNET_NO;
+      /* only case where there is no task should be if we're waiting
+       * for the right to transmit again (proc_busy set to YES) */
+      GNUNET_assert (GNUNET_YES == fc->proc_busy);
     }
+    return GNUNET_NO;
+  }
 
   /* all done */
   GNUNET_STATISTICS_update (fc->stats,
-                            _("# fragmentation transmissions completed"),
-                            1,
-                            GNUNET_NO);
+                            _("# fragmentation transmissions completed"),
+                            1, GNUNET_NO);
   if (fc->task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (fc->task);
-      fc->task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (fc->task);
+    fc->task = GNUNET_SCHEDULER_NO_TASK;
+  }
   return GNUNET_OK;
 }
 
@@ -406,4 +396,3 @@ GNUNET_FRAGMENT_context_destroy (struct GNUNET_FRAGMENT_Context *fc)
 
 
 /* end of fragmentation.c */
-
diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c
index 25f1c2053..b534a134e 100644
--- a/src/fragmentation/test_fragmentation.c
+++ b/src/fragmentation/test_fragmentation.c
@@ -44,7 +44,7 @@
  */
 #define DROPRATE 10
 
-static int ret = 1; 
+static int ret = 1;
 
 static unsigned int dups;
 
@@ -63,18 +63,17 @@ static struct GNUNET_BANDWIDTH_Tracker trackers[NUM_MSGS];
 static struct GNUNET_FRAGMENT_Context *frags[NUM_MSGS];
 
 static void
-proc_msgs (void *cls,
-           const struct GNUNET_MessageHeader *hdr)
+proc_msgs (void *cls, const struct GNUNET_MessageHeader *hdr)
 {
   static unsigned int total;
   unsigned int i;
   const char *buf;
 
 #if DETAILS
-  fprintf (stderr, "!"); /* message complete, good! */
+  fprintf (stderr, "!");        /* message complete, good! */
 #endif
-  buf = (const char*) hdr;
-  for (i=sizeof (struct GNUNET_MessageHeader);i<ntohs(hdr->size);i++)
+  buf = (const char *) hdr;
+  for (i = sizeof (struct GNUNET_MessageHeader); i < ntohs (hdr->size); i++)
     GNUNET_assert (buf[i] == (char) i);
   total++;
 #if ! DETAILS
@@ -83,18 +82,18 @@ proc_msgs (void *cls,
 #endif
   /* tolerate 10% loss, i.e. due to duplicate fragment IDs */
   if (total >= NUM_MSGS - (NUM_MSGS / 10))
+  {
+    ret = 0;
+    GNUNET_DEFRAGMENT_context_destroy (defrag);
+    defrag = NULL;
+    for (i = 0; i < NUM_MSGS; i++)
     {
-      ret = 0;
-      GNUNET_DEFRAGMENT_context_destroy (defrag);
-      defrag = NULL;
-      for (i=0;i<NUM_MSGS;i++)
-        {
-          if (frags[i] == NULL)
-            continue;
-          GNUNET_FRAGMENT_context_destroy (frags[i]);
-          frags[i] = NULL;
-        }
+      if (frags[i] == NULL)
+        continue;
+      GNUNET_FRAGMENT_context_destroy (frags[i]);
+      frags[i] = NULL;
     }
+  }
 }
 
 
@@ -102,45 +101,42 @@ proc_msgs (void *cls,
  * Process ACK (by passing to fragmenter)
  */
 static void
-proc_acks (void *cls,
-           uint32_t msg_id,
-           const struct GNUNET_MessageHeader *hdr)
+proc_acks (void *cls, uint32_t msg_id, const struct GNUNET_MessageHeader *hdr)
 {
   unsigned int i;
   int ret;
 
   if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, DROPRATE))
-    {                                           
-      ack_drops++;
-      return; /* random drop */
-    }
-  for (i=0;i<NUM_MSGS;i++)
+  {
+    ack_drops++;
+    return;                     /* random drop */
+  }
+  for (i = 0; i < NUM_MSGS; i++)
+  {
+    if (frags[i] == NULL)
+      continue;
+    ret = GNUNET_FRAGMENT_process_ack (frags[i], hdr);
+    if (ret == GNUNET_OK)
     {
-      if (frags[i] == NULL)
-        continue;     
-      ret = GNUNET_FRAGMENT_process_ack (frags[i],
-                                         hdr);
-      if (ret == GNUNET_OK)
-        {
 #if DETAILS
-          fprintf (stderr, "@"); /* good ACK */
+      fprintf (stderr, "@");    /* good ACK */
 #endif
-          GNUNET_FRAGMENT_context_destroy (frags[i]);
-          frags[i] = NULL;
-          acks++;
-          return;
-        }
-      if (ret == GNUNET_NO)
-        {
+      GNUNET_FRAGMENT_context_destroy (frags[i]);
+      frags[i] = NULL;
+      acks++;
+      return;
+    }
+    if (ret == GNUNET_NO)
+    {
 #if DETAILS
-          fprintf (stderr, "@"); /* good ACK */
+      fprintf (stderr, "@");    /* good ACK */
 #endif
-          acks++;
-          return;
-        }
+      acks++;
+      return;
     }
+  }
 #if DETAILS
-  fprintf (stderr, "_"); /* BAD: ack that nobody feels responsible for... */
+  fprintf (stderr, "_");        /* BAD: ack that nobody feels responsible for... */
 #endif
 }
 
@@ -149,38 +145,37 @@ proc_acks (void *cls,
  * Process fragment (by passing to defrag).
  */
 static void
-proc_frac (void *cls,
-           const struct GNUNET_MessageHeader *hdr)
+proc_frac (void *cls, const struct GNUNET_MessageHeader *hdr)
 {
   struct GNUNET_FRAGMENT_Context **fc = cls;
   int ret;
 
   GNUNET_FRAGMENT_context_transmission_done (*fc);
   if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, DROPRATE))
-    {
-      frag_drops++;
-      return; /* random drop */
-    }
+  {
+    frag_drops++;
+    return;                     /* random drop */
+  }
   if (NULL == defrag)
-    {
-      fprintf (stderr, "E"); /* Error: frag after shutdown!? */
-      return;
-    }
+  {
+    fprintf (stderr, "E");      /* Error: frag after shutdown!? */
+    return;
+  }
   ret = GNUNET_DEFRAGMENT_process_fragment (defrag, hdr);
   if (ret == GNUNET_NO)
-    {
+  {
 #if DETAILS
-      fprintf (stderr, "?"); /* duplicate fragment */
+    fprintf (stderr, "?");      /* duplicate fragment */
 #endif
-      dups++;
-    }
+    dups++;
+  }
   else if (ret == GNUNET_OK)
-    {
+  {
 #if DETAILS
-      fprintf (stderr, "."); /* good fragment */
+    fprintf (stderr, ".");      /* good fragment */
 #endif
-      fragc++;
-    }
+    fragc++;
+  }
 }
 
 
@@ -196,27 +191,22 @@ run (void *cls,
   struct GNUNET_MessageHeader *msg;
   char buf[MTU + 32 * 1024];
 
-  defrag = GNUNET_DEFRAGMENT_context_create (NULL,
-                                             MTU,
-                                             NUM_MSGS /* enough space for all */,
-                                             NULL,
-                                             &proc_msgs,
-                                             &proc_acks);
-  for (i=0;i<sizeof(buf);i++)
+  defrag = GNUNET_DEFRAGMENT_context_create (NULL, MTU, NUM_MSGS        /* enough space for all */
+                                             , NULL, &proc_msgs, &proc_acks);
+  for (i = 0; i < sizeof (buf); i++)
     buf[i] = (char) i;
-  msg = (struct GNUNET_MessageHeader* ) buf;
-  for (i=0;i<NUM_MSGS;i++)
-    {
-      msg->type = htons ((uint16_t) i);
-      msg->size = htons (sizeof (struct GNUNET_MessageHeader) + (17 * i) % (32 * 1024));
-      frags[i] = GNUNET_FRAGMENT_context_create (NULL /* no stats */, 
-                                                 MTU,
-                                                 &trackers[i],
-                                                 GNUNET_TIME_UNIT_SECONDS,
-                                                 msg,
-                                                 &proc_frac,
-                                                 &frags[i]);
-    }
+  msg = (struct GNUNET_MessageHeader *) buf;
+  for (i = 0; i < NUM_MSGS; i++)
+  {
+    msg->type = htons ((uint16_t) i);
+    msg->size =
+        htons (sizeof (struct GNUNET_MessageHeader) + (17 * i) % (32 * 1024));
+    frags[i] = GNUNET_FRAGMENT_context_create (NULL /* no stats */ ,
+                                               MTU,
+                                               &trackers[i],
+                                               GNUNET_TIME_UNIT_SECONDS,
+                                               msg, &proc_frac, &frags[i]);
+  }
 }
 
 
@@ -247,16 +237,14 @@ main (int argc, char *argv[])
                     "WARNING",
 #endif
                     NULL);
-  for (i=0;i<NUM_MSGS;i++)
+  for (i = 0; i < NUM_MSGS; i++)
     GNUNET_BANDWIDTH_tracker_init (&trackers[i],
-                                   GNUNET_BANDWIDTH_value_init ((i+1) * 1024),
-                                   100);
-  GNUNET_PROGRAM_run (5, argv_prog, "test-fragmentation", "nohelp", options, &run, NULL);
-  fprintf (stderr, 
-           "\nHad %u good fragments, %u duplicate fragments, %u acks and %u simulated drops of acks\n",
-           fragc,
-           dups,
-           acks,
-           ack_drops);
+                                   GNUNET_BANDWIDTH_value_init ((i + 1) * 1024),
+                                   100);
+  GNUNET_PROGRAM_run (5, argv_prog, "test-fragmentation", "nohelp", options,
+                      &run, NULL);
+  fprintf (stderr,
+           "\nHad %u good fragments, %u duplicate fragments, %u acks and %u simulated drops of acks\n",
+           fragc, dups, acks, ack_drops);
   return ret;
 }