diff options
Diffstat (limited to 'src/gnunet_chat_group_intern.c')
-rw-r--r-- | src/gnunet_chat_group_intern.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/gnunet_chat_group_intern.c b/src/gnunet_chat_group_intern.c index bbbbdaa..8773a3d 100644 --- a/src/gnunet_chat_group_intern.c +++ b/src/gnunet_chat_group_intern.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2021--2023 GNUnet e.V. | 3 | Copyright (C) 2021--2024 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
@@ -30,19 +30,21 @@ | |||
30 | void | 30 | void |
31 | search_group_by_topic(void *cls, | 31 | search_group_by_topic(void *cls, |
32 | const struct GNUNET_PeerIdentity *door, | 32 | const struct GNUNET_PeerIdentity *door, |
33 | GNUNET_UNUSED const struct GNUNET_PeerIdentity *get_path, | 33 | GNUNET_UNUSED const struct GNUNET_PeerIdentity *get_path, |
34 | GNUNET_UNUSED unsigned int get_path_length, | 34 | GNUNET_UNUSED unsigned int get_path_length, |
35 | GNUNET_UNUSED const struct GNUNET_PeerIdentity *put_path, | 35 | GNUNET_UNUSED const struct GNUNET_PeerIdentity *put_path, |
36 | GNUNET_UNUSED unsigned int put_path_length) | 36 | GNUNET_UNUSED unsigned int put_path_length) |
37 | { | 37 | { |
38 | struct GNUNET_CHAT_Group *group = cls; | 38 | struct GNUNET_CHAT_Group *group = cls; |
39 | 39 | ||
40 | GNUNET_assert((group) && | 40 | GNUNET_assert( |
41 | (group) && | ||
41 | (group->handle) && | 42 | (group->handle) && |
42 | (group->handle->cfg) && | 43 | (group->handle->cfg) && |
43 | (group->handle->messenger) && | 44 | (group->handle->messenger) && |
44 | (group->context) && | 45 | (group->context) && |
45 | (group->context->room)); | 46 | (group->context->room) |
47 | ); | ||
46 | 48 | ||
47 | struct GNUNET_PeerIdentity peer; | 49 | struct GNUNET_PeerIdentity peer; |
48 | GNUNET_CRYPTO_get_peer_identity(group->handle->cfg, &peer); | 50 | GNUNET_CRYPTO_get_peer_identity(group->handle->cfg, &peer); |
@@ -51,7 +53,7 @@ search_group_by_topic(void *cls, | |||
51 | return; | 53 | return; |
52 | 54 | ||
53 | const struct GNUNET_HashCode *key = GNUNET_MESSENGER_room_get_key( | 55 | const struct GNUNET_HashCode *key = GNUNET_MESSENGER_room_get_key( |
54 | group->context->room | 56 | group->context->room |
55 | ); | 57 | ); |
56 | 58 | ||
57 | if ((GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains( | 59 | if ((GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains( |
@@ -62,9 +64,9 @@ search_group_by_topic(void *cls, | |||
62 | return; | 64 | return; |
63 | 65 | ||
64 | struct GNUNET_MESSENGER_Room *room = GNUNET_MESSENGER_enter_room( | 66 | struct GNUNET_MESSENGER_Room *room = GNUNET_MESSENGER_enter_room( |
65 | group->handle->messenger, | 67 | group->handle->messenger, |
66 | door, | 68 | door, |
67 | key | 69 | key |
68 | ); | 70 | ); |
69 | 71 | ||
70 | handle_send_room_name(group->handle, room); | 72 | handle_send_room_name(group->handle, room); |