1 files changed, 107 insertions, 61 deletions

diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/messenger/gnunet-service-messenger_member.c
index b483f315b..1bb3a9969 100644
--- a/src/messenger/gnunet-service-messenger_member.c
+++ b/src/messenger/gnunet-service-messenger_member.c
@@ -34,44 +34,50 @@ create_member (struct GNUNET_MESSENGER_MemberStore *store,
 {
   GNUNET_assert (store);
 
-  struct GNUNET_MESSENGER_Member *member = GNUNET_new(struct GNUNET_MESSENGER_Member);
+  struct GNUNET_MESSENGER_Member *member = GNUNET_new (struct
+                                                       GNUNET_MESSENGER_Member);
 
   member->store = store;
 
   if (id)
-    GNUNET_memcpy(&(member->id), id, sizeof(member->id));
-  else if (GNUNET_YES != generate_free_member_id(&(member->id), store->members))
+    GNUNET_memcpy (&(member->id), id, sizeof(member->id));
+  else if (GNUNET_YES != generate_free_member_id (&(member->id),
+                                                  store->members))
   {
     GNUNET_free (member);
     return NULL;
   }
 
-  member->sessions = GNUNET_CONTAINER_multihashmap_create(2, GNUNET_NO);
+  member->sessions = GNUNET_CONTAINER_multihashmap_create (2, GNUNET_NO);
 
   return member;
 }
 
+
 static int
 iterate_destroy_session (void *cls,
                          const struct GNUNET_HashCode *key,
                          void *value)
 {
   struct GNUNET_MESSENGER_MemberSession *session = value;
-  destroy_member_session(session);
+  destroy_member_session (session);
   return GNUNET_YES;
 }
 
+
 void
 destroy_member (struct GNUNET_MESSENGER_Member *member)
 {
-  GNUNET_assert((member) && (member->sessions));
+  GNUNET_assert ((member) && (member->sessions));
 
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_destroy_session, NULL);
+  GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                         iterate_destroy_session, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (member->sessions);
 
   GNUNET_free (member);
 }
 
+
 const struct GNUNET_ShortHashCode*
 get_member_id (const struct GNUNET_MESSENGER_Member *member)
 {
@@ -80,6 +86,7 @@ get_member_id (const struct GNUNET_MESSENGER_Member *member)
   return &(member->id);
 }
 
+
 static int
 callback_scan_for_sessions (void *cls,
                             const char *filename)
@@ -92,13 +99,14 @@ callback_scan_for_sessions (void *cls,
 
     GNUNET_asprintf (&directory, "%s%c", filename, DIR_SEPARATOR);
 
-    load_member_session(member, directory);
+    load_member_session (member, directory);
     GNUNET_free (directory);
   }
 
   return GNUNET_OK;
 }
 
+
 void
 load_member (struct GNUNET_MESSENGER_MemberStore *store,
              const char *directory)
@@ -113,7 +121,8 @@ load_member (struct GNUNET_MESSENGER_MemberStore *store,
   if (GNUNET_YES != GNUNET_DISK_file_test (config_file))
     goto free_config;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Load member configuration: %s\n", config_file);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Load member configuration: %s\n",
+              config_file);
 
   struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
 
@@ -121,10 +130,11 @@ load_member (struct GNUNET_MESSENGER_MemberStore *store,
   {
     struct GNUNET_ShortHashCode id;
 
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "member", "id", &id, sizeof(id)))
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "member", "id", &id,
+                                                    sizeof(id)))
       goto destroy_config;
 
-    member = add_store_member(store, &id);
+    member = add_store_member (store, &id);
   }
 
 destroy_config:
@@ -132,9 +142,9 @@ destroy_config:
   GNUNET_CONFIGURATION_destroy (cfg);
 
 free_config:
-  GNUNET_free(config_file);
+  GNUNET_free (config_file);
 
-  if (!member)
+  if (! member)
     return;
 
   char *scan_dir;
@@ -143,18 +153,20 @@ free_config:
   if (GNUNET_OK == GNUNET_DISK_directory_test (scan_dir, GNUNET_YES))
     GNUNET_DISK_directory_scan (scan_dir, callback_scan_for_sessions, member);
 
-  GNUNET_free(scan_dir);
+  GNUNET_free (scan_dir);
 }
 
+
 static int
 iterate_load_next_session (void *cls,
                            const struct GNUNET_HashCode *key,
                            void *value)
 {
-  const char* sessions_directory = cls;
+  const char *sessions_directory = cls;
 
-  char* load_dir;
-  GNUNET_asprintf (&load_dir, "%s%s%c", sessions_directory, GNUNET_h2s(key), DIR_SEPARATOR);
+  char *load_dir;
+  GNUNET_asprintf (&load_dir, "%s%s%c", sessions_directory, GNUNET_h2s (key),
+                   DIR_SEPARATOR);
 
   struct GNUNET_MESSENGER_MemberSession *session = value;
 
@@ -165,29 +177,33 @@ iterate_load_next_session (void *cls,
   return GNUNET_YES;
 }
 
+
 void
 load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member,
                            const char *directory)
 {
   GNUNET_assert ((member) && (directory));
 
-  char* load_dir;
+  char *load_dir;
   GNUNET_asprintf (&load_dir, "%s%s%c", directory, "sessions", DIR_SEPARATOR);
 
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_load_next_session, load_dir);
+  GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                         iterate_load_next_session, load_dir);
 
-  GNUNET_free(load_dir);
+  GNUNET_free (load_dir);
 }
 
+
 static int
 iterate_save_session (void *cls,
                       const struct GNUNET_HashCode *key,
                       void *value)
 {
-  const char* sessions_directory = cls;
+  const char *sessions_directory = cls;
 
-  char* save_dir;
-  GNUNET_asprintf (&save_dir, "%s%s%c", sessions_directory, GNUNET_h2s(key), DIR_SEPARATOR);
+  char *save_dir;
+  GNUNET_asprintf (&save_dir, "%s%s%c", sessions_directory, GNUNET_h2s (key),
+                   DIR_SEPARATOR);
 
   struct GNUNET_MESSENGER_MemberSession *session = value;
 
@@ -199,6 +215,7 @@ iterate_save_session (void *cls,
   return GNUNET_YES;
 }
 
+
 void
 save_member (struct GNUNET_MESSENGER_Member *member,
              const char *directory)
@@ -208,39 +225,43 @@ save_member (struct GNUNET_MESSENGER_Member *member,
   char *config_file;
   GNUNET_asprintf (&config_file, "%s%s", directory, "member.cfg");
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Save member configuration: %s\n", config_file);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Save member configuration: %s\n",
+              config_file);
 
   struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
 
-  char *id_data = GNUNET_STRINGS_data_to_string_alloc (&(member->id), sizeof(member->id));
+  char *id_data = GNUNET_STRINGS_data_to_string_alloc (&(member->id),
+                                                       sizeof(member->id));
 
   if (id_data)
   {
     GNUNET_CONFIGURATION_set_value_string (cfg, "member", "id", id_data);
 
-    GNUNET_free(id_data);
+    GNUNET_free (id_data);
   }
 
   GNUNET_CONFIGURATION_write (cfg, config_file);
   GNUNET_CONFIGURATION_destroy (cfg);
 
-  GNUNET_free(config_file);
+  GNUNET_free (config_file);
 
-  char* save_dir;
+  char *save_dir;
   GNUNET_asprintf (&save_dir, "%s%s%c", directory, "sessions", DIR_SEPARATOR);
 
   if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
       (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-    GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_save_session, save_dir);
+    GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                           iterate_save_session, save_dir);
 
-  GNUNET_free(save_dir);
+  GNUNET_free (save_dir);
 }
 
+
 static void
 sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session,
                                 struct GNUNET_MESSENGER_MemberSession *next)
 {
-  GNUNET_assert((session) && (next));
+  GNUNET_assert ((session) && (next));
 
   if (session == next)
     return;
@@ -251,6 +272,7 @@ sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session,
     session->contact = next->contact;
 }
 
+
 static int
 iterate_sync_session_contact (void *cls,
                               const struct GNUNET_HashCode *key,
@@ -264,14 +286,17 @@ iterate_sync_session_contact (void *cls,
   return GNUNET_YES;
 }
 
+
 void
 sync_member_contacts (struct GNUNET_MESSENGER_Member *member)
 {
   GNUNET_assert ((member) && (member->sessions));
 
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_sync_session_contact, NULL);
+  GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                         iterate_sync_session_contact, NULL);
 }
 
+
 struct GNUNET_MESSENGER_MemberSession*
 get_member_session (const struct GNUNET_MESSENGER_Member *member,
                     const struct GNUNET_IDENTITY_PublicKey *public_key)
@@ -279,12 +304,14 @@ get_member_session (const struct GNUNET_MESSENGER_Member *member,
   GNUNET_assert ((member) && (public_key));
 
   struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
+  GNUNET_CRYPTO_hash (public_key, sizeof(*public_key), &hash);
 
-  return GNUNET_CONTAINER_multihashmap_get(member->sessions, &hash);
+  return GNUNET_CONTAINER_multihashmap_get (member->sessions, &hash);
 }
 
-struct GNUNET_MESSENGER_ClosureSearchSession {
+
+struct GNUNET_MESSENGER_ClosureSearchSession
+{
   const struct GNUNET_MESSENGER_Message *message;
   const struct GNUNET_HashCode *hash;
 
@@ -296,43 +323,48 @@ iterate_search_session (void *cls,
                         const struct GNUNET_HashCode *key,
                         void *value)
 {
-  struct GNUNET_MESSENGER_ClosureSearchSession* search = cls;
+  struct GNUNET_MESSENGER_ClosureSearchSession *search = cls;
   struct GNUNET_MESSENGER_MemberSession *session = value;
 
-  if (GNUNET_OK != verify_member_session_as_sender(session, search->message, search->hash))
+  if (GNUNET_OK != verify_member_session_as_sender (session, search->message,
+                                                    search->hash))
     return GNUNET_YES;
 
   search->match = session;
   return GNUNET_NO;
 }
 
+
 static struct GNUNET_MESSENGER_MemberSession*
 try_member_session (struct GNUNET_MESSENGER_Member *member,
                     const struct GNUNET_IDENTITY_PublicKey *public_key)
 {
-  struct GNUNET_MESSENGER_MemberSession* session = get_member_session(member, public_key);
+  struct GNUNET_MESSENGER_MemberSession *session = get_member_session (member,
+                                                                       public_key);
 
   if (session)
     return session;
 
-  session = create_member_session(member, public_key);
+  session = create_member_session (member, public_key);
 
   if (session)
-    add_member_session(member, session);
+    add_member_session (member, session);
 
   return session;
 }
 
+
 struct GNUNET_MESSENGER_MemberSession*
 get_member_session_of (struct GNUNET_MESSENGER_Member *member,
                        const struct GNUNET_MESSENGER_Message *message,
                        const struct GNUNET_HashCode *hash)
 {
   GNUNET_assert ((member) && (message) && (hash) &&
-                 (0 == GNUNET_memcmp(&(member->id), &(message->header.sender_id))));
+                 (0 == GNUNET_memcmp (&(member->id),
+                                      &(message->header.sender_id))));
 
   if (GNUNET_MESSENGER_KIND_JOIN == message->header.kind)
-    return try_member_session(member, &(message->body.join.key));
+    return try_member_session (member, &(message->body.join.key));
 
   struct GNUNET_MESSENGER_ClosureSearchSession search;
 
@@ -340,49 +372,59 @@ get_member_session_of (struct GNUNET_MESSENGER_Member *member,
   search.hash = hash;
 
   search.match = NULL;
-  GNUNET_CONTAINER_multihashmap_iterate(member->sessions, iterate_search_session, &search);
+  GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                         iterate_search_session, &search);
 
   return search.match;
 }
 
+
 void
 add_member_session (struct GNUNET_MESSENGER_Member *member,
                     struct GNUNET_MESSENGER_MemberSession *session)
 {
-  if (!session)
+  if (! session)
     return;
 
-  GNUNET_assert((member) && (session->member == member));
+  GNUNET_assert ((member) && (session->member == member));
 
-  const struct GNUNET_IDENTITY_PublicKey *public_key = get_member_session_public_key(session);
+  const struct GNUNET_IDENTITY_PublicKey *public_key =
+    get_member_session_public_key (session);
 
   struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(
-      member->sessions, &hash, session,
-      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Adding a member session failed: %s\n",
-               GNUNET_h2s(&hash));
+  GNUNET_CRYPTO_hash (public_key, sizeof(*public_key), &hash);
+
+  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (
+        member->sessions, &hash, session,
+        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Adding a member session failed: %s\n",
+                GNUNET_h2s (&hash));
 }
 
+
 void
 remove_member_session (struct GNUNET_MESSENGER_Member *member,
                        struct GNUNET_MESSENGER_MemberSession *session)
 {
   GNUNET_assert ((member) && (session) && (session->member == member));
 
-  const struct GNUNET_IDENTITY_PublicKey *public_key = get_member_session_public_key(session);
+  const struct GNUNET_IDENTITY_PublicKey *public_key =
+    get_member_session_public_key (session);
 
   struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
+  GNUNET_CRYPTO_hash (public_key, sizeof(*public_key), &hash);
 
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(member->sessions, &hash, session))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Removing a member session failed: %s\n",
-               GNUNET_h2s(&hash));
+  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (member->sessions,
+                                                          &hash, session))
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Removing a member session failed: %s\n",
+                GNUNET_h2s (&hash));
 }
 
-struct GNUNET_MESSENGER_ClosureIterateSessions {
+
+struct GNUNET_MESSENGER_ClosureIterateSessions
+{
   GNUNET_MESSENGER_MemberIteratorCallback it;
   void *cls;
 };
@@ -395,9 +437,11 @@ iterate_member_sessions_it (void *cls,
   struct GNUNET_MESSENGER_ClosureIterateSessions *iterate = cls;
   struct GNUNET_MESSENGER_MemberSession *session = value;
 
-  return iterate->it (iterate->cls, get_member_session_public_key(session), session);
+  return iterate->it (iterate->cls, get_member_session_public_key (session),
+                      session);
 }
 
+
 int
 iterate_member_sessions (struct GNUNET_MESSENGER_Member *member,
                          GNUNET_MESSENGER_MemberIteratorCallback it,
@@ -410,5 +454,7 @@ iterate_member_sessions (struct GNUNET_MESSENGER_Member *member,
   iterate.it = it;
   iterate.cls = cls;
 
-  return GNUNET_CONTAINER_multihashmap_iterate(member->sessions, iterate_member_sessions_it, &iterate);
+  return GNUNET_CONTAINER_multihashmap_iterate (member->sessions,
+                                                iterate_member_sessions_it,
+                                                &iterate);
 }