12 files changed, 77 insertions, 53 deletions

diff --git a/src/messenger/gnunet-service-messenger.c b/src/messenger/gnunet-service-messenger.c
index a994e16ee..546f4c0d2 100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/messenger/gnunet-service-messenger.c
@@ -221,7 +221,7 @@ check_for_message:
 
   struct GNUNET_MESSENGER_Message message;
 
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
+  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, GNUNET_NO))
     return GNUNET_NO;
 
   if (GNUNET_YES != decode_message (&message, msg_length, msg_buffer, GNUNET_NO, NULL))
@@ -310,7 +310,7 @@ callback_found_message (void *cls,
   struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, hash);
 
   if (session)
-    notify_handle_message (msg_client->handle, get_room_key(room), session, message, hash);
+    notify_handle_message (msg_client->handle, room, session, message, hash);
 }
 
 static void
diff --git a/src/messenger/gnunet-service-messenger_handle.c b/src/messenger/gnunet-service-messenger_handle.c
index 2095f8b29..fa6830697 100644
--- a/src/messenger/gnunet-service-messenger_handle.c
+++ b/src/messenger/gnunet-service-messenger_handle.c
@@ -501,14 +501,14 @@ get_next_member_session_contect(const struct GNUNET_MESSENGER_MemberSession *ses
 
 static const struct GNUNET_MESSENGER_MemberSession*
 get_handle_member_session (struct GNUNET_MESSENGER_SrvHandle *handle,
+                           struct GNUNET_MESSENGER_SrvRoom *room,
                            const struct GNUNET_HashCode *key)
 {
-  GNUNET_assert((handle) && (key) && (handle->service));
+  GNUNET_assert((handle) && (room) && (key) && (handle->service));
 
   const struct GNUNET_ShortHashCode *id = get_handle_member_id(handle, key);
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room(handle->service, key);
 
-  if ((!id) || (!room))
+  if (!id)
     return NULL;
 
   struct GNUNET_MESSENGER_MemberStore *store = get_room_member_store(room);
@@ -524,12 +524,14 @@ get_handle_member_session (struct GNUNET_MESSENGER_SrvHandle *handle,
 
 void
 notify_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle,
-                       const struct GNUNET_HashCode *key,
+                       struct GNUNET_MESSENGER_SrvRoom *room,
                        const struct GNUNET_MESSENGER_MemberSession *session,
                        const struct GNUNET_MESSENGER_Message *message,
                        const struct GNUNET_HashCode *hash)
 {
-  GNUNET_assert((handle) && (key) && (session) && (message) && (hash));
+  GNUNET_assert((handle) && (room) && (session) && (message) && (hash));
+
+  const struct GNUNET_HashCode *key = get_room_key(room);
 
   if ((!handle->mq) || (!get_handle_member_id (handle, key)))
   {
@@ -575,7 +577,7 @@ notify_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle,
 
   msg->flags = (uint32_t) GNUNET_MESSENGER_FLAG_NONE;
 
-  if (get_handle_member_session(handle, key) == session)
+  if (get_handle_member_session(handle, room, key) == session)
     msg->flags |= (uint32_t) GNUNET_MESSENGER_FLAG_SENT;
 
   if (private_message)
diff --git a/src/messenger/gnunet-service-messenger_handle.h b/src/messenger/gnunet-service-messenger_handle.h
index 97a984721..4438570b9 100644
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ b/src/messenger/gnunet-service-messenger_handle.h
@@ -219,14 +219,14 @@ send_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle,
  * Notifies the handle that a new message was received or sent.
  *
  * @param[in/out] handle Handle
- * @param[in] key Key of room
+ * @param[in] room Room of the message
  * @param[in] session Member session
  * @param[in] message Message
  * @param[in] hash Hash of message
  */
 void
 notify_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle,
-                       const struct GNUNET_HashCode *key,
+                       struct GNUNET_MESSENGER_SrvRoom *room,
                        const struct GNUNET_MESSENGER_MemberSession *session,
                        const struct GNUNET_MESSENGER_Message *message,
                        const struct GNUNET_HashCode *hash);
diff --git a/src/messenger/gnunet-service-messenger_message_store.c b/src/messenger/gnunet-service-messenger_message_store.c
index 56448997a..ce20ac924 100644
--- a/src/messenger/gnunet-service-messenger_message_store.c
+++ b/src/messenger/gnunet-service-messenger_message_store.c
@@ -427,7 +427,7 @@ get_store_message (struct GNUNET_MESSENGER_MessageStore *store,
     return NULL;
 
   if ((GNUNET_DISK_file_read (store->storage_messages, buffer, entry->length) != entry->length) ||
-      (entry->length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN)))
+      (entry->length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, GNUNET_YES)))
     goto free_buffer;
 
   message = create_message (GNUNET_MESSENGER_KIND_UNKNOWN);
diff --git a/src/messenger/gnunet-service-messenger_room.c b/src/messenger/gnunet-service-messenger_room.c
index 920abb10e..d34665511 100644
--- a/src/messenger/gnunet-service-messenger_room.c
+++ b/src/messenger/gnunet-service-messenger_room.c
@@ -212,7 +212,9 @@ join_room (struct GNUNET_MESSENGER_SrvRoom *room,
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Joining room: %s (%s)\n", GNUNET_h2s (get_room_key (room)),
              GNUNET_sh2s (get_member_id(member)));
 
-  if (GNUNET_OK != change_handle_member_id (handle, get_room_key(room), get_member_id(member)))
+  const struct GNUNET_ShortHashCode *member_id = get_member_id(member);
+
+  if (GNUNET_OK != change_handle_member_id (handle, get_room_key(room), member_id))
     return GNUNET_NO;
 
   struct GNUNET_MESSENGER_Message *message = create_message_join (get_handle_ego (handle));
@@ -224,6 +226,7 @@ join_room (struct GNUNET_MESSENGER_SrvRoom *room,
     return GNUNET_NO;
   }
 
+  GNUNET_memcpy(&(message->header.sender_id), member_id, sizeof(*member_id));
   return send_room_message (room, handle, message);
 }
 
@@ -262,7 +265,7 @@ notify_about_members (struct GNUNET_MESSENGER_MemberNotify *notify,
     const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, &(element->hash));
 
     if (message)
-      notify_handle_message (notify->handle, get_room_key(notify->room), session, message, &(element->hash));
+      notify_handle_message (notify->handle, notify->room, session, message, &(element->hash));
   }
 }
 
@@ -359,12 +362,7 @@ open_room (struct GNUNET_MESSENGER_SrvRoom *room,
   const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (handle, get_room_key(room));
 
   struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member(member_store, member_id);
-
-  if (member)
-    goto exit_open_room;
-
-  member = add_store_member(member_store, member_id);
+  struct GNUNET_MESSENGER_Member *member = add_store_member(member_store, member_id);
 
   if ((GNUNET_NO == join_room (room, handle, member)) && (room->port))
   {
@@ -376,8 +374,9 @@ open_room (struct GNUNET_MESSENGER_SrvRoom *room,
     return GNUNET_NO;
   }
 
-exit_open_room:
-  return (room->port ? send_room_message (room, handle, create_message_peer (room->service)) : GNUNET_NO);
+  struct GNUNET_MESSENGER_Message *peer_msg = create_message_peer (room->service);
+  GNUNET_memcpy(&(peer_msg->header.sender_id), member_id, sizeof(*member_id));
+  return (room->port ? send_room_message (room, handle, peer_msg) : GNUNET_NO);
 }
 
 int
diff --git a/src/messenger/gnunet-service-messenger_service.c b/src/messenger/gnunet-service-messenger_service.c
index 91165cf63..b53b72af8 100644
--- a/src/messenger/gnunet-service-messenger_service.c
+++ b/src/messenger/gnunet-service-messenger_service.c
@@ -313,7 +313,7 @@ handle_service_message (struct GNUNET_MESSENGER_Service *service,
 
   while (element)
   {
-    notify_handle_message (element->handle, get_room_key(room), session, message, hash);
+    notify_handle_message (element->handle, room, session, message, hash);
     element = element->next;
   }
 }
diff --git a/src/messenger/gnunet-service-messenger_tunnel.c b/src/messenger/gnunet-service-messenger_tunnel.c
index c21f298b3..45c10c1af 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.c
+++ b/src/messenger/gnunet-service-messenger_tunnel.c
@@ -122,7 +122,7 @@ check_tunnel_message (void *cls,
 
   struct GNUNET_MESSENGER_Message message;
 
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
+  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, GNUNET_YES))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Tunnel error: Message too short! (%d)\n", length);
     return GNUNET_SYSERR;
diff --git a/src/messenger/messenger.conf.in b/src/messenger/messenger.conf.in
index 59e11b166..6b54550ea 100644
--- a/src/messenger/messenger.conf.in
+++ b/src/messenger/messenger.conf.in
@@ -1,5 +1,6 @@
 [messenger]
 START_ON_DEMAND = YES
+RUN_PER_USER = YES
 PORT = 2097
 HOSTNAME = localhost
 BINARY = gnunet-service-messenger
diff --git a/src/messenger/messenger_api.c b/src/messenger/messenger_api.c
index c9b143662..2db841315 100644
--- a/src/messenger/messenger_api.c
+++ b/src/messenger/messenger_api.c
@@ -208,7 +208,7 @@ check_recv_message (void *cls,
 
   struct GNUNET_MESSENGER_Message message;
 
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
+  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, GNUNET_YES))
     return GNUNET_NO;
 
   if (GNUNET_YES != decode_message (&message, length, buffer, GNUNET_YES, NULL))
@@ -255,8 +255,10 @@ handle_recv_message (void *cls,
 
     handle_room_message (room, contact, &message, hash);
 
+    const struct GNUNET_MESSENGER_Message *stored_message = get_room_message(room, hash);
+
     if (handle->msg_callback)
-      handle->msg_callback (handle->msg_cls, room, contact, &message, hash, flags);
+      handle->msg_callback (handle->msg_cls, room, contact, stored_message, hash, flags);
   }
   else
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Room not found\n");
diff --git a/src/messenger/messenger_api_handle.c b/src/messenger/messenger_api_handle.c
index 516807e13..242389040 100644
--- a/src/messenger/messenger_api_handle.c
+++ b/src/messenger/messenger_api_handle.c
@@ -98,7 +98,7 @@ destroy_handle (struct GNUNET_MESSENGER_Handle *handle)
 
   clear_contact_store(get_handle_contact_store(handle));
 
-  GNUNET_free(handle->name);
+  GNUNET_free(handle);
 }
 
 void
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c
index 4e64cc22f..496c98dbf 100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/messenger/messenger_api_message.c
@@ -229,13 +229,18 @@ get_message_body_kind_size (enum GNUNET_MESSENGER_MessageKind kind)
 typedef uint32_t kind_t;
 
 uint16_t
-get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind)
+get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind,
+                       int include_header)
 {
   uint16_t length = 0;
 
-  length += member_size(struct GNUNET_MESSENGER_Message, header.timestamp);
-  length += member_size(struct GNUNET_MESSENGER_Message, header.sender_id);
-  length += member_size(struct GNUNET_MESSENGER_Message, header.previous);
+  if (GNUNET_YES == include_header)
+  {
+    length += member_size(struct GNUNET_MESSENGER_Message, header.timestamp);
+    length += member_size(struct GNUNET_MESSENGER_Message, header.sender_id);
+    length += member_size(struct GNUNET_MESSENGER_Message, header.previous);
+  }
+
   length += sizeof(kind_t);
 
   return length + get_message_body_kind_size (kind);
@@ -279,16 +284,16 @@ get_message_body_size (enum GNUNET_MESSENGER_MessageKind kind,
 
 uint16_t
 get_message_size (const struct GNUNET_MESSENGER_Message *message,
-                  int include_signature)
+                  int include_header)
 {
   GNUNET_assert(message);
 
   uint16_t length = 0;
 
-  if (GNUNET_YES == include_signature)
+  if (GNUNET_YES == include_header)
     length += GNUNET_IDENTITY_signature_get_length(&(message->header.signature));
 
-  length += get_message_kind_size (message->header.kind);
+  length += get_message_kind_size (message->header.kind, include_header);
   length += get_message_body_size (message->header.kind, &(message->body));
 
   return length;
@@ -314,7 +319,7 @@ calc_usual_padding ()
   uint16_t kind_size;
 
   for (int i = 0; i <= GNUNET_MESSENGER_KIND_MAX; i++) {
-    kind_size = get_message_kind_size ((enum GNUNET_MESSENGER_MessageKind) i);
+    kind_size = get_message_kind_size ((enum GNUNET_MESSENGER_MessageKind) i, GNUNET_YES);
 
     if (kind_size > padding)
       padding = kind_size;
@@ -464,20 +469,24 @@ void
 encode_message (const struct GNUNET_MESSENGER_Message *message,
                 uint16_t length,
                 char *buffer,
-                int include_signature)
+                int include_header)
 {
   GNUNET_assert((message) && (buffer));
 
   uint16_t offset = 0;
 
-  if (GNUNET_YES == include_signature)
+  if (GNUNET_YES == include_header)
     encode_step_signature(buffer, offset, &(message->header.signature), length);
 
   const kind_t kind = GNUNET_htobe32((kind_t) message->header.kind);
 
-  encode_step(buffer, offset, &(message->header.timestamp));
-  encode_step(buffer, offset, &(message->header.sender_id));
-  encode_step(buffer, offset, &(message->header.previous));
+  if (GNUNET_YES == include_header)
+  {
+    encode_step(buffer, offset, &(message->header.timestamp));
+    encode_step(buffer, offset, &(message->header.sender_id));
+    encode_step(buffer, offset, &(message->header.previous));
+  }
+
   encode_step(buffer, offset, &kind);
 
   encode_message_body (message->header.kind, &(message->body), length, buffer, offset);
@@ -619,14 +628,18 @@ int
 decode_message (struct GNUNET_MESSENGER_Message *message,
                 uint16_t length,
                 const char *buffer,
-                int include_signature,
+                int include_header,
                 uint16_t *padding)
 {
-  GNUNET_assert((message) && (buffer) && (length >= get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN)));
+  GNUNET_assert(
+      (message) &&
+      (buffer) &&
+      (length >= get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, include_header))
+  );
 
   uint16_t offset = 0;
 
-  if (GNUNET_YES == include_signature)
+  if (GNUNET_YES == include_header)
   {
     ssize_t result = GNUNET_IDENTITY_read_signature_from_buffer(
         &(message->header.signature), buffer, length - offset
@@ -640,19 +653,23 @@ decode_message (struct GNUNET_MESSENGER_Message *message,
 
   const uint16_t count = length - offset;
 
-  if (count < get_message_kind_size (GNUNET_MESSENGER_KIND_UNKNOWN))
+  if (count < get_message_kind_size (GNUNET_MESSENGER_KIND_UNKNOWN, include_header))
     return GNUNET_NO;
 
   kind_t kind;
 
-  decode_step(buffer, offset, &(message->header.timestamp));
-  decode_step(buffer, offset, &(message->header.sender_id));
-  decode_step(buffer, offset, &(message->header.previous));
+  if (GNUNET_YES == include_header)
+  {
+    decode_step(buffer, offset, &(message->header.timestamp));
+    decode_step(buffer, offset, &(message->header.sender_id));
+    decode_step(buffer, offset, &(message->header.previous));
+  }
+
   decode_step(buffer, offset, &kind);
 
   message->header.kind = (enum GNUNET_MESSENGER_MessageKind) GNUNET_be32toh(kind);
 
-  if (count < get_message_kind_size (message->header.kind))
+  if (count < get_message_kind_size (message->header.kind, include_header))
     return GNUNET_NO;
 
   const uint16_t result = decode_message_body (&(message->header.kind), &(message->body), length, buffer, offset);
diff --git a/src/messenger/messenger_api_message.h b/src/messenger/messenger_api_message.h
index 21161c134..46c5cb024 100644
--- a/src/messenger/messenger_api_message.h
+++ b/src/messenger/messenger_api_message.h
@@ -90,21 +90,23 @@ is_message_session_bound (const struct GNUNET_MESSENGER_Message *message);
  * Returns the minimal size in bytes to encode a message of a specific <i>kind</i>.
  *
  * @param[in] kind Kind of message
+ * @param[in] include_header Flag to include header
  * @return Minimal size to encode
  */
 uint16_t
-get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind);
+get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind,
+                       int include_header);
 
 /**
  * Returns the exact size in bytes to encode a given <i>message</i>.
  *
  * @param[in] message Message
- * @param[in] encode_signature Flag to include signature
+ * @param[in] include_header Flag to include header
  * @return Size to encode
  */
 uint16_t
 get_message_size (const struct GNUNET_MESSENGER_Message *message,
-                  int include_signature);
+                  int include_header);
 
 /**
  * Encodes a given <i>message</i> into a <i>buffer</i> of a maximal <i>length</i> in bytes.
@@ -112,13 +114,13 @@ get_message_size (const struct GNUNET_MESSENGER_Message *message,
  * @param[in] message Message
  * @param[in] length Maximal length to encode
  * @param[out] buffer Buffer
- * @param[in] encode_signature Flag to include signature
+ * @param[in] include_header Flag to include header
  */
 void
 encode_message (const struct GNUNET_MESSENGER_Message *message,
                 uint16_t length,
                 char *buffer,
-                int include_signature);
+                int include_header);
 
 /**
  * Decodes a <i>message</i> from a given <i>buffer</i> of a maximal <i>length</i> in bytes.
@@ -131,6 +133,7 @@ encode_message (const struct GNUNET_MESSENGER_Message *message,
  * @param[out] message Message
  * @param[in] length Maximal length to decode
  * @param[in] buffer Buffer
+ * @param[in] include_header Flag to include header
  * @param[out] padding Padding
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -138,7 +141,7 @@ int
 decode_message (struct GNUNET_MESSENGER_Message *message,
                 uint16_t length,
                 const char *buffer,
-                int include_signature,
+                int include_header,
                 uint16_t *padding);
 
 /**