aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheJackiMonster <thejackimonster@gmail.com>2021-11-13 20:24:14 +0100
committerTheJackiMonster <thejackimonster@gmail.com>2021-11-13 20:24:14 +0100
commit3af9a8c295a1a17adddb2127aa151723cd7c396c (patch)
treed1f7a885e7488077c0d541d7806fa11fb4460d6b
parent154d13fcb10205edf5fb56c12ac47e65abfec5a6 (diff)
downloadgnunet-3af9a8c295a1a17adddb2127aa151723cd7c396c.tar.gz
gnunet-3af9a8c295a1a17adddb2127aa151723cd7c396c.zip
-add gns record plugin for messenger room entries
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
-rw-r--r--src/include/gnu_name_system_record_types.h10
-rw-r--r--src/include/gnunet_messenger_service.h21
-rw-r--r--src/messenger/Makefile.am13
-rw-r--r--src/messenger/plugin_gnsrecord_messenger.c243
4 files changed, 287 insertions, 0 deletions
diff --git a/src/include/gnu_name_system_record_types.h b/src/include/gnu_name_system_record_types.h
index b2cf45dc8..22b2c472e 100644
--- a/src/include/gnu_name_system_record_types.h
+++ b/src/include/gnu_name_system_record_types.h
@@ -127,6 +127,16 @@ extern "C" {
127 */ 127 */
128#define GNUNET_GNSRECORD_TYPE_EDKEY 65556 128#define GNUNET_GNSRECORD_TYPE_EDKEY 65556
129 129
130/**
131 * Encoding for Robust Immutable Storage (ERIS) binary read capability
132 */
133#define GNUNET_GNSRECORD_TYPE_ERIS_READ_CAPABILITY 65557
134
135/**
136 * Record type to share an entry of a messenger room
137 */
138#define GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY 65558
139
130 140
131#if 0 /* keep Emacsens' auto-indent happy */ 141#if 0 /* keep Emacsens' auto-indent happy */
132{ 142{
diff --git a/src/include/gnunet_messenger_service.h b/src/include/gnunet_messenger_service.h
index b54567aa7..96d48b411 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -75,6 +75,27 @@ struct GNUNET_MESSENGER_Room;
75 */ 75 */
76struct GNUNET_MESSENGER_Contact; 76struct GNUNET_MESSENGER_Contact;
77 77
78GNUNET_NETWORK_STRUCT_BEGIN
79
80/**
81 * A room entry record specifies which peer is hosting a given room and
82 * may also specify the key to enter it.
83 */
84struct GNUNET_MESSENGER_RoomEntryRecord
85{
86 /**
87 * The peer identity of an open door to a room.
88 */
89 struct GNUNET_PeerIdentity door;
90
91 /**
92 * The hash identifying the port of the room.
93 */
94 struct GNUNET_HashCode key;
95};
96
97GNUNET_NETWORK_STRUCT_END
98
78/** 99/**
79 * Enum for the different supported kinds of messages 100 * Enum for the different supported kinds of messages
80 */ 101 */
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
index 3fc532e7e..4be11f3aa 100644
--- a/src/messenger/Makefile.am
+++ b/src/messenger/Makefile.am
@@ -10,6 +10,19 @@ pkgcfgdir= $(pkgdatadir)/config.d/
10 10
11libexecdir= $(pkglibdir)/libexec/ 11libexecdir= $(pkglibdir)/libexec/
12 12
13plugin_LTLIBRARIES = \
14 libgnunet_plugin_gnsrecord_messenger.la
15
16
17libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
18 plugin_gnsrecord_messenger.c
19libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
20 $(top_builddir)/src/util/libgnunetutil.la \
21 $(LTLIBINTL)
22libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
23 $(GN_PLUGIN_LDFLAGS)
24
25
13pkgcfg_DATA = \ 26pkgcfg_DATA = \
14 messenger.conf 27 messenger.conf
15 28
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/messenger/plugin_gnsrecord_messenger.c
new file mode 100644
index 000000000..2219f0bde
--- /dev/null
+++ b/src/messenger/plugin_gnsrecord_messenger.c
@@ -0,0 +1,243 @@
1/*
2 This file is part of GNUnet.
3 Copyright (C) 2021 GNUnet e.V.
4
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
7 by the Free Software Foundation, either version 3 of the License,
8 or (at your option) any later version.
9
10 GNUnet is distributed in the hope that it will be useful, but
11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details.
14
15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17
18 SPDX-License-Identifier: AGPL3.0-or-later
19 */
20/**
21 * @author Tobias Frisch
22 * @file src/messenger/plugin_gnsrecord_messenger.c
23 * @brief Plugin to provide the API for useful GNS records to improve
24 * the usability of the messenger service.
25 */
26
27#include "platform.h"
28#include "gnunet_util_lib.h"
29#include "gnunet_gnsrecord_lib.h"
30#include "gnunet_messenger_service.h"
31#include "gnunet_gnsrecord_plugin.h"
32
33
34/**
35 * Convert the 'value' of a record to a string.
36 *
37 * @param cls closure, unused
38 * @param type type of the record
39 * @param data value in binary encoding
40 * @param data_size number of bytes in @a data
41 * @return NULL on error, otherwise human-readable representation of the value
42 */
43static char *
44messenger_value_to_string (void *cls,
45 uint32_t type,
46 const void *data,
47 size_t data_size)
48{
49 (void) cls;
50 switch (type)
51 {
52 case GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY:
53 {
54 if (data_size != sizeof(struct GNUNET_MESSENGER_RoomEntryRecord))
55 {
56 GNUNET_break_op (0);
57 return NULL;
58 }
59
60 const struct GNUNET_MESSENGER_RoomEntryRecord *record = data;
61
62 char *door = GNUNET_CRYPTO_eddsa_public_key_to_string (&(record->door.public_key));
63 char *key = GNUNET_STRINGS_data_to_string_alloc (&(record->key), sizeof(struct GNUNET_HashCode));
64
65 char *ret;
66 GNUNET_asprintf (&ret, "%s-%s", door, key);
67 GNUNET_free (key);
68 GNUNET_free (door);
69 return ret;
70 }
71
72 default:
73 return NULL;
74 }
75}
76
77
78/**
79 * Convert human-readable version of a 'value' of a record to the binary
80 * representation.
81 *
82 * @param cls closure, unused
83 * @param type type of the record
84 * @param s human-readable string
85 * @param data set to value in binary encoding (will be allocated)
86 * @param data_size set to number of bytes in @a data
87 * @return #GNUNET_OK on success
88 */
89static int
90messenger_string_to_value (void *cls,
91 uint32_t type,
92 const char *s,
93 void **data,
94 size_t *data_size)
95{
96 (void) cls;
97 if (NULL == s)
98 {
99 GNUNET_break (0);
100 return GNUNET_SYSERR;
101 }
102
103 switch (type)
104 {
105 case GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY:
106 {
107 char key [103];
108 const char *dash;
109 struct GNUNET_PeerIdentity door;
110
111 if ((NULL == (dash = strchr (s, '-'))) ||
112 (1 != sscanf (s, "%103s-", key)) ||
113 (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (dash + 1,
114 strlen (dash + 1),
115 &(door.public_key))))
116 {
117 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
118 _ ("Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"),
119 s);
120 return GNUNET_SYSERR;
121 }
122
123 struct GNUNET_MESSENGER_RoomEntryRecord *record = GNUNET_new (
124 struct GNUNET_MESSENGER_RoomEntryRecord
125 );
126
127 if (GNUNET_OK != GNUNET_STRINGS_string_to_data (key,
128 strlen (key),
129 &(record->key),
130 sizeof(struct GNUNET_HashCode)))
131 {
132 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
133 _ ("Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"),
134 s);
135 GNUNET_free (record);
136 return GNUNET_SYSERR;
137 }
138
139 record->door = door;
140 *data = record;
141 *data_size = sizeof(struct GNUNET_MESSENGER_RoomEntryRecord);
142 return GNUNET_OK;
143 }
144
145 default:
146 return GNUNET_SYSERR;
147 }
148}
149
150
151/**
152 * Mapping of record type numbers to human-readable
153 * record type names.
154 */
155static struct
156{
157 const char *name;
158 uint32_t number;
159} name_map[] = {
160 { "MESSENGER_ROOM_ENTRY", GNUNET_GNSRECORD_TYPE_MESSENGER_ROOM_ENTRY },
161 { NULL, UINT32_MAX }
162};
163
164
165/**
166 * Convert a type name (e.g. "AAAA") to the corresponding number.
167 *
168 * @param cls closure, unused
169 * @param gns_typename name to convert
170 * @return corresponding number, UINT32_MAX on error
171 */
172static uint32_t
173messenger_typename_to_number (void *cls,
174 const char *gns_typename)
175{
176 unsigned int i;
177
178 (void) cls;
179 i = 0;
180 while ((name_map[i].name != NULL) &&
181 (0 != strcasecmp (gns_typename, name_map[i].name)))
182 i++;
183 return name_map[i].number;
184}
185
186
187/**
188 * Convert a type number to the corresponding type string (e.g. 1 to "A")
189 *
190 * @param cls closure, unused
191 * @param type number of a type to convert
192 * @return corresponding typestring, NULL on error
193 */
194static const char *
195messenger_number_to_typename (void *cls,
196 uint32_t type)
197{
198 unsigned int i;
199
200 (void) cls;
201 i = 0;
202 while ((name_map[i].name != NULL) &&
203 (type != name_map[i].number))
204 i++;
205 return name_map[i].name;
206}
207
208
209/**
210 * Entry point for the plugin.
211 *
212 * @param cls NULL
213 * @return the exported block API
214 */
215void *
216libgnunet_plugin_gnsrecord_messenger_init (void *cls)
217{
218 struct GNUNET_GNSRECORD_PluginFunctions *api;
219
220 (void) cls;
221 api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions);
222 api->value_to_string = &messenger_value_to_string;
223 api->string_to_value = &messenger_string_to_value;
224 api->typename_to_number = &messenger_typename_to_number;
225 api->number_to_typename = &messenger_number_to_typename;
226 return api;
227}
228
229
230/**
231 * Exit point from the plugin.
232 *
233 * @param cls the return value from #libgnunet_plugin_block_test_init
234 * @return NULL
235 */
236void *
237libgnunet_plugin_gnsrecord_messenger_done (void *cls)
238{
239 struct GNUNET_GNSRECORD_PluginFunctions *api = cls;
240
241 GNUNET_free (api);
242 return NULL;
243}