[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/08: MESSENGER: Cleanup includes in code
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/08: MESSENGER: Cleanup includes in code |
|
Date: |
Sat, 20 Jan 2024 10:08:30 +0100 |
This is an automated email from the git hooks/post-receive script.
thejackimonster pushed a commit to branch master
in repository gnunet.
commit f239edd23faf14a23ad36e9770b364eed544a463
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Fri Jan 19 19:36:58 2024 +0100
MESSENGER: Cleanup includes in code
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
src/service/messenger/gnunet-service-messenger.c | 4 ++--
src/service/messenger/gnunet-service-messenger.h | 5 +----
src/service/messenger/gnunet-service-messenger_handle.c | 5 +++--
src/service/messenger/gnunet-service-messenger_handle.h | 6 +-----
.../messenger/gnunet-service-messenger_list_handles.h | 4 ++--
.../messenger/gnunet-service-messenger_list_messages.c | 4 +++-
.../messenger/gnunet-service-messenger_list_messages.h | 4 ++--
src/service/messenger/gnunet-service-messenger_member.c | 4 +++-
src/service/messenger/gnunet-service-messenger_member.h | 7 +------
.../messenger/gnunet-service-messenger_member_session.h | 4 ++--
.../messenger/gnunet-service-messenger_member_store.c | 4 +++-
.../messenger/gnunet-service-messenger_member_store.h | 6 +++---
.../messenger/gnunet-service-messenger_message_handle.c | 4 +++-
.../messenger/gnunet-service-messenger_message_handle.h | 7 +------
.../messenger/gnunet-service-messenger_message_kind.c | 6 ++++--
.../messenger/gnunet-service-messenger_message_kind.h | 5 +----
.../messenger/gnunet-service-messenger_message_recv.c | 3 ++-
.../messenger/gnunet-service-messenger_message_recv.h | 6 +-----
.../messenger/gnunet-service-messenger_message_send.h | 7 ++-----
.../messenger/gnunet-service-messenger_message_state.h | 5 ++---
src/service/messenger/gnunet-service-messenger_operation.h | 3 +--
src/service/messenger/gnunet-service-messenger_room.c | 8 ++------
src/service/messenger/gnunet-service-messenger_room.h | 12 +++++-------
src/service/messenger/gnunet-service-messenger_service.c | 7 +++++--
src/service/messenger/gnunet-service-messenger_service.h | 7 +++----
src/service/messenger/gnunet-service-messenger_tunnel.c | 3 ++-
src/service/messenger/messenger_api_contact.h | 3 +--
src/service/messenger/messenger_api_contact_store.h | 3 +--
src/service/messenger/messenger_api_handle.h | 4 +---
src/service/messenger/messenger_api_message.c | 4 +++-
src/service/messenger/messenger_api_message.h | 4 +---
src/service/messenger/messenger_api_message_kind.c | 4 ++--
src/service/messenger/messenger_api_message_kind.h | 6 +-----
src/service/messenger/messenger_api_queue_messages.c | 4 +++-
src/service/messenger/messenger_api_queue_messages.h | 5 +----
src/service/messenger/messenger_api_room.c | 3 ++-
src/service/messenger/messenger_api_room.h | 3 +--
src/service/messenger/messenger_api_util.c | 5 ++++-
src/service/messenger/messenger_api_util.h | 4 +---
39 files changed, 82 insertions(+), 110 deletions(-)
diff --git a/src/service/messenger/gnunet-service-messenger.c
b/src/service/messenger/gnunet-service-messenger.c
index f613b8b14..2cbc8933d 100644
--- a/src/service/messenger/gnunet-service-messenger.c
+++ b/src/service/messenger/gnunet-service-messenger.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,9 +26,9 @@
#include "gnunet-service-messenger.h"
#include "gnunet-service-messenger_handle.h"
+#include "gnunet-service-messenger_room.h"
#include "gnunet-service-messenger_service.h"
#include "messenger_api_message.h"
-#include "messenger_api_message_kind.h"
struct GNUNET_MESSENGER_Client
{
diff --git a/src/service/messenger/gnunet-service-messenger.h
b/src/service/messenger/gnunet-service-messenger.h
index 821836fdf..c3e762734 100644
--- a/src/service/messenger/gnunet-service-messenger.h
+++ b/src/service/messenger/gnunet-service-messenger.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,9 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_H
#define GNUNET_SERVICE_MESSENGER_H
-#include "gnunet_cadet_service.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_protocols.h"
#include "gnunet_util_lib.h"
/**
diff --git a/src/service/messenger/gnunet-service-messenger_handle.c
b/src/service/messenger/gnunet-service-messenger_handle.c
index 9cd460fd3..55548c0fb 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,7 +27,8 @@
#include "gnunet-service-messenger_handle.h"
#include "gnunet-service-messenger.h"
-#include "messenger_api_message_kind.h"
+#include "gnunet-service-messenger_room.h"
+
#include "messenger_api_util.h"
struct GNUNET_MESSENGER_NextMemberId
diff --git a/src/service/messenger/gnunet-service-messenger_handle.h
b/src/service/messenger/gnunet-service-messenger_handle.h
index ce9244771..46e9c4b63 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.h
+++ b/src/service/messenger/gnunet-service-messenger_handle.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,15 +26,11 @@
#ifndef GNUNET_SERVICE_MESSENGER_HANDLE_H
#define GNUNET_SERVICE_MESSENGER_HANDLE_H
-#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet-service-messenger_service.h"
#include "gnunet-service-messenger_sender_session.h"
-#include "messenger_api_message.h"
-
struct GNUNET_MESSENGER_SrvHandle
{
struct GNUNET_MESSENGER_Service *service;
diff --git a/src/service/messenger/gnunet-service-messenger_list_handles.h
b/src/service/messenger/gnunet-service-messenger_list_handles.h
index 43c754d6c..64dee6544 100644
--- a/src/service/messenger/gnunet-service-messenger_list_handles.h
+++ b/src/service/messenger/gnunet-service-messenger_list_handles.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,7 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
#define GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
-#include "gnunet_util_lib.h"
+#include "gnunet_common.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 c140b8480..0cb4e5787 100644
--- a/src/service/messenger/gnunet-service-messenger_list_messages.c
+++ b/src/service/messenger/gnunet-service-messenger_list_messages.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,6 +25,8 @@
#include "gnunet-service-messenger_list_messages.h"
+#include "gnunet_util_lib.h"
+
void
init_list_messages (struct GNUNET_MESSENGER_ListMessages *messages)
{
diff --git a/src/service/messenger/gnunet-service-messenger_list_messages.h
b/src/service/messenger/gnunet-service-messenger_list_messages.h
index ccdfa1c99..133091506 100644
--- a/src/service/messenger/gnunet-service-messenger_list_messages.h
+++ b/src/service/messenger/gnunet-service-messenger_list_messages.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2021 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,7 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
#define GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
-#include "gnunet_util_lib.h"
+#include "gnunet_common.h"
struct GNUNET_MESSENGER_ListMessage
{
diff --git a/src/service/messenger/gnunet-service-messenger_member.c
b/src/service/messenger/gnunet-service-messenger_member.c
index 19cc9559d..0940c42ce 100644
--- a/src/service/messenger/gnunet-service-messenger_member.c
+++ b/src/service/messenger/gnunet-service-messenger_member.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -28,6 +28,8 @@
#include "gnunet-service-messenger_member_session.h"
+#include "messenger_api_util.h"
+
struct GNUNET_MESSENGER_Member*
create_member (struct GNUNET_MESSENGER_MemberStore *store,
const struct GNUNET_ShortHashCode *id)
diff --git a/src/service/messenger/gnunet-service-messenger_member.h
b/src/service/messenger/gnunet-service-messenger_member.h
index 1f239aa21..0e5afaa6a 100644
--- a/src/service/messenger/gnunet-service-messenger_member.h
+++ b/src/service/messenger/gnunet-service-messenger_member.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,12 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_H
#define GNUNET_SERVICE_MESSENGER_MEMBER_H
-#include "messenger_api_contact.h"
-
-#include "gnunet-service-messenger_list_messages.h"
#include "gnunet-service-messenger_member_store.h"
-#include "messenger_api_message.h"
-#include "messenger_api_util.h"
struct GNUNET_MESSENGER_Member
{
diff --git a/src/service/messenger/gnunet-service-messenger_member_session.h
b/src/service/messenger/gnunet-service-messenger_member_session.h
index 85ce44e28..8cd944afa 100644
--- a/src/service/messenger/gnunet-service-messenger_member_session.h
+++ b/src/service/messenger/gnunet-service-messenger_member_session.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2021, 2023 GNUnet e.V.
+ Copyright (C) 2021--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,9 +27,9 @@
#define GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet_time_lib.h"
+#include "gnunet-service-messenger_list_messages.h"
#include "gnunet-service-messenger_member.h"
#include "messenger_api_contact.h"
diff --git a/src/service/messenger/gnunet-service-messenger_member_store.c
b/src/service/messenger/gnunet-service-messenger_member_store.c
index 732e3f9a3..fb45147f4 100644
--- a/src/service/messenger/gnunet-service-messenger_member_store.c
+++ b/src/service/messenger/gnunet-service-messenger_member_store.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -30,6 +30,8 @@
#include "gnunet-service-messenger_service.h"
#include "gnunet-service-messenger_room.h"
+#include "messenger_api_message.h"
+
void
init_member_store (struct GNUNET_MESSENGER_MemberStore *store,
struct GNUNET_MESSENGER_SrvRoom *room)
diff --git a/src/service/messenger/gnunet-service-messenger_member_store.h
b/src/service/messenger/gnunet-service-messenger_member_store.h
index 161c93818..181593e6b 100644
--- a/src/service/messenger/gnunet-service-messenger_member_store.h
+++ b/src/service/messenger/gnunet-service-messenger_member_store.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,8 +27,8 @@
#define GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "messenger_api_message.h"
+
+#include "gnunet_messenger_service.h"
struct GNUNET_MESSENGER_SrvRoom;
diff --git a/src/service/messenger/gnunet-service-messenger_message_handle.c
b/src/service/messenger/gnunet-service-messenger_message_handle.c
index e730e12fe..d9ee1ef13 100644
--- a/src/service/messenger/gnunet-service-messenger_message_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_message_handle.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,6 +25,8 @@
#include "gnunet-service-messenger_message_handle.h"
+#include "gnunet-service-messenger_room.h"
+
static void
handle_member_session_switch (struct GNUNET_MESSENGER_MemberSession *session,
const struct GNUNET_MESSENGER_Message *message,
diff --git a/src/service/messenger/gnunet-service-messenger_message_handle.h
b/src/service/messenger/gnunet-service-messenger_message_handle.h
index f76ae356a..a66c45192 100644
--- a/src/service/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/service/messenger/gnunet-service-messenger_message_handle.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,12 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
-#include "gnunet_util_lib.h"
-
#include "gnunet-service-messenger_sender_session.h"
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
-#include "messenger_api_message_kind.h"
/**
* Handles a received or sent join message to make changes of current member
information.
diff --git a/src/service/messenger/gnunet-service-messenger_message_kind.c
b/src/service/messenger/gnunet-service-messenger_message_kind.c
index a7932a068..f1a79b321 100644
--- a/src/service/messenger/gnunet-service-messenger_message_kind.c
+++ b/src/service/messenger/gnunet-service-messenger_message_kind.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,7 +25,9 @@
#include "gnunet-service-messenger_message_kind.h"
-#include "messenger_api_util.h"
+#include "gnunet-service-messenger_room.h"
+
+#include "messenger_api_message.h"
struct GNUNET_MESSENGER_Message*
create_message_info (struct GNUNET_MESSENGER_Service *service)
diff --git a/src/service/messenger/gnunet-service-messenger_message_kind.h
b/src/service/messenger/gnunet-service-messenger_message_kind.h
index 972149288..7fc7a7cc0 100644
--- a/src/service/messenger/gnunet-service-messenger_message_kind.h
+++ b/src/service/messenger/gnunet-service-messenger_message_kind.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,10 +27,7 @@
#define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_time_lib.h"
-#include "messenger_api_message.h"
#include "gnunet-service-messenger_service.h"
/**
diff --git a/src/service/messenger/gnunet-service-messenger_message_recv.c
b/src/service/messenger/gnunet-service-messenger_message_recv.c
index b51b91d55..53e96b524 100644
--- a/src/service/messenger/gnunet-service-messenger_message_recv.c
+++ b/src/service/messenger/gnunet-service-messenger_message_recv.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,6 +25,7 @@
#include "gnunet-service-messenger_message_recv.h"
+#include "gnunet-service-messenger_basement.h"
#include "gnunet-service-messenger_message_kind.h"
#include "gnunet-service-messenger_operation.h"
diff --git a/src/service/messenger/gnunet-service-messenger_message_recv.h
b/src/service/messenger/gnunet-service-messenger_message_recv.h
index 2c6cda4ad..58eb1d5cc 100644
--- a/src/service/messenger/gnunet-service-messenger_message_recv.h
+++ b/src/service/messenger/gnunet-service-messenger_message_recv.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,11 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
-#include "gnunet_util_lib.h"
-
-#include "gnunet-service-messenger_member_session.h"
#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
/**
* Handles a received info message to change the current member id to the one
generated by
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.h
b/src/service/messenger/gnunet-service-messenger_message_send.h
index 0118dac99..ee4d8b0a4 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.h
+++ b/src/service/messenger/gnunet-service-messenger_message_send.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,10 +26,7 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
-#include "gnunet_util_lib.h"
-
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
+#include "gnunet-service-messenger_room.h"
/**
* Handles a sent join message to ensure growth of the decentralized room
structure.
diff --git a/src/service/messenger/gnunet-service-messenger_message_state.h
b/src/service/messenger/gnunet-service-messenger_message_state.h
index fc1ccfac8..9723c7654 100644
--- a/src/service/messenger/gnunet-service-messenger_message_state.h
+++ b/src/service/messenger/gnunet-service-messenger_message_state.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,9 +26,8 @@
#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
#define GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
-#include "gnunet_util_lib.h"
+#include "gnunet_messenger_service.h"
-#include "messenger_api_message.h"
#include "gnunet-service-messenger_list_messages.h"
struct GNUNET_MESSENGER_MessageState
diff --git a/src/service/messenger/gnunet-service-messenger_operation.h
b/src/service/messenger/gnunet-service-messenger_operation.h
index 0e02cdf6a..26282bea8 100644
--- a/src/service/messenger/gnunet-service-messenger_operation.h
+++ b/src/service/messenger/gnunet-service-messenger_operation.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2021, 2023 GNUnet e.V.
+ Copyright (C) 2021--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,7 +26,6 @@
#ifndef GNUNET_SERVICE_MESSENGER_OPERATION_H
#define GNUNET_SERVICE_MESSENGER_OPERATION_H
-#include "gnunet_configuration_lib.h"
#include "gnunet_util_lib.h"
#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
diff --git a/src/service/messenger/gnunet-service-messenger_room.c
b/src/service/messenger/gnunet-service-messenger_room.c
index 8ff8b1af7..1b8ce37ce 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,20 +26,16 @@
#include "platform.h"
#include "gnunet-service-messenger_room.h"
+#include "gnunet-service-messenger_basement.h"
#include "gnunet-service-messenger_member.h"
#include "gnunet-service-messenger_sender_session.h"
-
#include "gnunet-service-messenger_message_kind.h"
#include "gnunet-service-messenger_message_handle.h"
#include "gnunet-service-messenger_message_send.h"
-
#include "gnunet-service-messenger_operation.h"
-
-#include "gnunet-service-messenger.h"
#include "gnunet-service-messenger_service.h"
#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
#include "messenger_api_util.h"
static void
diff --git a/src/service/messenger/gnunet-service-messenger_room.h
b/src/service/messenger/gnunet-service-messenger_room.h
index c3063748d..8b20051be 100644
--- a/src/service/messenger/gnunet-service-messenger_room.h
+++ b/src/service/messenger/gnunet-service-messenger_room.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -28,21 +28,19 @@
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet_messenger_service.h"
-#include "gnunet-service-messenger_basement.h"
#include "gnunet-service-messenger_handle.h"
#include "gnunet-service-messenger_message_state.h"
#include "gnunet-service-messenger_list_messages.h"
-
-#include "messenger_api_list_tunnels.h"
-#include "messenger_api_peer_store.h"
-
#include "gnunet-service-messenger_member_store.h"
#include "gnunet-service-messenger_message_store.h"
#include "gnunet-service-messenger_operation_store.h"
+#include "messenger_api_list_tunnels.h"
+#include "messenger_api_message.h"
+#include "messenger_api_peer_store.h"
+
#define GNUNET_MESSENGER_IDLE_DELAY GNUNET_TIME_relative_multiply \
(GNUNET_TIME_relative_get_second_ (), 5)
diff --git a/src/service/messenger/gnunet-service-messenger_service.c
b/src/service/messenger/gnunet-service-messenger_service.c
index e6c9866df..c10d2c5c6 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -24,8 +24,11 @@
*/
#include "gnunet-service-messenger_service.h"
-#include "gnunet-service-messenger.h"
+
#include "gnunet-service-messenger_message_kind.h"
+#include "gnunet-service-messenger_room.h"
+
+#include "messenger_api_util.h"
static void
callback_shutdown_service (void *cls)
diff --git a/src/service/messenger/gnunet-service-messenger_service.h
b/src/service/messenger/gnunet-service-messenger_service.h
index 82a72ea9e..403dfcc23 100644
--- a/src/service/messenger/gnunet-service-messenger_service.h
+++ b/src/service/messenger/gnunet-service-messenger_service.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -28,14 +28,13 @@
#include "gnunet_configuration_lib.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet-service-messenger_list_handles.h"
+#include "gnunet-service-messenger_sender_session.h"
#include "messenger_api_contact_store.h"
-#include "gnunet-service-messenger_room.h"
-#include "gnunet-service-messenger_sender_session.h"
+struct GNUNET_MESSENGER_SrvRoom;
struct GNUNET_MESSENGER_Service
{
diff --git a/src/service/messenger/gnunet-service-messenger_tunnel.c
b/src/service/messenger/gnunet-service-messenger_tunnel.c
index 87395797d..4080cfa46 100644
--- a/src/service/messenger/gnunet-service-messenger_tunnel.c
+++ b/src/service/messenger/gnunet-service-messenger_tunnel.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -30,6 +30,7 @@
#include "gnunet-service-messenger_message_store.h"
#include "gnunet-service-messenger_operation_store.h"
#include "gnunet-service-messenger_operation.h"
+
#include "messenger_api_util.h"
struct GNUNET_MESSENGER_SrvTunnel*
diff --git a/src/service/messenger/messenger_api_contact.h
b/src/service/messenger/messenger_api_contact.h
index 2ef049200..d3bb38e96 100644
--- a/src/service/messenger/messenger_api_contact.h
+++ b/src/service/messenger/messenger_api_contact.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,7 +27,6 @@
#define GNUNET_MESSENGER_API_CONTACT_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
struct GNUNET_MESSENGER_Contact
{
diff --git a/src/service/messenger/messenger_api_contact_store.h
b/src/service/messenger/messenger_api_contact_store.h
index f9982f3f3..6b61f3e4f 100644
--- a/src/service/messenger/messenger_api_contact_store.h
+++ b/src/service/messenger/messenger_api_contact_store.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,7 +27,6 @@
#define GNUNET_MESSENGER_API_CONTACT_STORE_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
struct GNUNET_MESSENGER_Contact;
diff --git a/src/service/messenger/messenger_api_handle.h
b/src/service/messenger/messenger_api_handle.h
index 0d4c945c0..1a2763020 100644
--- a/src/service/messenger/messenger_api_handle.h
+++ b/src/service/messenger/messenger_api_handle.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,9 +26,7 @@
#ifndef GNUNET_MESSENGER_API_HANDLE_H
#define GNUNET_MESSENGER_API_HANDLE_H
-#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet_messenger_service.h"
diff --git a/src/service/messenger/messenger_api_message.c
b/src/service/messenger/messenger_api_message.c
index 486a0e081..bfab00c02 100644
--- a/src/service/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -24,7 +24,9 @@
*/
#include "messenger_api_message.h"
+
#include "gnunet_messenger_service.h"
+#include "gnunet_signatures.h"
struct GNUNET_MESSENGER_MessageSignature
{
diff --git a/src/service/messenger/messenger_api_message.h
b/src/service/messenger/messenger_api_message.h
index 41684c6b6..a9e33ddc2 100644
--- a/src/service/messenger/messenger_api_message.h
+++ b/src/service/messenger/messenger_api_message.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -27,8 +27,6 @@
#define GNUNET_MESSENGER_API_MESSAGE_H
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_signatures.h"
#include "gnunet_messenger_service.h"
diff --git a/src/service/messenger/messenger_api_message_kind.c
b/src/service/messenger/messenger_api_message_kind.c
index c9cf227a2..43baefe66 100644
--- a/src/service/messenger/messenger_api_message_kind.c
+++ b/src/service/messenger/messenger_api_message_kind.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,7 +25,7 @@
#include "messenger_api_message_kind.h"
-#include "messenger_api_util.h"
+#include "messenger_api_message.h"
struct GNUNET_MESSENGER_Message*
create_message_join (const struct GNUNET_CRYPTO_PrivateKey *key)
diff --git a/src/service/messenger/messenger_api_message_kind.h
b/src/service/messenger/messenger_api_message_kind.h
index 20e3cba83..5edb1c06e 100644
--- a/src/service/messenger/messenger_api_message_kind.h
+++ b/src/service/messenger/messenger_api_message_kind.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -29,12 +29,8 @@
#include "gnunet_messenger_service.h"
#include "gnunet_reclaim_lib.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
#include "gnunet_time_lib.h"
-#include "messenger_api_message.h"
-#include "gnunet-service-messenger_service.h"
-
/**
* Creates and allocates a new join message containing the clients public
<i>key</i>.
* (all values are stored as copy)
diff --git a/src/service/messenger/messenger_api_queue_messages.c
b/src/service/messenger/messenger_api_queue_messages.c
index cda5e5629..4b153a524 100644
--- a/src/service/messenger/messenger_api_queue_messages.c
+++ b/src/service/messenger/messenger_api_queue_messages.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2023 GNUnet e.V.
+ Copyright (C) 2023--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,6 +25,8 @@
#include "messenger_api_queue_messages.h"
+#include "messenger_api_message.h"
+
void
init_queue_messages (struct GNUNET_MESSENGER_QueueMessages *messages)
{
diff --git a/src/service/messenger/messenger_api_queue_messages.h
b/src/service/messenger/messenger_api_queue_messages.h
index 64ded85ce..416c91a7a 100644
--- a/src/service/messenger/messenger_api_queue_messages.h
+++ b/src/service/messenger/messenger_api_queue_messages.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2023 GNUnet e.V.
+ Copyright (C) 2023--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,11 +26,8 @@
#ifndef GNUNET_MESSENGER_API_QUEUE_MESSAGES_H
#define GNUNET_MESSENGER_API_QUEUE_MESSAGES_H
-#include "gnunet_identity_service.h"
#include "gnunet_util_lib.h"
-#include "messenger_api_message.h"
-
struct GNUNET_MESSENGER_QueueMessage
{
struct GNUNET_MESSENGER_QueueMessage *prev;
diff --git a/src/service/messenger/messenger_api_room.c
b/src/service/messenger/messenger_api_room.c
index ea19879ec..a3b8ae520 100644
--- a/src/service/messenger/messenger_api_room.c
+++ b/src/service/messenger/messenger_api_room.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -26,6 +26,7 @@
#include "messenger_api_room.h"
#include "messenger_api_handle.h"
+#include "messenger_api_message.h"
struct GNUNET_MESSENGER_Room*
create_room (struct GNUNET_MESSENGER_Handle *handle,
diff --git a/src/service/messenger/messenger_api_room.h
b/src/service/messenger/messenger_api_room.h
index 19cef2131..56bfbbf5a 100644
--- a/src/service/messenger/messenger_api_room.h
+++ b/src/service/messenger/messenger_api_room.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -32,7 +32,6 @@
#include "messenger_api_list_tunnels.h"
#include "messenger_api_contact.h"
-#include "messenger_api_message.h"
#include "messenger_api_queue_messages.h"
struct GNUNET_MESSENGER_RoomMessageEntry
diff --git a/src/service/messenger/messenger_api_util.c
b/src/service/messenger/messenger_api_util.c
index 6cdeb647b..1d38f87a1 100644
--- a/src/service/messenger/messenger_api_util.c
+++ b/src/service/messenger/messenger_api_util.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -25,6 +25,9 @@
#include "messenger_api_util.h"
+#include "gnunet_identity_service.h"
+#include "gnunet_messenger_service.h"
+
static void
callback_close_channel (void *cls)
{
diff --git a/src/service/messenger/messenger_api_util.h
b/src/service/messenger/messenger_api_util.h
index a8b4e9150..877491c93 100644
--- a/src/service/messenger/messenger_api_util.h
+++ b/src/service/messenger/messenger_api_util.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2020--2023 GNUnet e.V.
+ Copyright (C) 2020--2024 GNUnet e.V.
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
@@ -28,8 +28,6 @@
#include "gnunet_cadet_service.h"
#include "gnunet_util_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_messenger_service.h"
/**
* Starts an urgent task to close a CADET channel asynchronously.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (c24030b2d -> d821d81f7), gnunet, 2024/01/20
- [gnunet] 04/08: MESSENGER: Add recipient to message callback, gnunet, 2024/01/20
- [gnunet] 03/08: MESSENGER: Implement automatic transcription of private messages, gnunet, 2024/01/20
- [gnunet] 02/08: MESSENGER: Add transcript and tag message kinds, gnunet, 2024/01/20
- [gnunet] 01/08: MESSENGER: Cleanup includes in code,
gnunet <=
- [gnunet] 06/08: MESSENGER: Store recipient information for each message locally, gnunet, 2024/01/20
- [gnunet] 05/08: MESSENGER: Implement handling transcript messages, gnunet, 2024/01/20
- [gnunet] 07/08: MESSENGER: Drop transcript when sending private messages to own key, gnunet, 2024/01/20
- [gnunet] 08/08: -adjust log output, gnunet, 2024/01/20