[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (5590ea9bc -> a118acdd6)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (5590ea9bc -> a118acdd6) |
|
Date: |
Tue, 02 Jan 2024 19:16:09 +0100 |
This is an automated email from the git hooks/post-receive script.
thejackimonster pushed a change to branch master
in repository gnunet.
from 5590ea9bc MESSENGER: Fix warning
new 7fee361b9 -ignore idea configuration files
new 85ee00ef0 -cleanup includes
new a118acdd6 MESSENGER: encode/decode connection message
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 5 +++
src/lib/util/gnunet_error_codes.c | 1 -
src/service/messenger/gnunet-service-messenger.c | 1 -
src/service/messenger/gnunet-service-messenger.h | 1 -
.../messenger/gnunet-service-messenger_basement.c | 1 -
.../messenger/gnunet-service-messenger_handle.h | 1 -
.../gnunet-service-messenger_list_handles.c | 1 -
.../gnunet-service-messenger_list_handles.h | 1 -
.../gnunet-service-messenger_list_messages.c | 1 -
.../gnunet-service-messenger_list_messages.h | 1 -
.../gnunet-service-messenger_member_session.c | 1 -
.../gnunet-service-messenger_member_session.h | 1 -
.../gnunet-service-messenger_member_store.h | 1 -
.../gnunet-service-messenger_message_handle.c | 1 -
.../gnunet-service-messenger_message_handle.h | 1 -
.../gnunet-service-messenger_message_kind.c | 1 -
.../gnunet-service-messenger_message_kind.h | 1 -
.../gnunet-service-messenger_message_recv.c | 1 -
.../gnunet-service-messenger_message_recv.h | 1 -
.../gnunet-service-messenger_message_send.c | 1 -
.../gnunet-service-messenger_message_send.h | 1 -
.../gnunet-service-messenger_message_state.c | 1 -
.../gnunet-service-messenger_message_state.h | 1 -
.../gnunet-service-messenger_message_store.c | 1 -
.../gnunet-service-messenger_message_store.h | 1 -
.../messenger/gnunet-service-messenger_operation.c | 1 -
.../messenger/gnunet-service-messenger_operation.h | 1 -
.../gnunet-service-messenger_operation_store.h | 1 -
.../messenger/gnunet-service-messenger_room.h | 1 -
.../gnunet-service-messenger_sender_session.h | 1 -
.../messenger/gnunet-service-messenger_service.c | 1 -
.../messenger/gnunet-service-messenger_service.h | 1 -
.../messenger/gnunet-service-messenger_tunnel.c | 1 -
.../messenger/gnunet-service-messenger_tunnel.h | 1 -
src/service/messenger/messenger-testing-cmds.h | 1 +
src/service/messenger/messenger-testing.c | 1 -
src/service/messenger/messenger-testing.h | 1 +
src/service/messenger/messenger_api.c | 1 -
.../messenger/messenger_api_cmd_join_room.c | 2 +-
.../messenger/messenger_api_cmd_start_service.c | 2 +-
.../messenger/messenger_api_cmd_stop_service.c | 2 +-
src/service/messenger/messenger_api_contact.c | 1 -
src/service/messenger/messenger_api_contact.h | 1 -
.../messenger/messenger_api_contact_store.c | 1 -
.../messenger/messenger_api_contact_store.h | 1 -
src/service/messenger/messenger_api_handle.c | 1 -
src/service/messenger/messenger_api_handle.h | 1 -
src/service/messenger/messenger_api_list_tunnels.c | 1 -
src/service/messenger/messenger_api_list_tunnels.h | 1 -
src/service/messenger/messenger_api_message.c | 36 +++++++++++++++++-----
src/service/messenger/messenger_api_message.h | 1 -
src/service/messenger/messenger_api_message_kind.c | 1 -
src/service/messenger/messenger_api_message_kind.h | 2 +-
src/service/messenger/messenger_api_peer_store.c | 1 -
src/service/messenger/messenger_api_peer_store.h | 1 -
.../messenger/messenger_api_queue_messages.h | 1 -
src/service/messenger/messenger_api_room.c | 1 -
src/service/messenger/messenger_api_room.h | 1 -
src/service/messenger/messenger_api_traits.c | 2 +-
src/service/messenger/messenger_api_util.c | 1 -
src/service/messenger/messenger_api_util.h | 1 -
src/service/messenger/test_messenger.c | 2 +-
src/service/messenger/test_messenger_anonymous.c | 2 +-
.../test_messenger_plugin_cmd_simple_join.c | 1 +
64 files changed, 44 insertions(+), 66 deletions(-)
diff --git a/.gitignore b/.gitignore
index cfb634b8e..7f9d827c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,7 +80,12 @@ CMakeLists.txt
CMakeFiles.txt
# Prevent cache files from IDEA from being commited
+.cproject
+.project
+.settings/
.idea/
+.vscode/
+.vimrc
src/util/test_child_management
gnunet_config.h
gnunet_config.h.in
diff --git a/src/lib/util/gnunet_error_codes.c
b/src/lib/util/gnunet_error_codes.c
index c286f2e52..11ce2d0c8 100644
--- a/src/lib/util/gnunet_error_codes.c
+++ b/src/lib/util/gnunet_error_codes.c
@@ -17,7 +17,6 @@
SPDX-License-Identifier: AGPL3.0-or-later
*/
-#include "platform.h"
#include "gnunet_error_codes.h"
#include <stddef.h>
#include <microhttpd.h>
diff --git a/src/service/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
index 7dc4e414d..f613b8b14 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger.h"
#include "gnunet-service-messenger_handle.h"
diff --git a/src/service/messenger/gnunet-service-messenger.h
b/src/service/messenger/gnunet-service-messenger.h
index 450f66bc7..821836fdf 100644
--- a/src/service/messenger/gnunet-service-messenger.h
+++ b/src/service/messenger/gnunet-service-messenger.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_H
#define GNUNET_SERVICE_MESSENGER_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_identity_service.h"
#include "gnunet_protocols.h"
diff --git a/src/service/messenger/gnunet-service-messenger_basement.c
b/src/service/messenger/gnunet-service-messenger_basement.c
index 8e3dd3358..5d1d475e9 100644
--- a/src/service/messenger/gnunet-service-messenger_basement.c
+++ b/src/service/messenger/gnunet-service-messenger_basement.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_basement.h"
size_t
diff --git a/src/service/messenger/gnunet-service-messenger_handle.h
b/src/service/messenger/gnunet-service-messenger_handle.h
index 988b8774e..ce9244771 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.h
+++ b/src/service/messenger/gnunet-service-messenger_handle.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_HANDLE_H
#define GNUNET_SERVICE_MESSENGER_HANDLE_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/gnunet-service-messenger_list_handles.c
b/src/service/messenger/gnunet-service-messenger_list_handles.c
index 62427ecde..dee692960 100644
--- a/src/service/messenger/gnunet-service-messenger_list_handles.c
+++ b/src/service/messenger/gnunet-service-messenger_list_handles.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_list_handles.h"
#include "gnunet-service-messenger_handle.h"
diff --git a/src/service/messenger/gnunet-service-messenger_list_handles.h
b/src/service/messenger/gnunet-service-messenger_list_handles.h
index d8ce23020..43c754d6c 100644
--- a/src/service/messenger/gnunet-service-messenger_list_handles.h
+++ b/src/service/messenger/gnunet-service-messenger_list_handles.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
#define GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
-#include "platform.h"
#include "gnunet_util_lib.h"
struct GNUNET_MESSENGER_SrvHandle;
diff --git a/src/service/messenger/gnunet-service-messenger_list_messages.c
b/src/service/messenger/gnunet-service-messenger_list_messages.c
index 063e1ebfc..c140b8480 100644
--- a/src/service/messenger/gnunet-service-messenger_list_messages.c
+++ b/src/service/messenger/gnunet-service-messenger_list_messages.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_list_messages.h"
void
diff --git a/src/service/messenger/gnunet-service-messenger_list_messages.h
b/src/service/messenger/gnunet-service-messenger_list_messages.h
index 5839f63ca..ccdfa1c99 100644
--- a/src/service/messenger/gnunet-service-messenger_list_messages.h
+++ b/src/service/messenger/gnunet-service-messenger_list_messages.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
#define GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
-#include "platform.h"
#include "gnunet_util_lib.h"
struct GNUNET_MESSENGER_ListMessage
diff --git a/src/service/messenger/gnunet-service-messenger_member_session.c
b/src/service/messenger/gnunet-service-messenger_member_session.c
index 206d6eac5..dc1124360 100644
--- a/src/service/messenger/gnunet-service-messenger_member_session.c
+++ b/src/service/messenger/gnunet-service-messenger_member_session.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_member_session.h"
#include "gnunet-service-messenger_room.h"
diff --git a/src/service/messenger/gnunet-service-messenger_member_session.h
b/src/service/messenger/gnunet-service-messenger_member_session.h
index 1f37e3d1a..85ce44e28 100644
--- a/src/service/messenger/gnunet-service-messenger_member_session.h
+++ b/src/service/messenger/gnunet-service-messenger_member_session.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
#define GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_time_lib.h"
diff --git a/src/service/messenger/gnunet-service-messenger_member_store.h
b/src/service/messenger/gnunet-service-messenger_member_store.h
index 3bdd0fe7c..161c93818 100644
--- a/src/service/messenger/gnunet-service-messenger_member_store.h
+++ b/src/service/messenger/gnunet-service-messenger_member_store.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
#define GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "messenger_api_message.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_handle.c
b/src/service/messenger/gnunet-service-messenger_message_handle.c
index b42c8f6a4..e730e12fe 100644
--- a/src/service/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_message_handle.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_handle.h"
static void
diff --git a/src/service/messenger/gnunet-service-messenger_message_handle.h
b/src/service/messenger/gnunet-service-messenger_message_handle.h
index f4306383d..f76ae356a 100644
--- a/src/service/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/service/messenger/gnunet-service-messenger_message_handle.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-messenger_sender_session.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_kind.c
b/src/service/messenger/gnunet-service-messenger_message_kind.c
index 8d474d504..a7932a068 100644
--- a/src/service/messenger/gnunet-service-messenger_message_kind.c
+++ b/src/service/messenger/gnunet-service-messenger_message_kind.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_kind.h"
#include "messenger_api_util.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_kind.h
b/src/service/messenger/gnunet-service-messenger_message_kind.h
index 0204da50a..972149288 100644
--- a/src/service/messenger/gnunet-service-messenger_message_kind.h
+++ b/src/service/messenger/gnunet-service-messenger_message_kind.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_time_lib.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_recv.c
b/src/service/messenger/gnunet-service-messenger_message_recv.c
index 02e871c59..b51b91d55 100644
--- a/src/service/messenger/gnunet-service-messenger_message_recv.c
+++ b/src/service/messenger/gnunet-service-messenger_message_recv.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_recv.h"
#include "gnunet-service-messenger_message_kind.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_recv.h
b/src/service/messenger/gnunet-service-messenger_message_recv.h
index b4a4f38f9..2c6cda4ad 100644
--- a/src/service/messenger/gnunet-service-messenger_message_recv.h
+++ b/src/service/messenger/gnunet-service-messenger_message_recv.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-messenger_member_session.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.c
b/src/service/messenger/gnunet-service-messenger_message_send.c
index d0c624057..ddabf0b32 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.c
+++ b/src/service/messenger/gnunet-service-messenger_message_send.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_send.h"
#include "gnunet-service-messenger_handle.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.h
b/src/service/messenger/gnunet-service-messenger_message_send.h
index e78215a67..0118dac99 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.h
+++ b/src/service/messenger/gnunet-service-messenger_message_send.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-messenger_tunnel.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_state.c
b/src/service/messenger/gnunet-service-messenger_message_state.c
index 9fdb62918..7229eb6ba 100644
--- a/src/service/messenger/gnunet-service-messenger_message_state.c
+++ b/src/service/messenger/gnunet-service-messenger_message_state.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_state.h"
void
diff --git a/src/service/messenger/gnunet-service-messenger_message_state.h
b/src/service/messenger/gnunet-service-messenger_message_state.h
index 5c6f3d981..fc1ccfac8 100644
--- a/src/service/messenger/gnunet-service-messenger_message_state.h
+++ b/src/service/messenger/gnunet-service-messenger_message_state.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "messenger_api_message.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_store.c
b/src/service/messenger/gnunet-service-messenger_message_store.c
index f14be03b0..835a9ef53 100644
--- a/src/service/messenger/gnunet-service-messenger_message_store.c
+++ b/src/service/messenger/gnunet-service-messenger_message_store.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_message_store.h"
#include "messenger_api_message.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_store.h
b/src/service/messenger/gnunet-service-messenger_message_store.h
index f73e1c3f3..9daf8fd11 100644
--- a/src/service/messenger/gnunet-service-messenger_message_store.h
+++ b/src/service/messenger/gnunet-service-messenger_message_store.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
struct GNUNET_MESSENGER_MessageEntry
diff --git a/src/service/messenger/gnunet-service-messenger_operation.c
b/src/service/messenger/gnunet-service-messenger_operation.c
index 3abd8382b..66cefb9ac 100644
--- a/src/service/messenger/gnunet-service-messenger_operation.c
+++ b/src/service/messenger/gnunet-service-messenger_operation.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_operation.h"
#include "gnunet-service-messenger_operation_store.h"
diff --git a/src/service/messenger/gnunet-service-messenger_operation.h
b/src/service/messenger/gnunet-service-messenger_operation.h
index 3885b3856..0e02cdf6a 100644
--- a/src/service/messenger/gnunet-service-messenger_operation.h
+++ b/src/service/messenger/gnunet-service-messenger_operation.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_OPERATION_H
#define GNUNET_SERVICE_MESSENGER_OPERATION_H
-#include "platform.h"
#include "gnunet_configuration_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_scheduler_lib.h"
diff --git a/src/service/messenger/gnunet-service-messenger_operation_store.h
b/src/service/messenger/gnunet-service-messenger_operation_store.h
index 3e7ab4a32..9b1c3259a 100644
--- a/src/service/messenger/gnunet-service-messenger_operation_store.h
+++ b/src/service/messenger/gnunet-service-messenger_operation_store.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
#define GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_time_lib.h"
diff --git a/src/service/messenger/gnunet-service-messenger_room.h
b/src/service/messenger/gnunet-service-messenger_room.h
index 00dc2140c..c3063748d 100644
--- a/src/service/messenger/gnunet-service-messenger_room.h
+++ b/src/service/messenger/gnunet-service-messenger_room.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_ROOM_H
#define GNUNET_SERVICE_MESSENGER_ROOM_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/gnunet-service-messenger_sender_session.h
b/src/service/messenger/gnunet-service-messenger_sender_session.h
index 6eb287607..8da9044ce 100644
--- a/src/service/messenger/gnunet-service-messenger_sender_session.h
+++ b/src/service/messenger/gnunet-service-messenger_sender_session.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_SENDER_SESSION_H
#define GNUNET_SERVICE_MESSENGER_SENDER_SESSION_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-messenger_member_session.h"
diff --git a/src/service/messenger/gnunet-service-messenger_service.c
b/src/service/messenger/gnunet-service-messenger_service.c
index d4d2a4a89..e6c9866df 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_service.h"
#include "gnunet-service-messenger.h"
#include "gnunet-service-messenger_message_kind.h"
diff --git a/src/service/messenger/gnunet-service-messenger_service.h
b/src/service/messenger/gnunet-service-messenger_service.h
index c0295691d..82a72ea9e 100644
--- a/src/service/messenger/gnunet-service-messenger_service.h
+++ b/src/service/messenger/gnunet-service-messenger_service.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_SERVICE_H
#define GNUNET_SERVICE_MESSENGER_SERVICE_H
-#include "platform.h"
#include "gnunet_configuration_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/gnunet-service-messenger_tunnel.c
b/src/service/messenger/gnunet-service-messenger_tunnel.c
index b36f9427c..87395797d 100644
--- a/src/service/messenger/gnunet-service-messenger_tunnel.c
+++ b/src/service/messenger/gnunet-service-messenger_tunnel.c
@@ -23,7 +23,6 @@
* @brief GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet-service-messenger_tunnel.h"
#include "gnunet-service-messenger_handle.h"
diff --git a/src/service/messenger/gnunet-service-messenger_tunnel.h
b/src/service/messenger/gnunet-service-messenger_tunnel.h
index a31ff31c6..6a8452f61 100644
--- a/src/service/messenger/gnunet-service-messenger_tunnel.h
+++ b/src/service/messenger/gnunet-service-messenger_tunnel.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_TUNNEL_H
#define GNUNET_SERVICE_MESSENGER_TUNNEL_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
diff --git a/src/service/messenger/messenger-testing-cmds.h
b/src/service/messenger/messenger-testing-cmds.h
index e763b9782..c7f068db9 100644
--- a/src/service/messenger/messenger-testing-cmds.h
+++ b/src/service/messenger/messenger-testing-cmds.h
@@ -25,6 +25,7 @@
*/
#ifndef MESSENGER_TESTING_CMDS_H
#define MESSENGER_TESTING_CMDS_H
+
#include "gnunet_testing_ng_lib.h"
#include "gnunet_testing_plugin.h"
diff --git a/src/service/messenger/messenger-testing.c
b/src/service/messenger/messenger-testing.c
index 7ffafb613..ec0f84a97 100644
--- a/src/service/messenger/messenger-testing.c
+++ b/src/service/messenger/messenger-testing.c
@@ -26,7 +26,6 @@
#include "messenger-testing.h"
-#include "platform.h"
#include "gnunet_util_lib.h"
struct GNUNET_MESSENGER_TestStage
diff --git a/src/service/messenger/messenger-testing.h
b/src/service/messenger/messenger-testing.h
index a0d98ff90..ba38557e8 100644
--- a/src/service/messenger/messenger-testing.h
+++ b/src/service/messenger/messenger-testing.h
@@ -23,6 +23,7 @@
* @brief testing lib for messenger service
* @author Tobias Frisch
*/
+
#ifndef MESSENGER_TESTING_H
#define MESSENGER_TESTING_H
diff --git a/src/service/messenger/messenger_api.c
b/src/service/messenger/messenger_api.c
index 22fa6e1ba..6d87a051d 100644
--- a/src/service/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "gnunet_identity_service.h"
#include "gnunet_messenger_service.h"
diff --git a/src/service/messenger/messenger_api_cmd_join_room.c
b/src/service/messenger/messenger_api_cmd_join_room.c
index f35220017..4e9cf1e22 100644
--- a/src/service/messenger/messenger_api_cmd_join_room.c
+++ b/src/service/messenger/messenger_api_cmd_join_room.c
@@ -23,7 +23,7 @@
* @brief cmd to join a room in a messenger service.
* @author Tobias Frisch
*/
-#include "platform.h"
+
#include "gnunet_util_lib.h"
#include "gnunet_core_testing_lib.h"
#include "gnunet_transport_testing_ng_lib.h"
diff --git a/src/service/messenger/messenger_api_cmd_start_service.c
b/src/service/messenger/messenger_api_cmd_start_service.c
index 2e56a365f..a35d338fd 100644
--- a/src/service/messenger/messenger_api_cmd_start_service.c
+++ b/src/service/messenger/messenger_api_cmd_start_service.c
@@ -23,7 +23,7 @@
* @brief cmd to start a messenger service.
* @author Tobias Frisch
*/
-#include "platform.h"
+
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
#include "gnunet_testing_netjail_lib.h"
diff --git a/src/service/messenger/messenger_api_cmd_stop_service.c
b/src/service/messenger/messenger_api_cmd_stop_service.c
index 697b59f98..0aeb9dcc5 100644
--- a/src/service/messenger/messenger_api_cmd_stop_service.c
+++ b/src/service/messenger/messenger_api_cmd_stop_service.c
@@ -23,7 +23,7 @@
* @brief cmd to stop a messenger service.
* @author Tobias Frisch
*/
-#include "platform.h"
+
#include "gnunet_util_lib.h"
#include "gnunet_testing_ng_lib.h"
#include "gnunet_messenger_service.h"
diff --git a/src/service/messenger/messenger_api_contact.c
b/src/service/messenger/messenger_api_contact.c
index 4d3a089ee..841f72a10 100644
--- a/src/service/messenger/messenger_api_contact.c
+++ b/src/service/messenger/messenger_api_contact.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_contact.h"
struct GNUNET_MESSENGER_Contact*
diff --git a/src/service/messenger/messenger_api_contact.h
b/src/service/messenger/messenger_api_contact.h
index fb933c578..2ef049200 100644
--- a/src/service/messenger/messenger_api_contact.h
+++ b/src/service/messenger/messenger_api_contact.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_CONTACT_H
#define GNUNET_MESSENGER_API_CONTACT_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/messenger_api_contact_store.c
b/src/service/messenger/messenger_api_contact_store.c
index 806983764..843377e6e 100644
--- a/src/service/messenger/messenger_api_contact_store.c
+++ b/src/service/messenger/messenger_api_contact_store.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_contact_store.h"
#include "messenger_api_contact.h"
diff --git a/src/service/messenger/messenger_api_contact_store.h
b/src/service/messenger/messenger_api_contact_store.h
index 8654273ea..f9982f3f3 100644
--- a/src/service/messenger/messenger_api_contact_store.h
+++ b/src/service/messenger/messenger_api_contact_store.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_CONTACT_STORE_H
#define GNUNET_MESSENGER_API_CONTACT_STORE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/messenger_api_handle.c
b/src/service/messenger/messenger_api_handle.c
index 7b3796310..a8cdf001b 100644
--- a/src/service/messenger/messenger_api_handle.c
+++ b/src/service/messenger/messenger_api_handle.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_handle.h"
#include "messenger_api_room.h"
diff --git a/src/service/messenger/messenger_api_handle.h
b/src/service/messenger/messenger_api_handle.h
index fb4e4c580..0d4c945c0 100644
--- a/src/service/messenger/messenger_api_handle.h
+++ b/src/service/messenger/messenger_api_handle.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_HANDLE_H
#define GNUNET_MESSENGER_API_HANDLE_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/messenger_api_list_tunnels.c
b/src/service/messenger/messenger_api_list_tunnels.c
index 8db0cae15..355f17527 100644
--- a/src/service/messenger/messenger_api_list_tunnels.c
+++ b/src/service/messenger/messenger_api_list_tunnels.c
@@ -23,7 +23,6 @@
* @brief messenger api: client and service implementation of GNUnet MESSENGER
service
*/
-#include "platform.h"
#include "messenger_api_list_tunnels.h"
void
diff --git a/src/service/messenger/messenger_api_list_tunnels.h
b/src/service/messenger/messenger_api_list_tunnels.h
index 427d0ef13..80d237fd1 100644
--- a/src/service/messenger/messenger_api_list_tunnels.h
+++ b/src/service/messenger/messenger_api_list_tunnels.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_LIST_TUNNELS_H
#define GNUNET_MESSENGER_API_LIST_TUNNELS_H
-#include "platform.h"
#include "gnunet_messenger_service.h"
#include "gnunet_util_lib.h"
diff --git a/src/service/messenger/messenger_api_message.c
b/src/service/messenger/messenger_api_message.c
index 2a2cbe2e2..51213bce5 100644
--- a/src/service/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
@@ -23,7 +23,6 @@
* @brief messenger api: client and service implementation of GNUnet MESSENGER
service
*/
-#include "platform.h"
#include "messenger_api_message.h"
struct GNUNET_MESSENGER_MessageSignature
@@ -241,6 +240,10 @@ get_message_body_kind_size (enum
GNUNET_MESSENGER_MessageKind kind)
length += member_size (struct GNUNET_MESSENGER_Message,
body.deletion.delay);
break;
+ case GNUNET_MESSENGER_KIND_CONNECTION:
+ length += member_size (struct GNUNET_MESSENGER_Message,
body.connection.amount);
+ length += member_size (struct GNUNET_MESSENGER_Message,
body.connection.flags);
+ break;
default:
break;
}
@@ -425,13 +428,13 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind
kind,
char *buffer,
uint16_t offset)
{
- uint32_t version;
+ uint32_t value0, value1;
switch (kind)
{
case GNUNET_MESSENGER_KIND_INFO:
- version = GNUNET_htobe32 (body->info.messenger_version);
+ value0 = GNUNET_htobe32 (body->info.messenger_version);
- encode_step (buffer, offset, &version);
+ encode_step (buffer, offset, &value0);
break;
case GNUNET_MESSENGER_KIND_JOIN:
encode_step_key (buffer, offset, &(body->join.key), length);
@@ -487,6 +490,13 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind
kind,
encode_step (buffer, offset, &(body->deletion.hash));
encode_step (buffer, offset, &(body->deletion.delay));
break;
+ case GNUNET_MESSENGER_KIND_CONNECTION:
+ value0 = GNUNET_htobe32 (body->connection.amount);
+ value1 = GNUNET_htobe32 (body->connection.flags);
+
+ encode_step (buffer, offset, &value0);
+ encode_step (buffer, offset, &value1);
+ break;
default:
break;
}
@@ -611,13 +621,13 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind
*kind,
length -= padding;
- uint32_t version;
+ uint32_t value0, value1;
switch (*kind)
{
case GNUNET_MESSENGER_KIND_INFO: {
- decode_step (buffer, offset, &version);
+ decode_step (buffer, offset, &value0);
- body->info.messenger_version = GNUNET_be32toh (version);
+ body->info.messenger_version = GNUNET_be32toh (value0);
break;
} case GNUNET_MESSENGER_KIND_JOIN: {
decode_step_key (buffer, offset, &(body->join.key), length);
@@ -669,6 +679,13 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind
*kind,
decode_step (buffer, offset, &(body->deletion.hash));
decode_step (buffer, offset, &(body->deletion.delay));
break;
+ case GNUNET_MESSENGER_KIND_CONNECTION:
+ decode_step (buffer, offset, &value0);
+ decode_step (buffer, offset, &value1);
+
+ body->connection.amount = GNUNET_be32toh (value0);
+ body->connection.flags = GNUNET_be32toh (value1);
+ break;
default:
*kind = GNUNET_MESSENGER_KIND_UNKNOWN;
break;
@@ -1054,6 +1071,7 @@ is_peer_message (const struct GNUNET_MESSENGER_Message
*message)
case GNUNET_MESSENGER_KIND_PEER:
case GNUNET_MESSENGER_KIND_MISS:
case GNUNET_MESSENGER_KIND_MERGE:
+ case GNUNET_MESSENGER_KIND_CONNECTION:
return GNUNET_YES;
default:
return GNUNET_NO;
@@ -1099,6 +1117,8 @@ is_service_message (const struct GNUNET_MESSENGER_Message
*message)
return GNUNET_YES; // Prevent duplicate encryption breaking all access!
case GNUNET_MESSENGER_KIND_DELETE:
return GNUNET_YES; // Deletion should not apply individually! (inefficieny)
+ case GNUNET_MESSENGER_KIND_CONNECTION:
+ return GNUNET_YES; // Reserved for connection handling only!
default:
return GNUNET_SYSERR;
}
@@ -1143,6 +1163,8 @@ filter_message_sending (const struct
GNUNET_MESSENGER_Message *message)
return GNUNET_NO; // Use #GNUNET_MESSENGER_send_message(...) with a
contact instead!
case GNUNET_MESSENGER_KIND_DELETE:
return GNUNET_YES;
+ case GNUNET_MESSENGER_KIND_CONNECTION:
+ return GNUNET_SYSERR; // Reserved for connection handling only!
default:
return GNUNET_SYSERR;
}
diff --git a/src/service/messenger/messenger_api_message.h
b/src/service/messenger/messenger_api_message.h
index dd399975f..41684c6b6 100644
--- a/src/service/messenger/messenger_api_message.h
+++ b/src/service/messenger/messenger_api_message.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_MESSAGE_H
#define GNUNET_MESSENGER_API_MESSAGE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_signatures.h"
diff --git a/src/service/messenger/messenger_api_message_kind.c
b/src/service/messenger/messenger_api_message_kind.c
index d2c11bbc5..7e8fd7a1d 100644
--- a/src/service/messenger/messenger_api_message_kind.c
+++ b/src/service/messenger/messenger_api_message_kind.c
@@ -25,7 +25,6 @@
#include "messenger_api_message_kind.h"
-#include "platform.h"
#include "messenger_api_util.h"
struct GNUNET_MESSENGER_Message*
diff --git a/src/service/messenger/messenger_api_message_kind.h
b/src/service/messenger/messenger_api_message_kind.h
index 5f7421c07..01bc9a232 100644
--- a/src/service/messenger/messenger_api_message_kind.h
+++ b/src/service/messenger/messenger_api_message_kind.h
@@ -26,7 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
-#include "platform.h"
+#include "gnunet_messenger_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
#include "gnunet_time_lib.h"
diff --git a/src/service/messenger/messenger_api_peer_store.c
b/src/service/messenger/messenger_api_peer_store.c
index 949510960..f9b4867f8 100644
--- a/src/service/messenger/messenger_api_peer_store.c
+++ b/src/service/messenger/messenger_api_peer_store.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_peer_store.h"
#include "messenger_api_message.h"
diff --git a/src/service/messenger/messenger_api_peer_store.h
b/src/service/messenger/messenger_api_peer_store.h
index f4f948cb9..960787466 100644
--- a/src/service/messenger/messenger_api_peer_store.h
+++ b/src/service/messenger/messenger_api_peer_store.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_PEER_STORE_H
#define GNUNET_MESSENGER_API_PEER_STORE_H
-#include "platform.h"
#include "gnunet_util_lib.h"
struct GNUNET_MESSENGER_Message;
diff --git a/src/service/messenger/messenger_api_queue_messages.h
b/src/service/messenger/messenger_api_queue_messages.h
index 5ba204153..64ded85ce 100644
--- a/src/service/messenger/messenger_api_queue_messages.h
+++ b/src/service/messenger/messenger_api_queue_messages.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_QUEUE_MESSAGES_H
#define GNUNET_MESSENGER_API_QUEUE_MESSAGES_H
-#include "platform.h"
#include "gnunet_identity_service.h"
#include "gnunet_util_lib.h"
diff --git a/src/service/messenger/messenger_api_room.c
b/src/service/messenger/messenger_api_room.c
index e66757f80..ea19879ec 100644
--- a/src/service/messenger/messenger_api_room.c
+++ b/src/service/messenger/messenger_api_room.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_room.h"
#include "messenger_api_handle.h"
diff --git a/src/service/messenger/messenger_api_room.h
b/src/service/messenger/messenger_api_room.h
index 3c276968f..19cef2131 100644
--- a/src/service/messenger/messenger_api_room.h
+++ b/src/service/messenger/messenger_api_room.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_MESSENGER_API_ROOM_H
#define GNUNET_MESSENGER_API_ROOM_H
-#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_messenger_service.h"
diff --git a/src/service/messenger/messenger_api_traits.c
b/src/service/messenger/messenger_api_traits.c
index f4641d24c..5f5088c9d 100644
--- a/src/service/messenger/messenger_api_traits.c
+++ b/src/service/messenger/messenger_api_traits.c
@@ -23,7 +23,7 @@
* @brief testing lib for messenger service
* @author Tobias Frisch
*/
-#include "platform.h"
+
#include "gnunet_testing_ng_lib.h"
#include "gnunet_testing_netjail_lib.h"
#include "messenger-testing-cmds.h"
diff --git a/src/service/messenger/messenger_api_util.c
b/src/service/messenger/messenger_api_util.c
index 391e36ebf..6cdeb647b 100644
--- a/src/service/messenger/messenger_api_util.c
+++ b/src/service/messenger/messenger_api_util.c
@@ -23,7 +23,6 @@
* @brief messenger api: client implementation of GNUnet MESSENGER service
*/
-#include "platform.h"
#include "messenger_api_util.h"
static void
diff --git a/src/service/messenger/messenger_api_util.h
b/src/service/messenger/messenger_api_util.h
index 5055245a0..a8b4e9150 100644
--- a/src/service/messenger/messenger_api_util.h
+++ b/src/service/messenger/messenger_api_util.h
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_UTIL_H
#define GNUNET_SERVICE_MESSENGER_UTIL_H
-#include "platform.h"
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
diff --git a/src/service/messenger/test_messenger.c
b/src/service/messenger/test_messenger.c
index 4d85e984f..3c3dbd14d 100644
--- a/src/service/messenger/test_messenger.c
+++ b/src/service/messenger/test_messenger.c
@@ -22,7 +22,7 @@
* @author Tobias Frisch
* @brief Test for the messenger service using cadet API.
*/
-#include "platform.h"
+
#include <stdio.h>
#include "gnunet_util_lib.h"
#include "gnunet_testing_lib.h"
diff --git a/src/service/messenger/test_messenger_anonymous.c
b/src/service/messenger/test_messenger_anonymous.c
index d3dadf2c5..5f77cca53 100644
--- a/src/service/messenger/test_messenger_anonymous.c
+++ b/src/service/messenger/test_messenger_anonymous.c
@@ -22,7 +22,7 @@
* @author Tobias Frisch
* @brief Test for the messenger service using cadet API.
*/
-#include "platform.h"
+
#include <stdio.h>
#include "gnunet_util_lib.h"
#include "gnunet_testing_lib.h"
diff --git a/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
b/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
index 4b2c627bd..08252f067 100644
--- a/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
+++ b/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
@@ -23,6 +23,7 @@
* @brief a plugin to provide the API for running test cases.
* @author Tobias Frisch
*/
+
#include "platform.h"
#include "gnunet_testing_barrier.h"
#include "gnunet_testing_netjail_lib.h"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (5590ea9bc -> a118acdd6),
gnunet <=