[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -fix ftbfs
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: -fix ftbfs |
|
Date: |
Sat, 29 Oct 2022 11:41:24 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new d7147f52d -fix ftbfs
d7147f52d is described below
commit d7147f52d822da0022e59b2b666091ef548222a6
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Oct 29 18:41:16 2022 +0900
-fix ftbfs
---
src/messenger/gnunet-service-messenger.c | 247 +++++++++++++++---------
src/messenger/gnunet-service-messenger_handle.c | 4 +-
src/messenger/messenger_api.c | 14 +-
src/messenger/messenger_api_message.c | 13 +-
4 files changed, 171 insertions(+), 107 deletions(-)
diff --git a/src/messenger/gnunet-service-messenger.c
b/src/messenger/gnunet-service-messenger.c
index 506ab7443..974bdbd37 100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/messenger/gnunet-service-messenger.c
@@ -42,7 +42,7 @@ static int
check_create (void *cls,
const struct GNUNET_MESSENGER_CreateMessage *msg)
{
- GNUNET_MQ_check_zero_termination(msg);
+ GNUNET_MQ_check_zero_termination (msg);
return GNUNET_OK;
}
@@ -54,7 +54,7 @@ handle_create (void *cls,
const char *name = ((const char*) msg) + sizeof(*msg);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Handle created with name: %s\n", name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Handle created with name: %s\n", name);
setup_srv_handle_name (msg_client->handle, strlen (name) > 0 ? name : NULL);
@@ -85,7 +85,7 @@ static int
check_set_name (void *cls,
const struct GNUNET_MESSENGER_NameMessage *msg)
{
- GNUNET_MQ_check_zero_termination(msg);
+ GNUNET_MQ_check_zero_termination (msg);
return GNUNET_OK;
}
@@ -97,7 +97,7 @@ handle_set_name (void *cls,
const char *name = ((const char*) msg) + sizeof(*msg);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Handles name is now: %s\n", name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Handles name is now: %s\n", name);
set_srv_handle_name (msg_client->handle, name);
@@ -110,23 +110,27 @@ handle_room_open (void *cls,
{
struct GNUNET_MESSENGER_Client *msg_client = cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Opening room: %s\n", GNUNET_h2s
(&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening room: %s\n", GNUNET_h2s (
+ &(msg->key)));
if (GNUNET_YES == open_srv_handle_room (msg_client->handle, &(msg->key)))
{
- const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id
(msg_client->handle, &(msg->key));
+ const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id (
+ msg_client->handle, &(msg->key));
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Opening room with member id: %s\n",
GNUNET_sh2s (member_id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening room with member id: %s\n",
+ GNUNET_sh2s (member_id));
struct GNUNET_MESSENGER_RoomMessage *response;
struct GNUNET_MQ_Envelope *env;
- env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
- GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
+ env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
+ GNUNET_memcpy (&(response->key), &(msg->key), sizeof(msg->key));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Opening room failed: %s\n",
GNUNET_h2s (&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Opening room failed: %s\n",
+ GNUNET_h2s (&(msg->key)));
GNUNET_SERVICE_client_continue (msg_client->client);
}
@@ -137,25 +141,30 @@ handle_room_entry (void *cls,
{
struct GNUNET_MESSENGER_Client *msg_client = cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Entering room: %s, %s\n", GNUNET_h2s
(&(msg->key)), GNUNET_i2s (&(msg->door)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Entering room: %s, %s\n", GNUNET_h2s (
+ &(msg->key)), GNUNET_i2s (&(msg->door)));
- if (GNUNET_YES == entry_srv_handle_room (msg_client->handle, &(msg->door),
&(msg->key)))
+ if (GNUNET_YES == entry_srv_handle_room (msg_client->handle, &(msg->door),
+ &(msg->key)))
{
- const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id
(msg_client->handle, &(msg->key));
+ const struct GNUNET_ShortHashCode *member_id = get_srv_handle_member_id (
+ msg_client->handle, &(msg->key));
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Entering room with member id: %s\n",
GNUNET_sh2s (member_id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Entering room with member id: %s\n",
+ GNUNET_sh2s (member_id));
struct GNUNET_MESSENGER_RoomMessage *response;
struct GNUNET_MQ_Envelope *env;
- env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
- GNUNET_memcpy(&(response->door), &(msg->door), sizeof(msg->door));
- GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
+ env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
+ GNUNET_memcpy (&(response->door), &(msg->door), sizeof(msg->door));
+ GNUNET_memcpy (&(response->key), &(msg->key), sizeof(msg->key));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Entrance into room failed: %s, %s\n",
GNUNET_h2s (&(msg->key)),
- GNUNET_i2s (&(msg->door)));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Entrance into room failed: %s, %s\n",
+ GNUNET_h2s (&(msg->key)),
+ GNUNET_i2s (&(msg->door)));
GNUNET_SERVICE_client_continue (msg_client->client);
}
@@ -166,21 +175,24 @@ handle_room_close (void *cls,
{
struct GNUNET_MESSENGER_Client *msg_client = cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Closing room: %s\n", GNUNET_h2s
(&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Closing room: %s\n", GNUNET_h2s (
+ &(msg->key)));
if (GNUNET_YES == close_srv_handle_room (msg_client->handle, &(msg->key)))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Closing room succeeded: %s\n",
GNUNET_h2s (&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Closing room succeeded: %s\n",
+ GNUNET_h2s (&(msg->key)));
struct GNUNET_MESSENGER_RoomMessage *response;
struct GNUNET_MQ_Envelope *env;
- env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
- GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
+ env = GNUNET_MQ_msg (response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
+ GNUNET_memcpy (&(response->key), &(msg->key), sizeof(msg->key));
GNUNET_MQ_send (msg_client->handle->mq, env);
}
else
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Closing room failed: %s\n",
GNUNET_h2s (&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Closing room failed: %s\n",
+ GNUNET_h2s (&(msg->key)));
GNUNET_SERVICE_client_continue (msg_client->client);
}
@@ -195,39 +207,42 @@ check_send_message (void *cls,
return GNUNET_NO;
const enum GNUNET_MESSENGER_MessageFlags flags = (
- (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
- );
+ (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
+ );
const uint16_t length = full_length - sizeof(*msg);
const char *buffer = ((const char*) msg) + sizeof(*msg);
- ssize_t key_length = 0;
+ size_t key_length = 0;
- if (!(flags & GNUNET_MESSENGER_FLAG_PRIVATE))
+ if (! (flags & GNUNET_MESSENGER_FLAG_PRIVATE))
goto check_for_message;
struct GNUNET_IDENTITY_PublicKey public_key;
- key_length = GNUNET_IDENTITY_read_key_from_buffer(&public_key, buffer,
length);
-
-check_for_message:
- if (key_length < 0)
+ if (GNUNET_SYSERR ==
+ GNUNET_IDENTITY_read_public_key_from_buffer (buffer, length,
+ &public_key,
+ &key_length))
return GNUNET_NO;
+ check_for_message:
+
const uint16_t msg_length = length - key_length;
- const char* msg_buffer = buffer + key_length;
+ const char*msg_buffer = buffer + key_length;
struct GNUNET_MESSENGER_Message message;
- if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN, GNUNET_NO))
+ 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))
+ if (GNUNET_YES != decode_message (&message, msg_length, msg_buffer,
GNUNET_NO,
+ NULL))
return GNUNET_NO;
- const int allowed = filter_message_sending(&message);
+ const int allowed = filter_message_sending (&message);
- cleanup_message(&message);
+ cleanup_message (&message);
return GNUNET_YES == allowed? GNUNET_OK : GNUNET_NO;
}
@@ -238,45 +253,47 @@ handle_send_message (void *cls,
struct GNUNET_MESSENGER_Client *msg_client = cls;
const enum GNUNET_MESSENGER_MessageFlags flags = (
- (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
- );
+ (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
+ );
const struct GNUNET_HashCode *key = &(msg->key);
const char *buffer = ((const char*) msg) + sizeof(*msg);
const uint16_t length = ntohs (msg->header.size) - sizeof(*msg);
- ssize_t key_length = 0;
+ size_t key_length = 0;
struct GNUNET_IDENTITY_PublicKey public_key;
if (flags & GNUNET_MESSENGER_FLAG_PRIVATE)
- key_length = GNUNET_IDENTITY_read_key_from_buffer(
- &public_key, buffer, length
- );
+ GNUNET_IDENTITY_read_public_key_from_buffer (
+ buffer, length, &public_key, &key_length);
const uint16_t msg_length = length - key_length;
- const char* msg_buffer = buffer + key_length;
+ const char*msg_buffer = buffer + key_length;
struct GNUNET_MESSENGER_Message message;
decode_message (&message, msg_length, msg_buffer, GNUNET_NO, NULL);
if ((flags & GNUNET_MESSENGER_FLAG_PRIVATE) &&
- (GNUNET_YES != encrypt_message(&message, &public_key)))
+ (GNUNET_YES != encrypt_message (&message, &public_key)))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Encrypting message failed: Message
got dropped!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Encrypting message failed: Message got dropped!\n");
goto end_handling;
}
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending message: %s to %s\n",
- GNUNET_MESSENGER_name_of_kind (message.header.kind), GNUNET_h2s
(key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message: %s to %s\n",
+ GNUNET_MESSENGER_name_of_kind (message.header.kind), GNUNET_h2s (
+ key));
if (GNUNET_YES != send_srv_handle_message (msg_client->handle, key,
&message))
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sending message failed: %s to %s\n",
- GNUNET_MESSENGER_name_of_kind (message.header.kind), GNUNET_h2s
(key));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Sending message failed: %s to %s\n",
+ GNUNET_MESSENGER_name_of_kind (message.header.kind),
+ GNUNET_h2s (key));
-end_handling:
- cleanup_message(&message);
+ end_handling:
+ cleanup_message (&message);
GNUNET_SERVICE_client_continue (msg_client->client);
}
@@ -289,26 +306,30 @@ callback_found_message (void *cls,
{
struct GNUNET_MESSENGER_Client *msg_client = cls;
- if (!message)
+ if (! message)
{
- send_srv_room_message(room, msg_client->handle,
create_message_request(hash));
+ send_srv_room_message (room, msg_client->handle, create_message_request (
+ hash));
return;
}
- struct GNUNET_MESSENGER_MemberStore *store = get_srv_room_member_store(room);
+ struct GNUNET_MESSENGER_MemberStore *store = get_srv_room_member_store
(room);
- struct GNUNET_MESSENGER_Member *member = get_store_member_of(store, message);
+ struct GNUNET_MESSENGER_Member *member = get_store_member_of (store,
message);
- if (!member)
+ if (! member)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sender of message (%s) unknown!\n",
GNUNET_h2s (hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Sender of message (%s) unknown!\n",
+ GNUNET_h2s (hash));
return;
}
- struct GNUNET_MESSENGER_MemberSession *session =
get_member_session_of(member, message, hash);
+ struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of (
+ member, message, hash);
if (session)
- notify_srv_handle_message (msg_client->handle, room, session, message,
hash);
+ notify_srv_handle_message (msg_client->handle, room, session, message,
+ hash);
}
static void
@@ -317,39 +338,55 @@ handle_get_message (void *cls,
{
struct GNUNET_MESSENGER_Client *msg_client = cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n",
GNUNET_h2s (&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n",
+ GNUNET_h2s (&(msg->key)));
- struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger,
&(msg->key));
+ struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger,
+ &(msg->key));
- if (!room)
+ if (! room)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Room not found: %s\n", GNUNET_h2s
(&(msg->key)));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Room not found: %s\n", GNUNET_h2s (
+ &(msg->key)));
goto end_handling;
}
- struct GNUNET_MESSENGER_MemberStore *member_store =
get_srv_room_member_store(room);
+ struct GNUNET_MESSENGER_MemberStore *member_store =
+ get_srv_room_member_store (room);
- struct GNUNET_MESSENGER_Member *member = get_store_member(member_store,
get_srv_handle_member_id(
- msg_client->handle, &(msg->key)
- ));
+ struct GNUNET_MESSENGER_Member *member = get_store_member (member_store,
+
get_srv_handle_member_id (
+ msg_client->
+ handle,
+ &(msg->key)
+ ));
- if (!member)
+ if (! member)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Member not valid to request a
message!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Member not valid to request a message!\n");
goto end_handling;
}
- struct GNUNET_MESSENGER_MemberSession *session = get_member_session(member,
&(get_srv_handle_ego(msg_client->handle)->pub));
+ struct GNUNET_MESSENGER_MemberSession *session = get_member_session (member,
+ &(
+
get_srv_handle_ego (
+
msg_client
+ ->
+
handle)
+
->pub));
- if (!session)
+ if (! session)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Session not valid to request a
message!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Session not valid to request a message!\n");
goto end_handling;
}
- request_srv_room_message (room, &(msg->hash), session,
callback_found_message, msg_client);
+ request_srv_room_message (room, &(msg->hash), session,
callback_found_message,
+ msg_client);
-end_handling:
+ end_handling:
GNUNET_SERVICE_client_continue (msg_client->client);
}
@@ -358,7 +395,8 @@ callback_client_connect (void *cls,
struct GNUNET_SERVICE_Client *client,
struct GNUNET_MQ_Handle *mq)
{
- struct GNUNET_MESSENGER_Client *msg_client = GNUNET_new(struct
GNUNET_MESSENGER_Client);
+ struct GNUNET_MESSENGER_Client *msg_client = GNUNET_new (struct
+
GNUNET_MESSENGER_Client);
msg_client->client = client;
msg_client->handle = add_service_handle (messenger, mq);
@@ -375,7 +413,7 @@ callback_client_disconnect (void *cls,
remove_service_handle (messenger, msg_client->handle);
- GNUNET_free(msg_client);
+ GNUNET_free (msg_client);
}
/**
@@ -392,27 +430,46 @@ run (void *cls,
{
messenger = create_service (config, service);
- if (!messenger)
+ if (! messenger)
GNUNET_SCHEDULER_shutdown ();
}
/**
* Define "main" method using service macro.
*/
-GNUNET_SERVICE_MAIN(
- GNUNET_MESSENGER_SERVICE_NAME,
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &callback_client_connect,
- &callback_client_disconnect,
- NULL,
- GNUNET_MQ_hd_var_size( create,
GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_CREATE, struct
GNUNET_MESSENGER_CreateMessage, NULL ),
- GNUNET_MQ_hd_fixed_size( update,
GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_UPDATE, struct
GNUNET_MESSENGER_UpdateMessage, NULL ),
- GNUNET_MQ_hd_fixed_size( destroy,
GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_DESTROY, struct
GNUNET_MESSENGER_DestroyMessage, NULL ),
- GNUNET_MQ_hd_var_size( set_name,
GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_SET_NAME, struct
GNUNET_MESSENGER_NameMessage, NULL ),
- GNUNET_MQ_hd_fixed_size( room_open,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN, struct GNUNET_MESSENGER_RoomMessage,
NULL ),
- GNUNET_MQ_hd_fixed_size( room_entry,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY, struct GNUNET_MESSENGER_RoomMessage,
NULL ),
- GNUNET_MQ_hd_fixed_size( room_close,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE, struct GNUNET_MESSENGER_RoomMessage,
NULL ),
- GNUNET_MQ_hd_var_size( send_message,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SEND_MESSAGE, struct
GNUNET_MESSENGER_SendMessage, NULL ),
- GNUNET_MQ_hd_fixed_size( get_message,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_GET_MESSAGE, struct
GNUNET_MESSENGER_GetMessage, NULL ),
- GNUNET_MQ_handler_end());
+GNUNET_SERVICE_MAIN (
+ GNUNET_MESSENGER_SERVICE_NAME,
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &callback_client_connect,
+ &callback_client_disconnect,
+ NULL,
+ GNUNET_MQ_hd_var_size (create,
+ GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_CREATE,
struct
+ GNUNET_MESSENGER_CreateMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (update,
+ GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_UPDATE,
+ struct
+ GNUNET_MESSENGER_UpdateMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (destroy,
+ GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_DESTROY,
+ struct
+ GNUNET_MESSENGER_DestroyMessage, NULL),
+ GNUNET_MQ_hd_var_size (set_name,
+ GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_SET_NAME,
+ struct
+ GNUNET_MESSENGER_NameMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (room_open, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN,
+ struct GNUNET_MESSENGER_RoomMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (room_entry,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY,
+ struct GNUNET_MESSENGER_RoomMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (room_close,
GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE,
+ struct GNUNET_MESSENGER_RoomMessage, NULL),
+ GNUNET_MQ_hd_var_size (send_message,
+ GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SEND_MESSAGE,
struct
+ GNUNET_MESSENGER_SendMessage, NULL),
+ GNUNET_MQ_hd_fixed_size (get_message,
+ GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_GET_MESSAGE,
+ struct
+ GNUNET_MESSENGER_GetMessage, NULL),
+ GNUNET_MQ_handler_end ());
diff --git a/src/messenger/gnunet-service-messenger_handle.c
b/src/messenger/gnunet-service-messenger_handle.c
index a4fa81623..28fa022c7 100644
--- a/src/messenger/gnunet-service-messenger_handle.c
+++ b/src/messenger/gnunet-service-messenger_handle.c
@@ -216,7 +216,7 @@ change_handle_ego (struct GNUNET_MESSENGER_SrvHandle
*handle,
ego = get_srv_handle_ego (handle);
- const uint16_t length = GNUNET_IDENTITY_key_get_length(&(ego->pub));
+ const uint16_t length = GNUNET_IDENTITY_public_key_get_length(&(ego->pub));
struct GNUNET_MESSENGER_KeyMessage *msg;
struct GNUNET_MQ_Envelope *env;
@@ -225,7 +225,7 @@ change_handle_ego (struct GNUNET_MESSENGER_SrvHandle
*handle,
char *extra = ((char*) msg) + sizeof(*msg);
- if (GNUNET_IDENTITY_write_key_to_buffer(&(ego->pub), extra, length) < 0)
+ if (GNUNET_IDENTITY_write_public_key_to_buffer(&(ego->pub), extra, length) <
0)
GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Could not write key to buffer.\n");
GNUNET_MQ_send (handle->mq, env);
diff --git a/src/messenger/messenger_api.c b/src/messenger/messenger_api.c
index 8cbe26549..85092fc43 100644
--- a/src/messenger/messenger_api.c
+++ b/src/messenger/messenger_api.c
@@ -105,7 +105,10 @@ check_get_key (void *cls,
const char *buffer = ((const char*) msg) + sizeof(*msg);
struct GNUNET_IDENTITY_PublicKey pubkey;
- if (GNUNET_IDENTITY_read_key_from_buffer(&pubkey, buffer, length) < 0)
+ size_t read;
+ if (GNUNET_SYSERR ==
+ GNUNET_IDENTITY_read_public_key_from_buffer(buffer, length,
+ &pubkey, &read))
return GNUNET_NO;
return GNUNET_OK;
@@ -121,7 +124,10 @@ handle_get_key (void *cls,
const char *buffer = ((const char*) msg) + sizeof(*msg);
struct GNUNET_IDENTITY_PublicKey pubkey;
- if (GNUNET_IDENTITY_read_key_from_buffer(&pubkey, buffer, length) < 0)
+ size_t read;
+ if (GNUNET_SYSERR ==
+ GNUNET_IDENTITY_read_public_key_from_buffer(buffer, length,
+ &pubkey, &read))
return;
char* str = GNUNET_IDENTITY_public_key_to_string (&pubkey);
@@ -719,7 +725,7 @@ GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room
*room,
);
if (public_key)
- key_length = GNUNET_IDENTITY_key_get_length(public_key);
+ key_length = GNUNET_IDENTITY_public_key_get_length(public_key);
else
key_length = -1;
}
@@ -752,7 +758,7 @@ GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room
*room,
char *msg_buffer = buffer + key_length;
if (key_length > 0)
- GNUNET_IDENTITY_write_key_to_buffer(get_contact_key(contact), buffer,
key_length);
+ GNUNET_IDENTITY_write_public_key_to_buffer(get_contact_key(contact),
buffer, key_length);
encode_message (message, msg_length, msg_buffer, GNUNET_NO);
diff --git a/src/messenger/messenger_api_message.c
b/src/messenger/messenger_api_message.c
index 3814def70..2e4f46bff 100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/messenger/messenger_api_message.c
@@ -259,16 +259,16 @@ get_message_body_size (enum GNUNET_MESSENGER_MessageKind
kind,
switch (kind)
{
case GNUNET_MESSENGER_KIND_INFO:
- length += GNUNET_IDENTITY_key_get_length(&(body->info.host_key));
+ length += GNUNET_IDENTITY_public_key_get_length(&(body->info.host_key));
break;
case GNUNET_MESSENGER_KIND_JOIN:
- length += GNUNET_IDENTITY_key_get_length(&(body->join.key));
+ length += GNUNET_IDENTITY_public_key_get_length(&(body->join.key));
break;
case GNUNET_MESSENGER_KIND_NAME:
length += (body->name.name ? strlen (body->name.name) : 0);
break;
case GNUNET_MESSENGER_KIND_KEY:
- length += GNUNET_IDENTITY_key_get_length(&(body->key.key));
+ length += GNUNET_IDENTITY_public_key_get_length(&(body->key.key));
break;
case GNUNET_MESSENGER_KIND_TEXT:
length += strlen (body->text.text);
@@ -372,7 +372,7 @@ calc_padded_length (uint16_t length)
} while (0)
#define encode_step_key(dst, offset, src, length) do { \
- ssize_t result = GNUNET_IDENTITY_write_key_to_buffer( \
+ ssize_t result = GNUNET_IDENTITY_write_public_key_to_buffer( \
src, dst + offset, length - offset \
); \
if (result < 0) \
@@ -539,8 +539,9 @@ encode_short_message (const struct
GNUNET_MESSENGER_ShortMessage *message,
} while (0)
#define decode_step_key(src, offset, dst, length) do { \
- ssize_t result = GNUNET_IDENTITY_read_key_from_buffer( \
- dst, src + offset, length - offset \
+ size_t read; \
+ ssize_t result = GNUNET_IDENTITY_read_public_key_from_buffer( \
+ src + offset, length - offset, dst, &read \
); \
if (result < 0) \
GNUNET_break(0); \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.