1 files changed, 129 insertions, 70 deletions

diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
index fb4e11fd4..2c8b27bf8 100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/messenger/messenger_api_room.c
@@ -32,14 +32,15 @@ struct GNUNET_MESSENGER_Room*
 create_room (struct GNUNET_MESSENGER_Handle *handle,
              const struct GNUNET_HashCode *key)
 {
-  GNUNET_assert((handle) && (key));
+  GNUNET_assert ((handle) && (key));
 
-  struct GNUNET_MESSENGER_Room *room = GNUNET_new(struct GNUNET_MESSENGER_Room);
+  struct GNUNET_MESSENGER_Room *room = GNUNET_new (struct
+                                                   GNUNET_MESSENGER_Room);
 
   room->handle = handle;
-  GNUNET_memcpy(&(room->key), key, sizeof(*key));
+  GNUNET_memcpy (&(room->key), key, sizeof(*key));
 
-  memset(&(room->last_message), 0, sizeof(room->last_message));
+  memset (&(room->last_message), 0, sizeof(room->last_message));
 
   room->opened = GNUNET_NO;
   room->use_handle_name = GNUNET_YES;
@@ -55,6 +56,7 @@ create_room (struct GNUNET_MESSENGER_Handle *handle,
   return room;
 }
 
+
 static int
 iterate_destroy_message (void *cls,
                          const struct GNUNET_HashCode *key,
@@ -63,22 +65,24 @@ iterate_destroy_message (void *cls,
   struct GNUNET_MESSENGER_RoomMessageEntry *entry = value;
 
   destroy_message (entry->message);
-  GNUNET_free(entry);
+  GNUNET_free (entry);
 
   return GNUNET_YES;
 }
 
+
 void
 destroy_room (struct GNUNET_MESSENGER_Room *room)
 {
-  GNUNET_assert(room);
+  GNUNET_assert (room);
 
-  clear_queue_messages(&(room->queue));
+  clear_queue_messages (&(room->queue));
   clear_list_tunnels (&(room->entries));
 
   if (room->messages)
   {
-    GNUNET_CONTAINER_multihashmap_iterate (room->messages, iterate_destroy_message, NULL);
+    GNUNET_CONTAINER_multihashmap_iterate (room->messages,
+                                           iterate_destroy_message, NULL);
 
     GNUNET_CONTAINER_multihashmap_destroy (room->messages);
   }
@@ -87,17 +91,18 @@ destroy_room (struct GNUNET_MESSENGER_Room *room)
     GNUNET_CONTAINER_multishortmap_destroy (room->members);
 
   if (room->sender_id)
-    GNUNET_free(room->sender_id);
+    GNUNET_free (room->sender_id);
 
-  GNUNET_free(room);
+  GNUNET_free (room);
 }
 
+
 enum GNUNET_GenericReturnValue
 is_room_available (const struct GNUNET_MESSENGER_Room *room)
 {
   GNUNET_assert (room);
 
-  if (!get_room_sender_id(room))
+  if (! get_room_sender_id (room))
     return GNUNET_NO;
 
   if ((GNUNET_YES == room->opened) || (room->entries.head))
@@ -106,6 +111,7 @@ is_room_available (const struct GNUNET_MESSENGER_Room *room)
     return GNUNET_NO;
 }
 
+
 const struct GNUNET_ShortHashCode*
 get_room_sender_id (const struct GNUNET_MESSENGER_Room *room)
 {
@@ -114,15 +120,17 @@ get_room_sender_id (const struct GNUNET_MESSENGER_Room *room)
   return room->sender_id;
 }
 
+
 void
 set_room_sender_id (struct GNUNET_MESSENGER_Room *room,
                     const struct GNUNET_ShortHashCode *id)
 {
   GNUNET_assert (room);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Set member id for room: %s\n", GNUNET_h2s (&(room->key)));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Set member id for room: %s\n",
+              GNUNET_h2s (&(room->key)));
 
-  if (!id)
+  if (! id)
   {
     if (room->sender_id)
       GNUNET_free (room->sender_id);
@@ -131,76 +139,92 @@ set_room_sender_id (struct GNUNET_MESSENGER_Room *room,
     return;
   }
 
-  if (!room->sender_id)
+  if (! room->sender_id)
     room->sender_id = GNUNET_new (struct GNUNET_ShortHashCode);
 
   GNUNET_memcpy (room->sender_id, id, sizeof(struct GNUNET_ShortHashCode));
 }
 
+
 const struct GNUNET_MESSENGER_Message*
 get_room_message (const struct GNUNET_MESSENGER_Room *room,
                   const struct GNUNET_HashCode *hash)
 {
-  GNUNET_assert((room) && (hash));
+  GNUNET_assert ((room) && (hash));
 
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry =
+    GNUNET_CONTAINER_multihashmap_get (
       room->messages, hash
-  );
+      );
 
   return (entry? entry->message : NULL);
 }
 
+
 struct GNUNET_MESSENGER_Contact*
 get_room_sender (const struct GNUNET_MESSENGER_Room *room,
                  const struct GNUNET_HashCode *hash)
 {
-  GNUNET_assert((room) && (hash));
+  GNUNET_assert ((room) && (hash));
 
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry =
+    GNUNET_CONTAINER_multihashmap_get (
       room->messages, hash
-  );
+      );
 
   return (entry? entry->sender : NULL);
 }
 
+
 static struct GNUNET_MESSENGER_Contact*
 handle_join_message (struct GNUNET_MESSENGER_Room *room,
                      struct GNUNET_MESSENGER_Contact *sender,
                      const struct GNUNET_MESSENGER_Message *message,
                      const struct GNUNET_HashCode *hash)
 {
-  if (!sender)
+  if (! sender)
   {
-    struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+    struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store (
+      room->handle);
     struct GNUNET_HashCode context;
 
-    get_context_from_member(&(room->key), &(message->header.sender_id), &context);
+    get_context_from_member (&(room->key), &(message->header.sender_id),
+                             &context);
 
-    sender = get_store_contact(store, &context, &(message->body.join.key));
+    sender = get_store_contact (store, &context, &(message->body.join.key));
   }
 
-  if ((GNUNET_YES != GNUNET_CONTAINER_multishortmap_contains_value(room->members, &(message->header.sender_id), sender)) &&
-      (GNUNET_OK == GNUNET_CONTAINER_multishortmap_put(room->members, &(message->header.sender_id), sender,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
-    increase_contact_rc(sender);
+  if ((GNUNET_YES != GNUNET_CONTAINER_multishortmap_contains_value (
+         room->members, &(message->header.sender_id), sender)) &&
+      (GNUNET_OK == GNUNET_CONTAINER_multishortmap_put (room->members,
+                                                        &(message->header.
+                                                          sender_id), sender,
+                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+    increase_contact_rc (sender);
 
   return sender;
 }
 
+
 static void
 handle_leave_message (struct GNUNET_MESSENGER_Room *room,
                       struct GNUNET_MESSENGER_Contact *sender,
                       const struct GNUNET_MESSENGER_Message *message,
                       const struct GNUNET_HashCode *hash)
 {
-  if ((!sender) ||
-      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)))
+  if ((! sender) ||
+      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove (room->members,
+                                                            &(message->header.
+                                                              sender_id),
+                                                            sender)))
     return;
 
-  if (GNUNET_YES == decrease_contact_rc(sender))
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "A contact does not share any room with you anymore!\n");
+  if (GNUNET_YES == decrease_contact_rc (sender))
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "A contact does not share any room with you anymore!\n");
 }
 
+
 static void
 handle_name_message (struct GNUNET_MESSENGER_Room *room,
                      struct GNUNET_MESSENGER_Contact *sender,
@@ -210,37 +234,44 @@ handle_name_message (struct GNUNET_MESSENGER_Room *room,
 {
   if (GNUNET_MESSENGER_FLAG_SENT & flags)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Set rule for using handle name in room: %s\n", GNUNET_h2s (&(room->key)));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Set rule for using handle name in room: %s\n",
+                GNUNET_h2s (&(room->key)));
 
-    const char* handle_name = get_handle_name (room->handle);
+    const char *handle_name = get_handle_name (room->handle);
 
     if ((handle_name) && (0 == strcmp (handle_name, message->body.name.name)))
       room->use_handle_name = GNUNET_YES;
   }
 
-  if (!sender)
+  if (! sender)
     return;
 
   set_contact_name (sender, message->body.name.name);
 }
 
+
 static void
 handle_key_message (struct GNUNET_MESSENGER_Room *room,
                     struct GNUNET_MESSENGER_Contact *sender,
                     const struct GNUNET_MESSENGER_Message *message,
                     const struct GNUNET_HashCode *hash)
 {
-  if (!sender)
+  if (! sender)
     return;
 
   struct GNUNET_HashCode context;
-  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
+  get_context_from_member (&(room->key), &(message->header.sender_id),
+                           &context);
 
-  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store (
+    room->handle);
 
-  update_store_contact(store, sender, &context, &context, &(message->body.key.key));
+  update_store_contact (store, sender, &context, &context,
+                        &(message->body.key.key));
 }
 
+
 static void
 handle_id_message (struct GNUNET_MESSENGER_Room *room,
                    struct GNUNET_MESSENGER_Contact *sender,
@@ -251,21 +282,30 @@ handle_id_message (struct GNUNET_MESSENGER_Room *room,
   if (GNUNET_MESSENGER_FLAG_SENT & flags)
     set_room_sender_id (room, &(message->body.id.id));
 
-  if ((!sender) ||
-      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)) ||
-      (GNUNET_OK != GNUNET_CONTAINER_multishortmap_put(room->members, &(message->body.id.id), sender,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+  if ((! sender) ||
+      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove (room->members,
+                                                            &(message->header.
+                                                              sender_id),
+                                                            sender)) ||
+      (GNUNET_OK != GNUNET_CONTAINER_multishortmap_put (room->members,
+                                                        &(message->body.id.id),
+                                                        sender,
+                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
     return;
 
   struct GNUNET_HashCode context, next_context;
-  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
-  get_context_from_member(&(room->key), &(message->body.id.id), &next_context);
+  get_context_from_member (&(room->key), &(message->header.sender_id),
+                           &context);
+  get_context_from_member (&(room->key), &(message->body.id.id), &next_context);
 
-  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
+  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store (
+    room->handle);
 
-  update_store_contact(store, sender, &context, &next_context, get_contact_key(sender));
+  update_store_contact (store, sender, &context, &next_context,
+                        get_contact_key (sender));
 }
 
+
 static void
 handle_miss_message (struct GNUNET_MESSENGER_Room *room,
                      struct GNUNET_MESSENGER_Contact *sender,
@@ -275,31 +315,40 @@ handle_miss_message (struct GNUNET_MESSENGER_Room *room,
 {
   if (GNUNET_MESSENGER_FLAG_SENT & flags)
   {
-    struct GNUNET_MESSENGER_ListTunnel *match = find_list_tunnels (&(room->entries), &(message->body.miss.peer), NULL);
+    struct GNUNET_MESSENGER_ListTunnel *match = find_list_tunnels (
+      &(room->entries), &(message->body.miss.peer), NULL);
 
     if (match)
       remove_from_list_tunnels (&(room->entries), match);
   }
 }
 
+
 static void
 handle_delete_message (struct GNUNET_MESSENGER_Room *room,
                        struct GNUNET_MESSENGER_Contact *sender,
                        const struct GNUNET_MESSENGER_Message *message,
                        const struct GNUNET_HashCode *hash)
 {
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry =
+    GNUNET_CONTAINER_multihashmap_get (
       room->messages, &(message->body.deletion.hash)
-  );
-
-  if ((entry) && ((entry->sender == sender) || (get_handle_contact (room->handle, &(room->key)) == sender)) &&
-      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages, &(message->body.deletion.hash), entry)))
+      );
+
+  if ((entry) && ((entry->sender == sender) || (get_handle_contact (
+                                                  room->handle, &(room->key)) ==
+                                                sender)) &&
+      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages,
+                                                           &(message->body.
+                                                             deletion.hash),
+                                                           entry)))
   {
     destroy_message (entry->message);
-    GNUNET_free(entry);
+    GNUNET_free (entry);
   }
 }
 
+
 struct GNUNET_MESSENGER_Contact*
 handle_room_message (struct GNUNET_MESSENGER_Room *room,
                      struct GNUNET_MESSENGER_Contact *sender,
@@ -307,7 +356,8 @@ handle_room_message (struct GNUNET_MESSENGER_Room *room,
                      const struct GNUNET_HashCode *hash,
                      enum GNUNET_MESSENGER_MessageFlags flags)
 {
-  if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains (room->messages, hash))
+  if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains (room->messages,
+                                                           hash))
     return sender;
 
   switch (message->header.kind)
@@ -337,25 +387,28 @@ handle_room_message (struct GNUNET_MESSENGER_Room *room,
     break;
   }
 
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_new(struct GNUNET_MESSENGER_RoomMessageEntry);
+  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_new (struct
+                                                                GNUNET_MESSENGER_RoomMessageEntry);
 
-  if (!entry)
+  if (! entry)
     return sender;
 
   entry->sender = sender;
   entry->message = copy_message (message);
 
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->messages, hash, entry,
+  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->messages, hash,
+                                                      entry,
                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
   {
     destroy_message (entry->message);
-    GNUNET_free(entry);
+    GNUNET_free (entry);
   }
 
   GNUNET_memcpy (&(room->last_message), hash, sizeof(room->last_message));
   return sender;
 }
 
+
 struct GNUNET_MESSENGER_MemberCall
 {
   struct GNUNET_MESSENGER_Room *room;
@@ -364,25 +417,26 @@ struct GNUNET_MESSENGER_MemberCall
 };
 
 static int
-iterate_local_members (void* cls,
+iterate_local_members (void *cls,
                        const struct GNUNET_ShortHashCode *key,
                        void *value)
 {
   struct GNUNET_MESSENGER_MemberCall *call = cls;
   struct GNUNET_MESSENGER_Contact *contact = value;
 
-  return call->callback(call->cls, call->room, contact);
+  return call->callback (call->cls, call->room, contact);
 }
 
+
 int
 iterate_room_members (struct GNUNET_MESSENGER_Room *room,
                       GNUNET_MESSENGER_MemberCallback callback,
-                      void* cls)
+                      void *cls)
 {
-  GNUNET_assert(room);
+  GNUNET_assert (room);
 
-  if (!callback)
-    return GNUNET_CONTAINER_multishortmap_iterate(room->members, NULL, NULL);
+  if (! callback)
+    return GNUNET_CONTAINER_multishortmap_iterate (room->members, NULL, NULL);
 
   struct GNUNET_MESSENGER_MemberCall call;
 
@@ -390,11 +444,14 @@ iterate_room_members (struct GNUNET_MESSENGER_Room *room,
   call.callback = callback;
   call.cls = cls;
 
-  GNUNET_assert(callback);
+  GNUNET_assert (callback);
 
-  return GNUNET_CONTAINER_multishortmap_iterate(room->members, iterate_local_members, &call);
+  return GNUNET_CONTAINER_multishortmap_iterate (room->members,
+                                                 iterate_local_members,
+                                                 &call);
 }
 
+
 struct GNUNET_MESSENGER_MemberFind
 {
   const struct GNUNET_MESSENGER_Contact *contact;
@@ -402,7 +459,7 @@ struct GNUNET_MESSENGER_MemberFind
 };
 
 static int
-iterate_find_member (void* cls,
+iterate_find_member (void *cls,
                      const struct GNUNET_ShortHashCode *key,
                      void *value)
 {
@@ -418,18 +475,20 @@ iterate_find_member (void* cls,
   return GNUNET_YES;
 }
 
+
 int
 find_room_member (const struct GNUNET_MESSENGER_Room *room,
                   const struct GNUNET_MESSENGER_Contact *contact)
 {
-  GNUNET_assert(room);
+  GNUNET_assert (room);
 
   struct GNUNET_MESSENGER_MemberFind find;
 
   find.contact = contact;
   find.result = GNUNET_NO;
 
-  GNUNET_CONTAINER_multishortmap_iterate(room->members, iterate_find_member, &find);
+  GNUNET_CONTAINER_multishortmap_iterate (room->members, iterate_find_member,
+                                          &find);
 
   return find.result;
 }