indentation

1 files changed, 99 insertions, 110 deletions

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 */
-