1 files changed, 126 insertions, 136 deletions

diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index 56d79c18e..f8e300029 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -44,12 +44,12 @@ struct PendingMessageList
 
   /**
    * This is a doubly-linked list.
-   */ 
+   */
   struct PendingMessageList *next;
 
   /**
    * This is a doubly-linked list.
-   */ 
+   */
   struct PendingMessageList *prev;
 
   /**
@@ -60,7 +60,7 @@ struct PendingMessageList
 
   /**
    * Can this message be dropped?
-   */ 
+   */
   int can_drop;
 
 };
@@ -74,7 +74,7 @@ struct ClientList
 
   /**
    * This is a linked list.
-   */ 
+   */
   struct ClientList *next;
 
   /**
@@ -94,12 +94,12 @@ struct ClientList
 
   /**
    * Head of linked list of requests queued for transmission.
-   */ 
+   */
   struct PendingMessageList *pending_head;
 
   /**
    * Tail of linked list of requests queued for transmission.
-   */ 
+   */
   struct PendingMessageList *pending_tail;
 
   /**
@@ -146,8 +146,7 @@ struct GNUNET_SERVER_NotificationContext
  * @param client handle of client that disconnected
  */
 static void
-handle_client_disconnect (void *cls,
-                          struct GNUNET_SERVER_Client *client)
+handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
 {
   struct GNUNET_SERVER_NotificationContext *nc = cls;
   struct ClientList *pos;
@@ -155,42 +154,40 @@ handle_client_disconnect (void *cls,
   struct PendingMessageList *pml;
 
   if (client == NULL)
-    {
-      nc->server = NULL;
-      return;
-    }
+  {
+    nc->server = NULL;
+    return;
+  }
   prev = NULL;
   pos = nc->clients;
   while (NULL != pos)
-    {
-      if (pos->client == client)
-        break;
-      prev = pos;
-      pos = pos->next;
-    }
+  {
+    if (pos->client == client)
+      break;
+    prev = pos;
+    pos = pos->next;
+  }
   if (pos == NULL)
     return;
 #if DEBUG_SERVER_NC
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Client disconnected, cleaning up %u messages in NC queue\n",
-              pos->num_pending);
+              "Client disconnected, cleaning up %u messages in NC queue\n",
+              pos->num_pending);
 #endif
   if (prev == NULL)
     nc->clients = pos->next;
   else
     prev->next = pos->next;
   while (NULL != (pml = pos->pending_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (pos->pending_head,
-                                   pos->pending_tail,
-                                   pml);
-      GNUNET_free (pml);
-    }
+  {
+    GNUNET_CONTAINER_DLL_remove (pos->pending_head, pos->pending_tail, pml);
+    GNUNET_free (pml);
+  }
   if (pos->th != NULL)
-    {
-      GNUNET_CONNECTION_notify_transmit_ready_cancel (pos->th);
-      pos->th = NULL;
-    }
+  {
+    GNUNET_CONNECTION_notify_transmit_ready_cancel (pos->th);
+    pos->th = NULL;
+  }
   GNUNET_SERVER_client_drop (client);
   GNUNET_free (pos);
 }
@@ -207,16 +204,14 @@ handle_client_disconnect (void *cls,
  */
 struct GNUNET_SERVER_NotificationContext *
 GNUNET_SERVER_notification_context_create (struct GNUNET_SERVER_Handle *server,
-                                           unsigned int queue_length)
+                                           unsigned int queue_length)
 {
   struct GNUNET_SERVER_NotificationContext *ret;
 
   ret = GNUNET_malloc (sizeof (struct GNUNET_SERVER_NotificationContext));
   ret->server = server;
   ret->queue_length = queue_length;
-  GNUNET_SERVER_disconnect_notify (server,
-                                   &handle_client_disconnect,
-                                   ret);
+  GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, ret);
   return ret;
 }
 
@@ -227,28 +222,27 @@ GNUNET_SERVER_notification_context_create (struct GNUNET_SERVER_Handle *server,
  * @param nc context to destroy.
  */
 void
-GNUNET_SERVER_notification_context_destroy (struct GNUNET_SERVER_NotificationContext *nc)
+GNUNET_SERVER_notification_context_destroy (struct
+                                            GNUNET_SERVER_NotificationContext
+                                            *nc)
 {
   struct ClientList *pos;
   struct PendingMessageList *pml;
 
   while (NULL != (pos = nc->clients))
+  {
+    nc->clients = pos->next;
+    GNUNET_SERVER_client_drop (pos->client);
+    while (NULL != (pml = pos->pending_head))
     {
-      nc->clients = pos->next;
-      GNUNET_SERVER_client_drop (pos->client); 
-      while (NULL != (pml = pos->pending_head))
-        {
-          GNUNET_CONTAINER_DLL_remove (pos->pending_head,
-                                       pos->pending_tail,
-                                       pml);
-          GNUNET_free (pml);
-        }
-      GNUNET_free (pos);
+      GNUNET_CONTAINER_DLL_remove (pos->pending_head, pos->pending_tail, pml);
+      GNUNET_free (pml);
     }
+    GNUNET_free (pos);
+  }
   if (nc->server != NULL)
     GNUNET_SERVER_disconnect_notify_cancel (nc->server,
-                                            &handle_client_disconnect,
-                                            nc);
+                                            &handle_client_disconnect, nc);
   GNUNET_free (nc);
 }
 
@@ -260,8 +254,9 @@ GNUNET_SERVER_notification_context_destroy (struct GNUNET_SERVER_NotificationCon
  * @param client client to add
  */
 void
-GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext *nc,
-                                        struct GNUNET_SERVER_Client *client)
+GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext
+                                        *nc,
+                                        struct GNUNET_SERVER_Client *client)
 {
   struct ClientList *cl;
 
@@ -285,9 +280,7 @@ GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext
  * @return number of bytes written to buf
  */
 static size_t
-transmit_message (void *cls,
-                  size_t size,
-                  void *buf)
+transmit_message (void *cls, size_t size, void *buf)
 {
   struct ClientList *cl = cls;
   char *cbuf = buf;
@@ -297,48 +290,44 @@ transmit_message (void *cls,
 
   cl->th = NULL;
   if (buf == NULL)
-    {
-      /* 'cl' should be freed via disconnect notification shortly */
+  {
+    /* 'cl' should be freed via disconnect notification shortly */
 #if DEBUG_SERVER_NC
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Failed to transmit message from NC queue to client\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Failed to transmit message from NC queue to client\n");
 #endif
-      return 0;
-    }
+    return 0;
+  }
   ret = 0;
-  while (NULL != (pml = cl->pending_head) )
-    {
-      msize = ntohs (pml->msg->size);
-      if (size < msize)
-        break;
-      GNUNET_CONTAINER_DLL_remove (cl->pending_head,
-                                   cl->pending_tail,
-                                   pml);
+  while (NULL != (pml = cl->pending_head))
+  {
+    msize = ntohs (pml->msg->size);
+    if (size < msize)
+      break;
+    GNUNET_CONTAINER_DLL_remove (cl->pending_head, cl->pending_tail, pml);
 #if DEBUG_SERVER_NC
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Copying message of type %u and size %u from pending queue to transmission buffer\n",
-                  ntohs (pml->msg->type),
-                  msize);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Copying message of type %u and size %u from pending queue to transmission buffer\n",
+                ntohs (pml->msg->type), msize);
 #endif
-      memcpy (&cbuf[ret], pml->msg, msize);
-      ret += msize;
-      size -= msize;
-      GNUNET_free (pml);
-      cl->num_pending--;
-    }
-  if (pml != NULL)    
-    {
+    memcpy (&cbuf[ret], pml->msg, msize);
+    ret += msize;
+    size -= msize;
+    GNUNET_free (pml);
+    cl->num_pending--;
+  }
+  if (pml != NULL)
+  {
 #if DEBUG_SERVER_NC
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Have %u messages left in NC queue, will try transmission again\n",
-                  cl->num_pending);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Have %u messages left in NC queue, will try transmission again\n",
+                cl->num_pending);
 #endif
-      cl->th = GNUNET_SERVER_notify_transmit_ready (cl->client,
-                                                    ntohs (pml->msg->size),
-                                                    GNUNET_TIME_UNIT_FOREVER_REL,
-                                                    &transmit_message,
-                                                    cl);
-    }
+    cl->th = GNUNET_SERVER_notify_transmit_ready (cl->client,
+                                                  ntohs (pml->msg->size),
+                                                  GNUNET_TIME_UNIT_FOREVER_REL,
+                                                  &transmit_message, cl);
+  }
   else
     GNUNET_assert (cl->num_pending == 0);
   return ret;
@@ -355,52 +344,49 @@ transmit_message (void *cls,
  */
 static void
 do_unicast (struct GNUNET_SERVER_NotificationContext *nc,
-            struct ClientList *client,
-            const struct GNUNET_MessageHeader *msg,
-            int can_drop)
+            struct ClientList *client,
+            const struct GNUNET_MessageHeader *msg, int can_drop)
 {
   struct PendingMessageList *pml;
   uint16_t size;
 
-  if ( (client->num_pending > nc->queue_length) &&
-       (GNUNET_YES == can_drop) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Dropping message of type %u and size %u due to full queue (%u entries)\n",
-                  ntohs (msg->type),
-                  ntohs (msg->size),
-                  (unsigned int) nc->queue_length);
-      return; /* drop! */
-    }
+  if ((client->num_pending > nc->queue_length) && (GNUNET_YES == can_drop))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Dropping message of type %u and size %u due to full queue (%u entries)\n",
+                ntohs (msg->type),
+                ntohs (msg->size), (unsigned int) nc->queue_length);
+    return;                     /* drop! */
+  }
   if (client->num_pending > nc->queue_length)
-    {
-      /* FIXME: consider checking for other messages in the
-         queue that are 'droppable' */
-    }
+  {
+    /* FIXME: consider checking for other messages in the
+     * queue that are 'droppable' */
+  }
   client->num_pending++;
   size = ntohs (msg->size);
   pml = GNUNET_malloc (sizeof (struct PendingMessageList) + size);
-  pml->msg = (const struct GNUNET_MessageHeader*) &pml[1];
-  pml->can_drop = can_drop; 
+  pml->msg = (const struct GNUNET_MessageHeader *) &pml[1];
+  pml->can_drop = can_drop;
 #if DEBUG_SERVER_NC
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding message of type %u and size %u to pending queue (which has %u entries)\n",
-              ntohs (msg->type),
-              ntohs (msg->size),
-              (unsigned int) nc->queue_length);
+              "Adding message of type %u and size %u to pending queue (which has %u entries)\n",
+              ntohs (msg->type),
+              ntohs (msg->size), (unsigned int) nc->queue_length);
 #endif
   memcpy (&pml[1], msg, size);
   /* append */
   GNUNET_CONTAINER_DLL_insert_tail (client->pending_head,
-                                    client->pending_tail,
-                                    pml);
+                                    client->pending_tail, pml);
   if (client->th == NULL)
     client->th = GNUNET_SERVER_notify_transmit_ready (client->client,
-                                                      ntohs (client->pending_head->msg->size),
-                                                      GNUNET_TIME_UNIT_FOREVER_REL,
-                                                      &transmit_message,
-                                                      client);
-} 
+                                                      ntohs
+                                                      (client->pending_head->
+                                                       msg->size),
+                                                      GNUNET_TIME_UNIT_FOREVER_REL,
+                                                      &transmit_message,
+                                                      client);
+}
 
 
 /**
@@ -413,22 +399,24 @@ do_unicast (struct GNUNET_SERVER_NotificationContext *nc,
  * @param can_drop can this message be dropped due to queue length limitations
  */
 void
-GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationContext *nc,
-                                            struct GNUNET_SERVER_Client *client,
-                                            const struct GNUNET_MessageHeader *msg,
-                                            int can_drop)
+GNUNET_SERVER_notification_context_unicast (struct
+                                            GNUNET_SERVER_NotificationContext
+                                            *nc,
+                                            struct GNUNET_SERVER_Client *client,
+                                            const struct GNUNET_MessageHeader
+                                            *msg, int can_drop)
 {
   struct ClientList *pos;
-  
+
   pos = nc->clients;
   while (NULL != pos)
-    {
-      if (pos->client == client)
-        break;
-      pos = pos->next;
-    }
+  {
+    if (pos->client == client)
+      break;
+    pos = pos->next;
+  }
   GNUNET_assert (pos != NULL);
-  do_unicast (nc, pos, msg, can_drop); 
+  do_unicast (nc, pos, msg, can_drop);
 }
 
 
@@ -440,18 +428,20 @@ GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationCon
  * @param can_drop can this message be dropped due to queue length limitations
  */
 void
-GNUNET_SERVER_notification_context_broadcast (struct GNUNET_SERVER_NotificationContext *nc,
-                                              const struct GNUNET_MessageHeader *msg,
-                                              int can_drop)
+GNUNET_SERVER_notification_context_broadcast (struct
+                                              GNUNET_SERVER_NotificationContext
+                                              *nc,
+                                              const struct GNUNET_MessageHeader
+                                              *msg, int can_drop)
 {
   struct ClientList *pos;
-  
+
   pos = nc->clients;
   while (NULL != pos)
-    {
-      do_unicast (nc, pos, msg, can_drop);
-      pos = pos->next;
-    }
+  {
+    do_unicast (nc, pos, msg, can_drop);
+    pos = pos->next;
+  }
 }