1 files changed, 162 insertions, 161 deletions

diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c
index 03c02ff75..b27590a6f 100644
--- a/src/transport/tcp_server_mst_legacy.c
+++ b/src/transport/tcp_server_mst_legacy.c
@@ -38,7 +38,8 @@
 /**
  * Handle to a message stream tokenizer.
  */
-struct GNUNET_SERVER_MessageStreamTokenizer {
+struct GNUNET_SERVER_MessageStreamTokenizer
+{
   /**
    * Function to call on completed messages.
    */
@@ -80,13 +81,13 @@ struct GNUNET_SERVER_MessageStreamTokenizer {
  * @return handle to tokenizer
  */
 struct GNUNET_SERVER_MessageStreamTokenizer *
-GNUNET_SERVER_mst_create(GNUNET_SERVER_MessageTokenizerCallback cb,
-                         void *cb_cls)
+GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb,
+                          void *cb_cls)
 {
   struct GNUNET_SERVER_MessageStreamTokenizer *ret;
 
-  ret = GNUNET_new(struct GNUNET_SERVER_MessageStreamTokenizer);
-  ret->hdr = GNUNET_malloc(GNUNET_MIN_MESSAGE_SIZE);
+  ret = GNUNET_new (struct GNUNET_SERVER_MessageStreamTokenizer);
+  ret->hdr = GNUNET_malloc (GNUNET_MIN_MESSAGE_SIZE);
   ret->curr_buf = GNUNET_MIN_MESSAGE_SIZE;
   ret->cb = cb;
   ret->cb_cls = cb_cls;
@@ -110,10 +111,10 @@ GNUNET_SERVER_mst_create(GNUNET_SERVER_MessageTokenizerCallback cb,
  *         #GNUNET_SYSERR if the data stream is corrupt
  */
 int
-GNUNET_SERVER_mst_receive(struct GNUNET_SERVER_MessageStreamTokenizer *mst,
-                          void *client_identity,
-                          const char *buf, size_t size,
-                          int purge, int one_shot)
+GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
+                           void *client_identity,
+                           const char *buf, size_t size,
+                           int purge, int one_shot)
 {
   const struct GNUNET_MessageHeader *hdr;
   size_t delta;
@@ -123,170 +124,170 @@ GNUNET_SERVER_mst_receive(struct GNUNET_SERVER_MessageStreamTokenizer *mst,
   unsigned long offset;
   int ret;
 
-  GNUNET_assert(mst->off <= mst->pos);
-  GNUNET_assert(mst->pos <= mst->curr_buf);
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Server-mst receives %u bytes with %u bytes already in private buffer\n",
-      (unsigned int)size, (unsigned int)(mst->pos - mst->off));
+  GNUNET_assert (mst->off <= mst->pos);
+  GNUNET_assert (mst->pos <= mst->curr_buf);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Server-mst receives %u bytes with %u bytes already in private buffer\n",
+       (unsigned int) size, (unsigned int) (mst->pos - mst->off));
   ret = GNUNET_OK;
-  ibuf = (char *)mst->hdr;
+  ibuf = (char *) mst->hdr;
   while (mst->pos > 0)
-    {
+  {
 do_align:
-      GNUNET_assert(mst->pos >= mst->off);
-      if ((mst->curr_buf - mst->off < sizeof(struct GNUNET_MessageHeader)) ||
-          (0 != (mst->off % ALIGN_FACTOR)))
-        {
-          /* need to align or need more space */
-          mst->pos -= mst->off;
-          memmove(ibuf, &ibuf[mst->off], mst->pos);
-          mst->off = 0;
-        }
-      if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-        {
-          delta =
-            GNUNET_MIN(sizeof(struct GNUNET_MessageHeader) -
-                       (mst->pos - mst->off), size);
-          GNUNET_memcpy(&ibuf[mst->pos], buf, delta);
-          mst->pos += delta;
-          buf += delta;
-          size -= delta;
-        }
-      if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
-        {
-          if (purge)
-            {
-              mst->off = 0;
-              mst->pos = 0;
-            }
-          return GNUNET_OK;
-        }
-      hdr = (const struct GNUNET_MessageHeader *)&ibuf[mst->off];
-      want = ntohs(hdr->size);
+    GNUNET_assert (mst->pos >= mst->off);
+    if ((mst->curr_buf - mst->off < sizeof(struct GNUNET_MessageHeader)) ||
+        (0 != (mst->off % ALIGN_FACTOR)))
+    {
+      /* need to align or need more space */
+      mst->pos -= mst->off;
+      memmove (ibuf, &ibuf[mst->off], mst->pos);
+      mst->off = 0;
+    }
+    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
+    {
+      delta =
+        GNUNET_MIN (sizeof(struct GNUNET_MessageHeader)
+                    - (mst->pos - mst->off), size);
+      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
+      mst->pos += delta;
+      buf += delta;
+      size -= delta;
+    }
+    if (mst->pos - mst->off < sizeof(struct GNUNET_MessageHeader))
+    {
+      if (purge)
+      {
+        mst->off = 0;
+        mst->pos = 0;
+      }
+      return GNUNET_OK;
+    }
+    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
+    want = ntohs (hdr->size);
+    if (want < sizeof(struct GNUNET_MessageHeader))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    if ((mst->curr_buf - mst->off < want) &&
+        (mst->off > 0))
+    {
+      /* can get more space by moving */
+      mst->pos -= mst->off;
+      memmove (ibuf, &ibuf[mst->off], mst->pos);
+      mst->off = 0;
+    }
+    if (mst->curr_buf < want)
+    {
+      /* need to get more space by growing buffer */
+      GNUNET_assert (0 == mst->off);
+      mst->hdr = GNUNET_realloc (mst->hdr, want);
+      ibuf = (char *) mst->hdr;
+      mst->curr_buf = want;
+    }
+    hdr = (const struct GNUNET_MessageHeader *) &ibuf[mst->off];
+    if (mst->pos - mst->off < want)
+    {
+      delta = GNUNET_MIN (want - (mst->pos - mst->off), size);
+      GNUNET_assert (mst->pos + delta <= mst->curr_buf);
+      GNUNET_memcpy (&ibuf[mst->pos], buf, delta);
+      mst->pos += delta;
+      buf += delta;
+      size -= delta;
+    }
+    if (mst->pos - mst->off < want)
+    {
+      if (purge)
+      {
+        mst->off = 0;
+        mst->pos = 0;
+      }
+      return GNUNET_OK;
+    }
+    if (one_shot == GNUNET_SYSERR)
+    {
+      /* cannot call callback again, but return value saying that
+       * we have another full message in the buffer */
+      ret = GNUNET_NO;
+      goto copy;
+    }
+    if (one_shot == GNUNET_YES)
+      one_shot = GNUNET_SYSERR;
+    mst->off += want;
+    if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
+      return GNUNET_SYSERR;
+    if (mst->off == mst->pos)
+    {
+      /* reset to beginning of buffer, it's free right now! */
+      mst->off = 0;
+      mst->pos = 0;
+    }
+  }
+  GNUNET_assert (0 == mst->pos);
+  while (size > 0)
+  {
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Server-mst has %u bytes left in inbound buffer\n",
+         (unsigned int) size);
+    if (size < sizeof(struct GNUNET_MessageHeader))
+      break;
+    offset = (unsigned long) buf;
+    need_align = (0 != (offset % ALIGN_FACTOR)) ? GNUNET_YES : GNUNET_NO;
+    if (GNUNET_NO == need_align)
+    {
+      /* can try to do zero-copy and process directly from original buffer */
+      hdr = (const struct GNUNET_MessageHeader *) buf;
+      want = ntohs (hdr->size);
       if (want < sizeof(struct GNUNET_MessageHeader))
-        {
-          GNUNET_break_op(0);
-          return GNUNET_SYSERR;
-        }
-      if ((mst->curr_buf - mst->off < want) &&
-          (mst->off > 0))
-        {
-          /* can get more space by moving */
-          mst->pos -= mst->off;
-          memmove(ibuf, &ibuf[mst->off], mst->pos);
-          mst->off = 0;
-        }
-      if (mst->curr_buf < want)
-        {
-          /* need to get more space by growing buffer */
-          GNUNET_assert(0 == mst->off);
-          mst->hdr = GNUNET_realloc(mst->hdr, want);
-          ibuf = (char *)mst->hdr;
-          mst->curr_buf = want;
-        }
-      hdr = (const struct GNUNET_MessageHeader *)&ibuf[mst->off];
-      if (mst->pos - mst->off < want)
-        {
-          delta = GNUNET_MIN(want - (mst->pos - mst->off), size);
-          GNUNET_assert(mst->pos + delta <= mst->curr_buf);
-          GNUNET_memcpy(&ibuf[mst->pos], buf, delta);
-          mst->pos += delta;
-          buf += delta;
-          size -= delta;
-        }
-      if (mst->pos - mst->off < want)
-        {
-          if (purge)
-            {
-              mst->off = 0;
-              mst->pos = 0;
-            }
-          return GNUNET_OK;
-        }
+      {
+        GNUNET_break_op (0);
+        mst->off = 0;
+        return GNUNET_SYSERR;
+      }
+      if (size < want)
+        break;                  /* or not: buffer incomplete, so copy to private buffer... */
       if (one_shot == GNUNET_SYSERR)
-        {
-          /* cannot call callback again, but return value saying that
-           * we have another full message in the buffer */
-          ret = GNUNET_NO;
-          goto copy;
-        }
+      {
+        /* cannot call callback again, but return value saying that
+         * we have another full message in the buffer */
+        ret = GNUNET_NO;
+        goto copy;
+      }
       if (one_shot == GNUNET_YES)
         one_shot = GNUNET_SYSERR;
-      mst->off += want;
-      if (GNUNET_SYSERR == mst->cb(mst->cb_cls, client_identity, hdr))
+      if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
         return GNUNET_SYSERR;
-      if (mst->off == mst->pos)
-        {
-          /* reset to beginning of buffer, it's free right now! */
-          mst->off = 0;
-          mst->pos = 0;
-        }
+      buf += want;
+      size -= want;
     }
-  GNUNET_assert(0 == mst->pos);
-  while (size > 0)
+    else
     {
-      LOG(GNUNET_ERROR_TYPE_DEBUG,
-          "Server-mst has %u bytes left in inbound buffer\n",
-          (unsigned int)size);
-      if (size < sizeof(struct GNUNET_MessageHeader))
-        break;
-      offset = (unsigned long)buf;
-      need_align = (0 != (offset % ALIGN_FACTOR)) ? GNUNET_YES : GNUNET_NO;
-      if (GNUNET_NO == need_align)
-        {
-          /* can try to do zero-copy and process directly from original buffer */
-          hdr = (const struct GNUNET_MessageHeader *)buf;
-          want = ntohs(hdr->size);
-          if (want < sizeof(struct GNUNET_MessageHeader))
-            {
-              GNUNET_break_op(0);
-              mst->off = 0;
-              return GNUNET_SYSERR;
-            }
-          if (size < want)
-            break;              /* or not: buffer incomplete, so copy to private buffer... */
-          if (one_shot == GNUNET_SYSERR)
-            {
-              /* cannot call callback again, but return value saying that
-               * we have another full message in the buffer */
-              ret = GNUNET_NO;
-              goto copy;
-            }
-          if (one_shot == GNUNET_YES)
-            one_shot = GNUNET_SYSERR;
-          if (GNUNET_SYSERR == mst->cb(mst->cb_cls, client_identity, hdr))
-            return GNUNET_SYSERR;
-          buf += want;
-          size -= want;
-        }
-      else
-        {
-          /* need to copy to private buffer to align;
-           * yes, we go a bit more spagetti than usual here */
-          goto do_align;
-        }
+      /* need to copy to private buffer to align;
+       * yes, we go a bit more spagetti than usual here */
+      goto do_align;
     }
+  }
 copy:
-  if ((size > 0) && (!purge))
+  if ((size > 0) && (! purge))
+  {
+    if (size + mst->pos > mst->curr_buf)
     {
-      if (size + mst->pos > mst->curr_buf)
-        {
-          mst->hdr = GNUNET_realloc(mst->hdr, size + mst->pos);
-          ibuf = (char *)mst->hdr;
-          mst->curr_buf = size + mst->pos;
-        }
-      GNUNET_assert(size + mst->pos <= mst->curr_buf);
-      GNUNET_memcpy(&ibuf[mst->pos], buf, size);
-      mst->pos += size;
+      mst->hdr = GNUNET_realloc (mst->hdr, size + mst->pos);
+      ibuf = (char *) mst->hdr;
+      mst->curr_buf = size + mst->pos;
     }
+    GNUNET_assert (size + mst->pos <= mst->curr_buf);
+    GNUNET_memcpy (&ibuf[mst->pos], buf, size);
+    mst->pos += size;
+  }
   if (purge)
-    {
-      mst->off = 0;
-      mst->pos = 0;
-    }
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Server-mst leaves %u bytes in private buffer\n",
-      (unsigned int)(mst->pos - mst->off));
+  {
+    mst->off = 0;
+    mst->pos = 0;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Server-mst leaves %u bytes in private buffer\n",
+       (unsigned int) (mst->pos - mst->off));
   return ret;
 }
 
@@ -297,10 +298,10 @@ copy:
  * @param mst tokenizer to destroy
  */
 void
-GNUNET_SERVER_mst_destroy(struct GNUNET_SERVER_MessageStreamTokenizer *mst)
+GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst)
 {
-  GNUNET_free(mst->hdr);
-  GNUNET_free(mst);
+  GNUNET_free (mst->hdr);
+  GNUNET_free (mst);
 }