[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: MESSENGER: Add logging and fix decoding
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: MESSENGER: Add logging and fix decoding issue of leave message |
|
Date: |
Sat, 04 May 2024 18:44:28 +0200 |
This is an automated email from the git hooks/post-receive script.
thejackimonster pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 1c2a6325d MESSENGER: Add logging and fix decoding issue of leave
message
1c2a6325d is described below
commit 1c2a6325d3985126f8bc3e0a51f62d5ebeb19f6c
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Sat May 4 18:44:15 2024 +0200
MESSENGER: Add logging and fix decoding issue of leave message
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
src/service/messenger/gnunet-service-messenger.c | 19 +++++++++++
.../messenger/gnunet-service-messenger_handle.c | 5 +++
.../gnunet-service-messenger_list_messages.c | 6 ++--
.../gnunet-service-messenger_member_session.c | 6 ++--
.../gnunet-service-messenger_message_recv.c | 1 +
.../gnunet-service-messenger_message_send.c | 1 +
.../gnunet-service-messenger_message_store.c | 9 ++++--
.../gnunet-service-messenger_peer_store.c | 6 ++--
src/service/messenger/messenger_api.c | 37 +++++++++++++++++-----
.../messenger/messenger_api_contact_store.c | 2 ++
src/service/messenger/messenger_api_list_tunnels.c | 6 ++--
src/service/messenger/messenger_api_message.c | 32 +++++++++++--------
.../messenger/messenger_api_message_control.c | 2 +-
src/service/messenger/messenger_api_message_kind.c | 8 +++--
.../messenger/messenger_api_queue_messages.c | 4 +--
src/service/messenger/messenger_api_room.c | 9 ++++--
16 files changed, 114 insertions(+), 39 deletions(-)
diff --git a/src/service/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
index e97ab0d35..06f9384aa 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -287,16 +287,31 @@ check_send_message (void *cls,
if (msg_length < get_message_kind_size (GNUNET_MESSENGER_KIND_UNKNOWN,
GNUNET_YES))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Too short message: %s\n", GNUNET_h2s
(
+ &(msg->key)));
return GNUNET_NO;
+ }
if (GNUNET_YES != decode_message (&message, msg_length, msg_buffer,
GNUNET_YES,
NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Decoding message failed: %s\n",
+ GNUNET_h2s (
+ &(msg->key)));
return GNUNET_NO;
+ }
enum GNUNET_GenericReturnValue allowed;
allowed = filter_message_sending (&message);
+ if (GNUNET_SYSERR == allowed)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Sending message not allowed: %s to %s\n",
+ GNUNET_MESSENGER_name_of_kind (message.header.kind),
+ GNUNET_h2s (&(msg->key)));
+
cleanup_message (&message);
return GNUNET_SYSERR != allowed? GNUNET_OK : GNUNET_NO;
}
@@ -341,6 +356,10 @@ callback_found_message (void *cls,
if (! message)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Notifying client about missing message: %s\n",
+ GNUNET_h2s (hash));
+
struct GNUNET_MESSENGER_GetMessage *response;
struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/messenger/gnunet-service-messenger_handle.c
b/src/service/messenger/gnunet-service-messenger_handle.c
index c13517603..2d4b836b4 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -240,6 +240,7 @@ open_srv_handle_room (struct GNUNET_MESSENGER_SrvHandle
*handle,
key,
NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE))
+
return GNUNET_NO;
if ((! get_srv_handle_member_id (handle, key)) &&
@@ -499,6 +500,10 @@ iterate_next_member_ids (void *cls,
struct GNUNET_MESSENGER_SrvHandle *handle = cls;
struct GNUNET_MESSENGER_NextMemberId *next = value;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Notifying client about next member id: %s (%s)\n",
+ GNUNET_sh2s (&(next->id)), GNUNET_h2s (key));
+
struct GNUNET_MESSENGER_MemberMessage *msg;
struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/messenger/gnunet-service-messenger_list_messages.c
b/src/service/messenger/gnunet-service-messenger_list_messages.c
index 0cb4e5787..cd59c8aec 100644
--- a/src/service/messenger/gnunet-service-messenger_list_messages.c
+++ b/src/service/messenger/gnunet-service-messenger_list_messages.c
@@ -111,7 +111,8 @@ load_list_messages (struct GNUNET_MESSENGER_ListMessages
*messages,
return;
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_READ, permission
@@ -145,7 +146,8 @@ save_list_messages (const struct
GNUNET_MESSENGER_ListMessages *messages,
GNUNET_assert ((messages) && (path));
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
diff --git a/src/service/messenger/gnunet-service-messenger_member_session.c
b/src/service/messenger/gnunet-service-messenger_member_session.c
index dc1124360..4fa35594e 100644
--- a/src/service/messenger/gnunet-service-messenger_member_session.c
+++ b/src/service/messenger/gnunet-service-messenger_member_session.c
@@ -533,7 +533,8 @@ load_member_session_history (struct
GNUNET_MESSENGER_MemberSession *session,
return;
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_READ, permission
@@ -757,7 +758,8 @@ save_member_session_history (struct
GNUNET_MESSENGER_MemberSession *session,
GNUNET_assert ((session) && (path));
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
diff --git a/src/service/messenger/gnunet-service-messenger_message_recv.c
b/src/service/messenger/gnunet-service-messenger_message_recv.c
index 53e96b524..6d4d537b6 100644
--- a/src/service/messenger/gnunet-service-messenger_message_recv.c
+++ b/src/service/messenger/gnunet-service-messenger_message_recv.c
@@ -51,6 +51,7 @@ forward_about_members (struct GNUNET_MESSENGER_SrvRoom *room,
if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (map, &(element->hash),
NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Forwarding of session message could be duplicated!\n");
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.c
b/src/service/messenger/gnunet-service-messenger_message_send.c
index e7b92007b..05032e455 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.c
+++ b/src/service/messenger/gnunet-service-messenger_message_send.c
@@ -76,6 +76,7 @@ notify_about_members (struct GNUNET_MESSENGER_MemberNotify
*notify,
if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (map, &(element->hash),
NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Notification of session message could be duplicated!\n");
diff --git a/src/service/messenger/gnunet-service-messenger_message_store.c
b/src/service/messenger/gnunet-service-messenger_message_store.c
index d39e3f7bb..1eb275f9b 100644
--- a/src/service/messenger/gnunet-service-messenger_message_store.c
+++ b/src/service/messenger/gnunet-service-messenger_message_store.c
@@ -217,6 +217,7 @@ load_message_store_links (struct
GNUNET_MESSENGER_MessageStore *store,
(GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (store->links,
&(storage.hash), link,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
+
break;
}
while (link);
@@ -235,7 +236,8 @@ load_message_store (struct GNUNET_MESSENGER_MessageStore
*store,
GNUNET_assert ((store) && (directory));
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
if (store->storage_messages)
GNUNET_DISK_file_close (store->storage_messages);
@@ -369,7 +371,8 @@ save_message_store (struct GNUNET_MESSENGER_MessageStore
*store,
struct GNUNET_MESSENGER_ClosureMessageSave save;
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
char *filename;
@@ -526,6 +529,7 @@ get_store_message (struct GNUNET_MESSENGER_MessageStore
*store,
if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (store->messages, hash,
message,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
goto free_buffer;
free_message : destroy_message (message);
@@ -609,6 +613,7 @@ add_link (struct GNUNET_MESSENGER_MessageStore *store,
if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (store->links, hash, link,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
GNUNET_free (link);
else
store->write_links = GNUNET_YES;
diff --git a/src/service/messenger/gnunet-service-messenger_peer_store.c
b/src/service/messenger/gnunet-service-messenger_peer_store.c
index 5a2fd5f58..fdfbf599b 100644
--- a/src/service/messenger/gnunet-service-messenger_peer_store.c
+++ b/src/service/messenger/gnunet-service-messenger_peer_store.c
@@ -85,7 +85,8 @@ load_peer_store (struct GNUNET_MESSENGER_PeerStore *store,
path);
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_READ, permission
@@ -158,7 +159,8 @@ save_peer_store (const struct GNUNET_MESSENGER_PeerStore
*store,
path);
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
diff --git a/src/service/messenger/messenger_api.c
b/src/service/messenger/messenger_api.c
index 59102e1c1..df4499fe0 100644
--- a/src/service/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
@@ -602,6 +602,8 @@ GNUNET_MESSENGER_connect (const struct
GNUNET_CONFIGURATION_Handle *cfg,
if ((! key) || (0 < GNUNET_CRYPTO_private_key_get_length (key)))
set_handle_key (handle, key);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connect handle!\n");
+
struct GNUNET_MESSENGER_CreateMessage *msg;
struct GNUNET_MQ_Envelope *env;
@@ -623,6 +625,8 @@ GNUNET_MESSENGER_disconnect (struct GNUNET_MESSENGER_Handle
*handle)
if (! handle)
return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnect handle!\n");
+
struct GNUNET_MESSENGER_DestroyMessage *msg;
struct GNUNET_MQ_Envelope *env;
@@ -633,6 +637,18 @@ GNUNET_MESSENGER_disconnect (struct
GNUNET_MESSENGER_Handle *handle)
}
+static void
+callback_leave_message_sent (void *cls)
+{
+ struct GNUNET_MESSENGER_Room *room = cls;
+
+ room->opened = GNUNET_NO;
+ clear_list_tunnels (&(room->entries));
+
+ send_close_room (room->handle, room);
+}
+
+
static void
send_message_to_room (struct GNUNET_MESSENGER_Room *room,
struct GNUNET_MESSENGER_Message *message,
@@ -669,15 +685,15 @@ send_message_to_room (struct GNUNET_MESSENGER_Room *room,
hash_message (message, msg_length, msg_buffer, hash);
sign_message (message, msg_length, msg_buffer, hash, key);
- update_room_last_message (room, hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Send message (%s)!\n",
+ GNUNET_h2s (hash));
- GNUNET_MQ_send (room->handle->mq, env);
+ update_room_last_message (room, hash);
if (GNUNET_MESSENGER_KIND_LEAVE == message->header.kind)
- {
- send_close_room (room->handle, room);
- room->opened = GNUNET_NO;
- }
+ GNUNET_MQ_notify_sent (env, callback_leave_message_sent, room);
+
+ GNUNET_MQ_send (room->handle->mq, env);
}
@@ -939,8 +955,10 @@ GNUNET_MESSENGER_close_room (struct GNUNET_MESSENGER_Room
*room)
struct GNUNET_MESSENGER_Message *message = create_message_leave ();
- if (message)
- enqueue_message_to_room (room, message, NULL);
+ if (! message)
+ return;
+
+ enqueue_message_to_room (room, message, NULL);
}
@@ -1206,6 +1224,9 @@ GNUNET_MESSENGER_get_message (const struct
GNUNET_MESSENGER_Room *room,
if (! message)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Request message (%s)!\n",
+ GNUNET_h2s (hash));
+
struct GNUNET_MESSENGER_GetMessage *msg;
struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/messenger/messenger_api_contact_store.c
b/src/service/messenger/messenger_api_contact_store.c
index e60a8d5ca..081a8c6e9 100644
--- a/src/service/messenger/messenger_api_contact_store.c
+++ b/src/service/messenger/messenger_api_contact_store.c
@@ -143,6 +143,7 @@ get_store_contact (struct GNUNET_MESSENGER_ContactStore
*store,
if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (map, &hash, contact,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
return contact;
destroy_contact (contact);
@@ -183,6 +184,7 @@ update_store_contact (struct GNUNET_MESSENGER_ContactStore
*store,
if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (map, &hash, contact,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Updating a contact failed: %s\n",
GNUNET_h2s (&hash));
}
diff --git a/src/service/messenger/messenger_api_list_tunnels.c
b/src/service/messenger/messenger_api_list_tunnels.c
index 8f5b4788d..bb500233b 100644
--- a/src/service/messenger/messenger_api_list_tunnels.c
+++ b/src/service/messenger/messenger_api_list_tunnels.c
@@ -233,7 +233,8 @@ load_list_tunnels (struct GNUNET_MESSENGER_ListTunnels
*tunnels,
path);
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_READ, permission
@@ -270,7 +271,8 @@ save_list_tunnels (struct GNUNET_MESSENGER_ListTunnels
*tunnels,
path);
enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ
- |
GNUNET_DISK_PERM_USER_WRITE);
+ |
GNUNET_DISK_PERM_USER_WRITE
+ );
struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open (
path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
diff --git a/src/service/messenger/messenger_api_message.c
b/src/service/messenger/messenger_api_message.c
index b6813b55b..04234adb5 100644
--- a/src/service/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
@@ -116,7 +116,8 @@ copy_message (const struct GNUNET_MESSENGER_Message
*message)
break;
case GNUNET_MESSENGER_KIND_TICKET:
- copy->body.ticket.identifier = message->body.ticket.identifier?
GNUNET_strdup (
+ copy->body.ticket.identifier = message->body.ticket.identifier?
+ GNUNET_strdup (
message->body.ticket.identifier) : NULL;
break;
case GNUNET_MESSENGER_KIND_TRANSCRIPT:
@@ -516,6 +517,8 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind kind,
case GNUNET_MESSENGER_KIND_JOIN:
encode_step_key (buffer, offset, &(body->join.key), length);
break;
+ case GNUNET_MESSENGER_KIND_LEAVE:
+ break;
case GNUNET_MESSENGER_KIND_NAME:
if (body->name.name)
encode_step_ext (buffer, offset, body->name.name, min (length - offset,
@@ -579,8 +582,8 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind kind,
encode_step (buffer, offset, &value1);
break;
case GNUNET_MESSENGER_KIND_TICKET:
- encode_step_ext (buffer, offset, body->ticket.identifier,
- min (length - offset, strlen (body->ticket.identifier)));
+ encode_step_ext (buffer, offset, body->ticket.identifier,
+ min (length - offset, strlen (body->ticket.identifier)));
break;
case GNUNET_MESSENGER_KIND_TRANSCRIPT:
encode_step (buffer, offset, &(body->transcript.hash));
@@ -724,15 +727,17 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind
*kind,
uint32_t value0, value1;
switch (*kind)
{
- case GNUNET_MESSENGER_KIND_INFO: {
- decode_step (buffer, offset, &value0);
-
- body->info.messenger_version = GNUNET_be32toh (value0);
- break;
- } case GNUNET_MESSENGER_KIND_JOIN: {
- decode_step_key (buffer, offset, &(body->join.key), length);
- break;
- } case GNUNET_MESSENGER_KIND_NAME:
+ case GNUNET_MESSENGER_KIND_INFO:
+ decode_step (buffer, offset, &value0);
+
+ body->info.messenger_version = GNUNET_be32toh (value0);
+ break;
+ case GNUNET_MESSENGER_KIND_JOIN:
+ decode_step_key (buffer, offset, &(body->join.key), length);
+ break;
+ case GNUNET_MESSENGER_KIND_LEAVE:
+ break;
+ case GNUNET_MESSENGER_KIND_NAME:
if (length > offset)
decode_step_malloc (buffer, offset, body->name.name, length - offset, 1);
else
@@ -794,7 +799,8 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind
*kind,
break;
case GNUNET_MESSENGER_KIND_TICKET:
if (length > offset)
- decode_step_malloc (buffer, offset, body->ticket.identifier, length -
offset, 1);
+ decode_step_malloc (buffer, offset, body->ticket.identifier, length
+ - offset, 1);
else
body->ticket.identifier = NULL;
break;
diff --git a/src/service/messenger/messenger_api_message_control.c
b/src/service/messenger/messenger_api_message_control.c
index c46c047c4..e8d0333dc 100644
--- a/src/service/messenger/messenger_api_message_control.c
+++ b/src/service/messenger/messenger_api_message_control.c
@@ -222,7 +222,7 @@ process_message_control (struct
GNUNET_MESSENGER_MessageControl *control,
struct GNUNET_CONTAINER_MultiShortmap *map = NULL;
const struct GNUNET_ShortHashCode *id = &(message->header.sender_id);
- if (GNUNET_YES == is_peer_message(message))
+ if (GNUNET_YES == is_peer_message (message))
map = control->peer_messages;
switch (message->header.kind)
diff --git a/src/service/messenger/messenger_api_message_kind.c
b/src/service/messenger/messenger_api_message_kind.c
index fdc840bda..d423c5dda 100644
--- a/src/service/messenger/messenger_api_message_kind.c
+++ b/src/service/messenger/messenger_api_message_kind.c
@@ -98,7 +98,8 @@ create_message_id (const struct GNUNET_ShortHashCode
*unique_id)
return NULL;
GNUNET_memcpy (&(message->body.id.id), unique_id, sizeof(struct
-
GNUNET_ShortHashCode));
+
GNUNET_ShortHashCode)
+ );
return message;
}
@@ -143,7 +144,8 @@ create_message_invite (const struct GNUNET_PeerIdentity
*door,
return NULL;
GNUNET_memcpy (&(message->body.invite.door), door, sizeof(struct
-
GNUNET_PeerIdentity));
+
GNUNET_PeerIdentity)
+ );
GNUNET_memcpy (&(message->body.invite.key), key, sizeof(struct
GNUNET_HashCode));
@@ -201,7 +203,7 @@ create_message_ticket (const struct GNUNET_RECLAIM_Ticket
*ticket)
if (! message)
return NULL;
- message->body.ticket.identifier = GNUNET_strdup(ticket->gns_name);
+ message->body.ticket.identifier = GNUNET_strdup (ticket->gns_name);
return message;
}
diff --git a/src/service/messenger/messenger_api_queue_messages.c
b/src/service/messenger/messenger_api_queue_messages.c
index f29de368b..33e591da3 100644
--- a/src/service/messenger/messenger_api_queue_messages.c
+++ b/src/service/messenger/messenger_api_queue_messages.c
@@ -86,7 +86,7 @@ enqueue_to_messages (struct GNUNET_MESSENGER_QueueMessages
*messages,
if (! element->message)
{
if (element->transcript)
- destroy_message(element->transcript);
+ destroy_message (element->transcript);
GNUNET_free (element);
return;
@@ -121,7 +121,7 @@ dequeue_from_messages (struct
GNUNET_MESSENGER_QueueMessages *messages,
if (transcript)
*transcript = element->transcript;
else if (element->transcript)
- destroy_message(element->transcript);
+ destroy_message (element->transcript);
GNUNET_CONTAINER_DLL_remove (messages->head, messages->tail, element);
diff --git a/src/service/messenger/messenger_api_room.c
b/src/service/messenger/messenger_api_room.c
index e1970b668..cddd43b22 100644
--- a/src/service/messenger/messenger_api_room.c
+++ b/src/service/messenger/messenger_api_room.c
@@ -300,6 +300,7 @@ handle_join_message (struct GNUNET_MESSENGER_Room *room,
.sender_id),
entry->sender,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+
increase_contact_rc (entry->sender);
}
@@ -393,6 +394,7 @@ handle_id_message (struct GNUNET_MESSENGER_Room *room,
id.id),
entry->sender,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
+
return;
struct GNUNET_HashCode context, next_context;
@@ -574,7 +576,8 @@ read_transcript:
original->recipient = get_store_contact (store,
NULL,
-
&(entry->message->body.transcript.key));
+
&(entry->message->body.transcript.key
+ ));
if (original->message)
{
@@ -826,12 +829,14 @@ link_room_message (struct GNUNET_MESSENGER_Room *room,
return;
struct GNUNET_HashCode *value = GNUNET_memdup (other, sizeof(struct
-
GNUNET_HashCode));
+
GNUNET_HashCode))
+ ;
if (! value)
return;
if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->links, hash, value,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE))
+
GNUNET_free (value);
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: MESSENGER: Add logging and fix decoding issue of leave message,
gnunet <=