diff options
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | po/POTFILES.in | 68 | ||||
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/cli/Makefile.am | 3 | ||||
-rw-r--r-- | src/cli/messenger/.gitignore | 1 | ||||
-rw-r--r-- | src/cli/messenger/Makefile.am | 24 | ||||
-rw-r--r-- | src/cli/messenger/gnunet-messenger.c (renamed from src/messenger/gnunet-messenger.c) | 0 | ||||
-rw-r--r-- | src/service/Makefile.am | 3 | ||||
-rw-r--r-- | src/service/messenger/.gitignore (renamed from src/messenger/.gitignore) | 0 | ||||
-rw-r--r-- | src/service/messenger/Makefile.am (renamed from src/messenger/Makefile.am) | 11 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger.c (renamed from src/messenger/gnunet-service-messenger.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger.h (renamed from src/messenger/gnunet-service-messenger.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_basement.c (renamed from src/messenger/gnunet-service-messenger_basement.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_basement.h (renamed from src/messenger/gnunet-service-messenger_basement.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_ego_store.c (renamed from src/messenger/gnunet-service-messenger_ego_store.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_ego_store.h (renamed from src/messenger/gnunet-service-messenger_ego_store.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_handle.c (renamed from src/messenger/gnunet-service-messenger_handle.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_handle.h (renamed from src/messenger/gnunet-service-messenger_handle.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_list_handles.c (renamed from src/messenger/gnunet-service-messenger_list_handles.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_list_handles.h (renamed from src/messenger/gnunet-service-messenger_list_handles.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_list_messages.c (renamed from src/messenger/gnunet-service-messenger_list_messages.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_list_messages.h (renamed from src/messenger/gnunet-service-messenger_list_messages.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member.c (renamed from src/messenger/gnunet-service-messenger_member.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member.h (renamed from src/messenger/gnunet-service-messenger_member.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member_session.c (renamed from src/messenger/gnunet-service-messenger_member_session.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member_session.h (renamed from src/messenger/gnunet-service-messenger_member_session.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member_store.c (renamed from src/messenger/gnunet-service-messenger_member_store.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_member_store.h (renamed from src/messenger/gnunet-service-messenger_member_store.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_handle.c (renamed from src/messenger/gnunet-service-messenger_message_handle.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_handle.h (renamed from src/messenger/gnunet-service-messenger_message_handle.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_kind.c (renamed from src/messenger/gnunet-service-messenger_message_kind.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_kind.h (renamed from src/messenger/gnunet-service-messenger_message_kind.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_recv.c (renamed from src/messenger/gnunet-service-messenger_message_recv.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_recv.h (renamed from src/messenger/gnunet-service-messenger_message_recv.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_send.c (renamed from src/messenger/gnunet-service-messenger_message_send.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_send.h (renamed from src/messenger/gnunet-service-messenger_message_send.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_state.c (renamed from src/messenger/gnunet-service-messenger_message_state.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_state.h (renamed from src/messenger/gnunet-service-messenger_message_state.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_store.c (renamed from src/messenger/gnunet-service-messenger_message_store.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_message_store.h (renamed from src/messenger/gnunet-service-messenger_message_store.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_operation.c (renamed from src/messenger/gnunet-service-messenger_operation.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_operation.h (renamed from src/messenger/gnunet-service-messenger_operation.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_operation_store.c (renamed from src/messenger/gnunet-service-messenger_operation_store.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_operation_store.h (renamed from src/messenger/gnunet-service-messenger_operation_store.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_room.c (renamed from src/messenger/gnunet-service-messenger_room.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_room.h (renamed from src/messenger/gnunet-service-messenger_room.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_service.c (renamed from src/messenger/gnunet-service-messenger_service.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_service.h (renamed from src/messenger/gnunet-service-messenger_service.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_tunnel.c (renamed from src/messenger/gnunet-service-messenger_tunnel.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/gnunet-service-messenger_tunnel.h (renamed from src/messenger/gnunet-service-messenger_tunnel.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/meson.build (renamed from src/messenger/meson.build) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger.conf.in (renamed from src/messenger/messenger.conf.in) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api.c (renamed from src/messenger/messenger_api.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_contact.c (renamed from src/messenger/messenger_api_contact.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_contact.h (renamed from src/messenger/messenger_api_contact.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_contact_store.c (renamed from src/messenger/messenger_api_contact_store.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_contact_store.h (renamed from src/messenger/messenger_api_contact_store.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_ego.h (renamed from src/messenger/messenger_api_ego.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_handle.c (renamed from src/messenger/messenger_api_handle.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_handle.h (renamed from src/messenger/messenger_api_handle.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_list_tunnels.c (renamed from src/messenger/messenger_api_list_tunnels.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_list_tunnels.h (renamed from src/messenger/messenger_api_list_tunnels.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_message.c (renamed from src/messenger/messenger_api_message.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_message.h (renamed from src/messenger/messenger_api_message.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_room.c (renamed from src/messenger/messenger_api_room.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_room.h (renamed from src/messenger/messenger_api_room.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_util.c (renamed from src/messenger/messenger_api_util.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_util.h (renamed from src/messenger/messenger_api_util.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/plugin_gnsrecord_messenger.c (renamed from src/messenger/plugin_gnsrecord_messenger.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/test_messenger.c (renamed from src/messenger/test_messenger.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/test_messenger_anonymous.c (renamed from src/messenger/test_messenger_anonymous.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/test_messenger_api.conf (renamed from src/messenger/test_messenger_api.conf) | 0 | ||||
-rw-r--r-- | src/service/messenger/testing_messenger_barrier.c (renamed from src/messenger/testing_messenger_barrier.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/testing_messenger_barrier.h (renamed from src/messenger/testing_messenger_barrier.h) | 0 | ||||
-rw-r--r-- | src/service/messenger/testing_messenger_setup.c (renamed from src/messenger/testing_messenger_setup.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/testing_messenger_setup.h (renamed from src/messenger/testing_messenger_setup.h) | 0 |
76 files changed, 67 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index 62179b93a..ab92e7f22 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1270,6 +1270,8 @@ src/service/gns/nss/Makefile | |||
1270 | src/service/hostlist/Makefile | 1270 | src/service/hostlist/Makefile |
1271 | src/service/identity/Makefile | 1271 | src/service/identity/Makefile |
1272 | src/service/identity/identity.conf | 1272 | src/service/identity/identity.conf |
1273 | src/service/messenger/Makefile | ||
1274 | src/service/messenger/messenger.conf | ||
1273 | src/service/namecache/Makefile | 1275 | src/service/namecache/Makefile |
1274 | src/service/namecache/namecache.conf | 1276 | src/service/namecache/namecache.conf |
1275 | src/service/namestore/Makefile | 1277 | src/service/namestore/Makefile |
@@ -1317,6 +1319,7 @@ src/cli/datastore/Makefile | |||
1317 | src/cli/dht/Makefile | 1319 | src/cli/dht/Makefile |
1318 | src/cli/fs/Makefile | 1320 | src/cli/fs/Makefile |
1319 | src/cli/gns/Makefile | 1321 | src/cli/gns/Makefile |
1322 | src/cli/messenger/Makefile | ||
1320 | src/cli/namecache/Makefile | 1323 | src/cli/namecache/Makefile |
1321 | src/cli/namestore/Makefile | 1324 | src/cli/namestore/Makefile |
1322 | src/cli/nat/Makefile | 1325 | src/cli/nat/Makefile |
@@ -1349,8 +1352,6 @@ src/contrib/cli/template/Makefile | |||
1349 | src/lib/hello/Makefile | 1352 | src/lib/hello/Makefile |
1350 | src/include/Makefile | 1353 | src/include/Makefile |
1351 | src/include/gnunet_config.h | 1354 | src/include/gnunet_config.h |
1352 | src/messenger/Makefile | ||
1353 | src/messenger/messenger.conf | ||
1354 | pkgconfig/Makefile | 1355 | pkgconfig/Makefile |
1355 | pkgconfig/gnunetarm.pc | 1356 | pkgconfig/gnunetarm.pc |
1356 | pkgconfig/gnunetblock.pc | 1357 | pkgconfig/gnunetblock.pc |
diff --git a/po/POTFILES.in b/po/POTFILES.in index dda139f3e..7593ec73d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -15,6 +15,7 @@ src/cli/fs/gnunet-search.c | |||
15 | src/cli/fs/gnunet-unindex.c | 15 | src/cli/fs/gnunet-unindex.c |
16 | src/cli/gns/gnunet-gns.c | 16 | src/cli/gns/gnunet-gns.c |
17 | src/cli/identity/gnunet-identity.c | 17 | src/cli/identity/gnunet-identity.c |
18 | src/cli/messenger/gnunet-messenger.c | ||
18 | src/cli/namecache/gnunet-namecache.c | 19 | src/cli/namecache/gnunet-namecache.c |
19 | src/cli/namestore/gnunet-namestore-dbtool.c | 20 | src/cli/namestore/gnunet-namestore-dbtool.c |
20 | src/cli/namestore/gnunet-namestore-zonefile.c | 21 | src/cli/namestore/gnunet-namestore-zonefile.c |
@@ -204,38 +205,6 @@ src/lib/util/strings.c | |||
204 | src/lib/util/time.c | 205 | src/lib/util/time.c |
205 | src/lib/util/tun.c | 206 | src/lib/util/tun.c |
206 | src/lib/util/uri.c | 207 | src/lib/util/uri.c |
207 | src/messenger/gnunet-messenger.c | ||
208 | src/messenger/gnunet-service-messenger.c | ||
209 | src/messenger/gnunet-service-messenger_basement.c | ||
210 | src/messenger/gnunet-service-messenger_ego_store.c | ||
211 | src/messenger/gnunet-service-messenger_handle.c | ||
212 | src/messenger/gnunet-service-messenger_list_handles.c | ||
213 | src/messenger/gnunet-service-messenger_list_messages.c | ||
214 | src/messenger/gnunet-service-messenger_member.c | ||
215 | src/messenger/gnunet-service-messenger_member_session.c | ||
216 | src/messenger/gnunet-service-messenger_member_store.c | ||
217 | src/messenger/gnunet-service-messenger_message_handle.c | ||
218 | src/messenger/gnunet-service-messenger_message_kind.c | ||
219 | src/messenger/gnunet-service-messenger_message_recv.c | ||
220 | src/messenger/gnunet-service-messenger_message_send.c | ||
221 | src/messenger/gnunet-service-messenger_message_state.c | ||
222 | src/messenger/gnunet-service-messenger_message_store.c | ||
223 | src/messenger/gnunet-service-messenger_operation.c | ||
224 | src/messenger/gnunet-service-messenger_operation_store.c | ||
225 | src/messenger/gnunet-service-messenger_room.c | ||
226 | src/messenger/gnunet-service-messenger_service.c | ||
227 | src/messenger/gnunet-service-messenger_tunnel.c | ||
228 | src/messenger/messenger_api.c | ||
229 | src/messenger/messenger_api_contact.c | ||
230 | src/messenger/messenger_api_contact_store.c | ||
231 | src/messenger/messenger_api_handle.c | ||
232 | src/messenger/messenger_api_list_tunnels.c | ||
233 | src/messenger/messenger_api_message.c | ||
234 | src/messenger/messenger_api_room.c | ||
235 | src/messenger/messenger_api_util.c | ||
236 | src/messenger/plugin_gnsrecord_messenger.c | ||
237 | src/messenger/testing_messenger_barrier.c | ||
238 | src/messenger/testing_messenger_setup.c | ||
239 | src/plugin/block/plugin_block_template.c | 208 | src/plugin/block/plugin_block_template.c |
240 | src/plugin/block/plugin_block_test.c | 209 | src/plugin/block/plugin_block_test.c |
241 | src/plugin/dhtu/plugin_dhtu_gnunet.c | 210 | src/plugin/dhtu/plugin_dhtu_gnunet.c |
@@ -259,6 +228,8 @@ src/plugin/reclaim/plugin_reclaim_credential_pabc.c | |||
259 | src/plugin/revocation/plugin_block_revocation.c | 228 | src/plugin/revocation/plugin_block_revocation.c |
260 | src/rest-plugin/gns/plugin_rest_gns.c | 229 | src/rest-plugin/gns/plugin_rest_gns.c |
261 | src/rest-plugin/identity/plugin_rest_identity.c | 230 | src/rest-plugin/identity/plugin_rest_identity.c |
231 | src/rest-plugin/reclaim/json_reclaim.c | ||
232 | src/rest-plugin/reclaim/oidc_helper.c | ||
262 | src/rest-plugin/reclaim/plugin_rest_openid_connect.c | 233 | src/rest-plugin/reclaim/plugin_rest_openid_connect.c |
263 | src/rest-plugin/reclaim/plugin_rest_pabc.c | 234 | src/rest-plugin/reclaim/plugin_rest_pabc.c |
264 | src/rest-plugin/reclaim/plugin_rest_reclaim.c | 235 | src/rest-plugin/reclaim/plugin_rest_reclaim.c |
@@ -372,6 +343,37 @@ src/service/identity/gnunet-service-identity.c | |||
372 | src/service/identity/identity_api.c | 343 | src/service/identity/identity_api.c |
373 | src/service/identity/identity_api_lookup.c | 344 | src/service/identity/identity_api_lookup.c |
374 | src/service/identity/identity_api_suffix_lookup.c | 345 | src/service/identity/identity_api_suffix_lookup.c |
346 | src/service/messenger/gnunet-service-messenger.c | ||
347 | src/service/messenger/gnunet-service-messenger_basement.c | ||
348 | src/service/messenger/gnunet-service-messenger_ego_store.c | ||
349 | src/service/messenger/gnunet-service-messenger_handle.c | ||
350 | src/service/messenger/gnunet-service-messenger_list_handles.c | ||
351 | src/service/messenger/gnunet-service-messenger_list_messages.c | ||
352 | src/service/messenger/gnunet-service-messenger_member.c | ||
353 | src/service/messenger/gnunet-service-messenger_member_session.c | ||
354 | src/service/messenger/gnunet-service-messenger_member_store.c | ||
355 | src/service/messenger/gnunet-service-messenger_message_handle.c | ||
356 | src/service/messenger/gnunet-service-messenger_message_kind.c | ||
357 | src/service/messenger/gnunet-service-messenger_message_recv.c | ||
358 | src/service/messenger/gnunet-service-messenger_message_send.c | ||
359 | src/service/messenger/gnunet-service-messenger_message_state.c | ||
360 | src/service/messenger/gnunet-service-messenger_message_store.c | ||
361 | src/service/messenger/gnunet-service-messenger_operation.c | ||
362 | src/service/messenger/gnunet-service-messenger_operation_store.c | ||
363 | src/service/messenger/gnunet-service-messenger_room.c | ||
364 | src/service/messenger/gnunet-service-messenger_service.c | ||
365 | src/service/messenger/gnunet-service-messenger_tunnel.c | ||
366 | src/service/messenger/messenger_api.c | ||
367 | src/service/messenger/messenger_api_contact.c | ||
368 | src/service/messenger/messenger_api_contact_store.c | ||
369 | src/service/messenger/messenger_api_handle.c | ||
370 | src/service/messenger/messenger_api_list_tunnels.c | ||
371 | src/service/messenger/messenger_api_message.c | ||
372 | src/service/messenger/messenger_api_room.c | ||
373 | src/service/messenger/messenger_api_util.c | ||
374 | src/service/messenger/plugin_gnsrecord_messenger.c | ||
375 | src/service/messenger/testing_messenger_barrier.c | ||
376 | src/service/messenger/testing_messenger_setup.c | ||
375 | src/service/namecache/gnunet-service-namecache.c | 377 | src/service/namecache/gnunet-service-namecache.c |
376 | src/service/namecache/namecache_api.c | 378 | src/service/namecache/namecache_api.c |
377 | src/service/namestore/gnunet-namestore-fcfsd.c | 379 | src/service/namestore/gnunet-namestore-fcfsd.c |
@@ -407,8 +409,6 @@ src/service/reclaim/did_helper.c | |||
407 | src/service/reclaim/did_misc.c | 409 | src/service/reclaim/did_misc.c |
408 | src/service/reclaim/gnunet-service-reclaim.c | 410 | src/service/reclaim/gnunet-service-reclaim.c |
409 | src/service/reclaim/gnunet-service-reclaim_tickets.c | 411 | src/service/reclaim/gnunet-service-reclaim_tickets.c |
410 | src/service/reclaim/json_reclaim.c | ||
411 | src/service/reclaim/oidc_helper.c | ||
412 | src/service/reclaim/pabc_helper.c | 412 | src/service/reclaim/pabc_helper.c |
413 | src/service/reclaim/reclaim_api.c | 413 | src/service/reclaim/reclaim_api.c |
414 | src/service/reclaim/reclaim_attribute.c | 414 | src/service/reclaim/reclaim_attribute.c |
diff --git a/src/Makefile.am b/src/Makefile.am index 081b83190..2b1e94c50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -9,5 +9,4 @@ SUBDIRS = \ | |||
9 | plugin \ | 9 | plugin \ |
10 | rest-plugin \ | 10 | rest-plugin \ |
11 | cli \ | 11 | cli \ |
12 | contrib \ | 12 | contrib |
13 | messenger | ||
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 9b30c22ae..06fdfb629 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am | |||
@@ -15,4 +15,5 @@ SUBDIRS = \ | |||
15 | gns \ | 15 | gns \ |
16 | fs \ | 16 | fs \ |
17 | cadet \ | 17 | cadet \ |
18 | reclaim | 18 | reclaim \ |
19 | messenger | ||
diff --git a/src/cli/messenger/.gitignore b/src/cli/messenger/.gitignore new file mode 100644 index 000000000..1c1447be8 --- /dev/null +++ b/src/cli/messenger/.gitignore | |||
@@ -0,0 +1 @@ | |||
gnunet-messenger | |||
diff --git a/src/cli/messenger/Makefile.am b/src/cli/messenger/Makefile.am new file mode 100644 index 000000000..bb5e9c388 --- /dev/null +++ b/src/cli/messenger/Makefile.am | |||
@@ -0,0 +1,24 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if USE_COVERAGE | ||
5 | AM_CFLAGS = --coverage -O0 | ||
6 | XLIB = -lgcov | ||
7 | endif | ||
8 | |||
9 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
10 | |||
11 | libexecdir= $(pkglibdir)/libexec/ | ||
12 | |||
13 | AM_CLFAGS = -g | ||
14 | |||
15 | bin_PROGRAMS = \ | ||
16 | gnunet-messenger | ||
17 | |||
18 | gnunet_messenger_SOURCES = \ | ||
19 | gnunet-messenger.c | ||
20 | gnunet_messenger_LDADD = \ | ||
21 | $(top_builddir)/src/service/messenger/libgnunetmessenger.la \ | ||
22 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
23 | gnunet_messenger_LDFLAGS = \ | ||
24 | $(GN_LIBINTL) | ||
diff --git a/src/messenger/gnunet-messenger.c b/src/cli/messenger/gnunet-messenger.c index 9444fa12d..9444fa12d 100644 --- a/src/messenger/gnunet-messenger.c +++ b/src/cli/messenger/gnunet-messenger.c | |||
diff --git a/src/service/Makefile.am b/src/service/Makefile.am index 2eee658f8..8e661e432 100644 --- a/src/service/Makefile.am +++ b/src/service/Makefile.am | |||
@@ -30,5 +30,6 @@ SUBDIRS = \ | |||
30 | fs \ | 30 | fs \ |
31 | exit \ | 31 | exit \ |
32 | pt \ | 32 | pt \ |
33 | reclaim | 33 | reclaim \ |
34 | messenger | ||
34 | 35 | ||
diff --git a/src/messenger/.gitignore b/src/service/messenger/.gitignore index ed78c5562..ed78c5562 100644 --- a/src/messenger/.gitignore +++ b/src/service/messenger/.gitignore | |||
diff --git a/src/messenger/Makefile.am b/src/service/messenger/Makefile.am index e02414541..d778d6e0c 100644 --- a/src/messenger/Makefile.am +++ b/src/service/messenger/Makefile.am | |||
@@ -34,9 +34,6 @@ libexec_PROGRAMS = \ | |||
34 | gnunet-service-messenger \ | 34 | gnunet-service-messenger \ |
35 | $(EXP_LIBEXEC) | 35 | $(EXP_LIBEXEC) |
36 | 36 | ||
37 | bin_PROGRAMS = \ | ||
38 | gnunet-messenger | ||
39 | |||
40 | lib_LTLIBRARIES = \ | 37 | lib_LTLIBRARIES = \ |
41 | libgnunetmessenger.la \ | 38 | libgnunetmessenger.la \ |
42 | $(EXP_LIB) | 39 | $(EXP_LIB) |
@@ -61,14 +58,6 @@ libgnunetmessenger_la_LDFLAGS = \ | |||
61 | $(GN_LIB_LDFLAGS) \ | 58 | $(GN_LIB_LDFLAGS) \ |
62 | -version-info 0:0:0 | 59 | -version-info 0:0:0 |
63 | 60 | ||
64 | gnunet_messenger_SOURCES = \ | ||
65 | gnunet-messenger.c | ||
66 | gnunet_messenger_LDADD = \ | ||
67 | libgnunetmessenger.la \ | ||
68 | $(top_builddir)/src/lib/util/libgnunetutil.la | ||
69 | gnunet_messenger_LDFLAGS = \ | ||
70 | $(GN_LIBINTL) | ||
71 | |||
72 | gnunet_service_messenger_SOURCES = \ | 61 | gnunet_service_messenger_SOURCES = \ |
73 | gnunet-service-messenger.c gnunet-service-messenger.h \ | 62 | gnunet-service-messenger.c gnunet-service-messenger.h \ |
74 | gnunet-service-messenger_service.c gnunet-service-messenger_service.h \ | 63 | gnunet-service-messenger_service.c gnunet-service-messenger_service.h \ |
diff --git a/src/messenger/gnunet-service-messenger.c b/src/service/messenger/gnunet-service-messenger.c index fedaa2f60..fedaa2f60 100644 --- a/src/messenger/gnunet-service-messenger.c +++ b/src/service/messenger/gnunet-service-messenger.c | |||
diff --git a/src/messenger/gnunet-service-messenger.h b/src/service/messenger/gnunet-service-messenger.h index 1db5c651c..1db5c651c 100644 --- a/src/messenger/gnunet-service-messenger.h +++ b/src/service/messenger/gnunet-service-messenger.h | |||
diff --git a/src/messenger/gnunet-service-messenger_basement.c b/src/service/messenger/gnunet-service-messenger_basement.c index ae0dcaa62..ae0dcaa62 100644 --- a/src/messenger/gnunet-service-messenger_basement.c +++ b/src/service/messenger/gnunet-service-messenger_basement.c | |||
diff --git a/src/messenger/gnunet-service-messenger_basement.h b/src/service/messenger/gnunet-service-messenger_basement.h index a097b482f..a097b482f 100644 --- a/src/messenger/gnunet-service-messenger_basement.h +++ b/src/service/messenger/gnunet-service-messenger_basement.h | |||
diff --git a/src/messenger/gnunet-service-messenger_ego_store.c b/src/service/messenger/gnunet-service-messenger_ego_store.c index a1ffdddab..a1ffdddab 100644 --- a/src/messenger/gnunet-service-messenger_ego_store.c +++ b/src/service/messenger/gnunet-service-messenger_ego_store.c | |||
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h b/src/service/messenger/gnunet-service-messenger_ego_store.h index bf901bf5e..bf901bf5e 100644 --- a/src/messenger/gnunet-service-messenger_ego_store.h +++ b/src/service/messenger/gnunet-service-messenger_ego_store.h | |||
diff --git a/src/messenger/gnunet-service-messenger_handle.c b/src/service/messenger/gnunet-service-messenger_handle.c index 764331c4a..764331c4a 100644 --- a/src/messenger/gnunet-service-messenger_handle.c +++ b/src/service/messenger/gnunet-service-messenger_handle.c | |||
diff --git a/src/messenger/gnunet-service-messenger_handle.h b/src/service/messenger/gnunet-service-messenger_handle.h index edcd2ccd0..edcd2ccd0 100644 --- a/src/messenger/gnunet-service-messenger_handle.h +++ b/src/service/messenger/gnunet-service-messenger_handle.h | |||
diff --git a/src/messenger/gnunet-service-messenger_list_handles.c b/src/service/messenger/gnunet-service-messenger_list_handles.c index 0703c2de6..0703c2de6 100644 --- a/src/messenger/gnunet-service-messenger_list_handles.c +++ b/src/service/messenger/gnunet-service-messenger_list_handles.c | |||
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h b/src/service/messenger/gnunet-service-messenger_list_handles.h index 8c066519e..8c066519e 100644 --- a/src/messenger/gnunet-service-messenger_list_handles.h +++ b/src/service/messenger/gnunet-service-messenger_list_handles.h | |||
diff --git a/src/messenger/gnunet-service-messenger_list_messages.c b/src/service/messenger/gnunet-service-messenger_list_messages.c index 5bab52806..5bab52806 100644 --- a/src/messenger/gnunet-service-messenger_list_messages.c +++ b/src/service/messenger/gnunet-service-messenger_list_messages.c | |||
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h b/src/service/messenger/gnunet-service-messenger_list_messages.h index 5839f63ca..5839f63ca 100644 --- a/src/messenger/gnunet-service-messenger_list_messages.h +++ b/src/service/messenger/gnunet-service-messenger_list_messages.h | |||
diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/service/messenger/gnunet-service-messenger_member.c index 96b26cfb9..96b26cfb9 100644 --- a/src/messenger/gnunet-service-messenger_member.c +++ b/src/service/messenger/gnunet-service-messenger_member.c | |||
diff --git a/src/messenger/gnunet-service-messenger_member.h b/src/service/messenger/gnunet-service-messenger_member.h index c06be1df7..c06be1df7 100644 --- a/src/messenger/gnunet-service-messenger_member.h +++ b/src/service/messenger/gnunet-service-messenger_member.h | |||
diff --git a/src/messenger/gnunet-service-messenger_member_session.c b/src/service/messenger/gnunet-service-messenger_member_session.c index 8ae1244c4..8ae1244c4 100644 --- a/src/messenger/gnunet-service-messenger_member_session.c +++ b/src/service/messenger/gnunet-service-messenger_member_session.c | |||
diff --git a/src/messenger/gnunet-service-messenger_member_session.h b/src/service/messenger/gnunet-service-messenger_member_session.h index fad1ab041..fad1ab041 100644 --- a/src/messenger/gnunet-service-messenger_member_session.h +++ b/src/service/messenger/gnunet-service-messenger_member_session.h | |||
diff --git a/src/messenger/gnunet-service-messenger_member_store.c b/src/service/messenger/gnunet-service-messenger_member_store.c index fc28babc4..fc28babc4 100644 --- a/src/messenger/gnunet-service-messenger_member_store.c +++ b/src/service/messenger/gnunet-service-messenger_member_store.c | |||
diff --git a/src/messenger/gnunet-service-messenger_member_store.h b/src/service/messenger/gnunet-service-messenger_member_store.h index 337ddcf78..337ddcf78 100644 --- a/src/messenger/gnunet-service-messenger_member_store.h +++ b/src/service/messenger/gnunet-service-messenger_member_store.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_handle.c b/src/service/messenger/gnunet-service-messenger_message_handle.c index 06b987657..06b987657 100644 --- a/src/messenger/gnunet-service-messenger_message_handle.c +++ b/src/service/messenger/gnunet-service-messenger_message_handle.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h b/src/service/messenger/gnunet-service-messenger_message_handle.h index 0a97cd840..0a97cd840 100644 --- a/src/messenger/gnunet-service-messenger_message_handle.h +++ b/src/service/messenger/gnunet-service-messenger_message_handle.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/service/messenger/gnunet-service-messenger_message_kind.c index d2923a5e3..d2923a5e3 100644 --- a/src/messenger/gnunet-service-messenger_message_kind.c +++ b/src/service/messenger/gnunet-service-messenger_message_kind.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_kind.h b/src/service/messenger/gnunet-service-messenger_message_kind.h index d50317844..d50317844 100644 --- a/src/messenger/gnunet-service-messenger_message_kind.h +++ b/src/service/messenger/gnunet-service-messenger_message_kind.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_recv.c b/src/service/messenger/gnunet-service-messenger_message_recv.c index ea309f893..ea309f893 100644 --- a/src/messenger/gnunet-service-messenger_message_recv.c +++ b/src/service/messenger/gnunet-service-messenger_message_recv.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h b/src/service/messenger/gnunet-service-messenger_message_recv.h index 8e5b02504..8e5b02504 100644 --- a/src/messenger/gnunet-service-messenger_message_recv.h +++ b/src/service/messenger/gnunet-service-messenger_message_recv.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_send.c b/src/service/messenger/gnunet-service-messenger_message_send.c index 09039758b..09039758b 100644 --- a/src/messenger/gnunet-service-messenger_message_send.c +++ b/src/service/messenger/gnunet-service-messenger_message_send.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_send.h b/src/service/messenger/gnunet-service-messenger_message_send.h index 4f4c6cfc2..4f4c6cfc2 100644 --- a/src/messenger/gnunet-service-messenger_message_send.h +++ b/src/service/messenger/gnunet-service-messenger_message_send.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_state.c b/src/service/messenger/gnunet-service-messenger_message_state.c index b2328588e..b2328588e 100644 --- a/src/messenger/gnunet-service-messenger_message_state.c +++ b/src/service/messenger/gnunet-service-messenger_message_state.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_state.h b/src/service/messenger/gnunet-service-messenger_message_state.h index 10e6a2c46..10e6a2c46 100644 --- a/src/messenger/gnunet-service-messenger_message_state.h +++ b/src/service/messenger/gnunet-service-messenger_message_state.h | |||
diff --git a/src/messenger/gnunet-service-messenger_message_store.c b/src/service/messenger/gnunet-service-messenger_message_store.c index 1f77de9ca..1f77de9ca 100644 --- a/src/messenger/gnunet-service-messenger_message_store.c +++ b/src/service/messenger/gnunet-service-messenger_message_store.c | |||
diff --git a/src/messenger/gnunet-service-messenger_message_store.h b/src/service/messenger/gnunet-service-messenger_message_store.h index 262d10555..262d10555 100644 --- a/src/messenger/gnunet-service-messenger_message_store.h +++ b/src/service/messenger/gnunet-service-messenger_message_store.h | |||
diff --git a/src/messenger/gnunet-service-messenger_operation.c b/src/service/messenger/gnunet-service-messenger_operation.c index 9c4201fdf..9c4201fdf 100644 --- a/src/messenger/gnunet-service-messenger_operation.c +++ b/src/service/messenger/gnunet-service-messenger_operation.c | |||
diff --git a/src/messenger/gnunet-service-messenger_operation.h b/src/service/messenger/gnunet-service-messenger_operation.h index b93282d24..b93282d24 100644 --- a/src/messenger/gnunet-service-messenger_operation.h +++ b/src/service/messenger/gnunet-service-messenger_operation.h | |||
diff --git a/src/messenger/gnunet-service-messenger_operation_store.c b/src/service/messenger/gnunet-service-messenger_operation_store.c index 6a639d69e..6a639d69e 100644 --- a/src/messenger/gnunet-service-messenger_operation_store.c +++ b/src/service/messenger/gnunet-service-messenger_operation_store.c | |||
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h b/src/service/messenger/gnunet-service-messenger_operation_store.h index 16531758c..16531758c 100644 --- a/src/messenger/gnunet-service-messenger_operation_store.h +++ b/src/service/messenger/gnunet-service-messenger_operation_store.h | |||
diff --git a/src/messenger/gnunet-service-messenger_room.c b/src/service/messenger/gnunet-service-messenger_room.c index f2f841c20..f2f841c20 100644 --- a/src/messenger/gnunet-service-messenger_room.c +++ b/src/service/messenger/gnunet-service-messenger_room.c | |||
diff --git a/src/messenger/gnunet-service-messenger_room.h b/src/service/messenger/gnunet-service-messenger_room.h index fb2a88aea..fb2a88aea 100644 --- a/src/messenger/gnunet-service-messenger_room.h +++ b/src/service/messenger/gnunet-service-messenger_room.h | |||
diff --git a/src/messenger/gnunet-service-messenger_service.c b/src/service/messenger/gnunet-service-messenger_service.c index 8dfc258c1..8dfc258c1 100644 --- a/src/messenger/gnunet-service-messenger_service.c +++ b/src/service/messenger/gnunet-service-messenger_service.c | |||
diff --git a/src/messenger/gnunet-service-messenger_service.h b/src/service/messenger/gnunet-service-messenger_service.h index 36df81141..36df81141 100644 --- a/src/messenger/gnunet-service-messenger_service.h +++ b/src/service/messenger/gnunet-service-messenger_service.h | |||
diff --git a/src/messenger/gnunet-service-messenger_tunnel.c b/src/service/messenger/gnunet-service-messenger_tunnel.c index 8ad7fff1c..8ad7fff1c 100644 --- a/src/messenger/gnunet-service-messenger_tunnel.c +++ b/src/service/messenger/gnunet-service-messenger_tunnel.c | |||
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h b/src/service/messenger/gnunet-service-messenger_tunnel.h index 2ffa2d04f..2ffa2d04f 100644 --- a/src/messenger/gnunet-service-messenger_tunnel.h +++ b/src/service/messenger/gnunet-service-messenger_tunnel.h | |||
diff --git a/src/messenger/meson.build b/src/service/messenger/meson.build index c855b45e4..c855b45e4 100644 --- a/src/messenger/meson.build +++ b/src/service/messenger/meson.build | |||
diff --git a/src/messenger/messenger.conf.in b/src/service/messenger/messenger.conf.in index ef0544681..ef0544681 100644 --- a/src/messenger/messenger.conf.in +++ b/src/service/messenger/messenger.conf.in | |||
diff --git a/src/messenger/messenger_api.c b/src/service/messenger/messenger_api.c index 3604d0569..3604d0569 100644 --- a/src/messenger/messenger_api.c +++ b/src/service/messenger/messenger_api.c | |||
diff --git a/src/messenger/messenger_api_contact.c b/src/service/messenger/messenger_api_contact.c index a11190c2c..a11190c2c 100644 --- a/src/messenger/messenger_api_contact.c +++ b/src/service/messenger/messenger_api_contact.c | |||
diff --git a/src/messenger/messenger_api_contact.h b/src/service/messenger/messenger_api_contact.h index 4463aa746..4463aa746 100644 --- a/src/messenger/messenger_api_contact.h +++ b/src/service/messenger/messenger_api_contact.h | |||
diff --git a/src/messenger/messenger_api_contact_store.c b/src/service/messenger/messenger_api_contact_store.c index b0e0d026b..b0e0d026b 100644 --- a/src/messenger/messenger_api_contact_store.c +++ b/src/service/messenger/messenger_api_contact_store.c | |||
diff --git a/src/messenger/messenger_api_contact_store.h b/src/service/messenger/messenger_api_contact_store.h index e012e42c1..e012e42c1 100644 --- a/src/messenger/messenger_api_contact_store.h +++ b/src/service/messenger/messenger_api_contact_store.h | |||
diff --git a/src/messenger/messenger_api_ego.h b/src/service/messenger/messenger_api_ego.h index 1d84c524f..1d84c524f 100644 --- a/src/messenger/messenger_api_ego.h +++ b/src/service/messenger/messenger_api_ego.h | |||
diff --git a/src/messenger/messenger_api_handle.c b/src/service/messenger/messenger_api_handle.c index fddf73ad5..fddf73ad5 100644 --- a/src/messenger/messenger_api_handle.c +++ b/src/service/messenger/messenger_api_handle.c | |||
diff --git a/src/messenger/messenger_api_handle.h b/src/service/messenger/messenger_api_handle.h index 09f44be8a..09f44be8a 100644 --- a/src/messenger/messenger_api_handle.h +++ b/src/service/messenger/messenger_api_handle.h | |||
diff --git a/src/messenger/messenger_api_list_tunnels.c b/src/service/messenger/messenger_api_list_tunnels.c index a4126c286..a4126c286 100644 --- a/src/messenger/messenger_api_list_tunnels.c +++ b/src/service/messenger/messenger_api_list_tunnels.c | |||
diff --git a/src/messenger/messenger_api_list_tunnels.h b/src/service/messenger/messenger_api_list_tunnels.h index d2ceeafc2..d2ceeafc2 100644 --- a/src/messenger/messenger_api_list_tunnels.h +++ b/src/service/messenger/messenger_api_list_tunnels.h | |||
diff --git a/src/messenger/messenger_api_message.c b/src/service/messenger/messenger_api_message.c index 1f7e8dbf2..1f7e8dbf2 100644 --- a/src/messenger/messenger_api_message.c +++ b/src/service/messenger/messenger_api_message.c | |||
diff --git a/src/messenger/messenger_api_message.h b/src/service/messenger/messenger_api_message.h index 0c2d4acf2..0c2d4acf2 100644 --- a/src/messenger/messenger_api_message.h +++ b/src/service/messenger/messenger_api_message.h | |||
diff --git a/src/messenger/messenger_api_room.c b/src/service/messenger/messenger_api_room.c index c3e8bc957..c3e8bc957 100644 --- a/src/messenger/messenger_api_room.c +++ b/src/service/messenger/messenger_api_room.c | |||
diff --git a/src/messenger/messenger_api_room.h b/src/service/messenger/messenger_api_room.h index d5ffc5c4b..d5ffc5c4b 100644 --- a/src/messenger/messenger_api_room.h +++ b/src/service/messenger/messenger_api_room.h | |||
diff --git a/src/messenger/messenger_api_util.c b/src/service/messenger/messenger_api_util.c index 9d23e2262..9d23e2262 100644 --- a/src/messenger/messenger_api_util.c +++ b/src/service/messenger/messenger_api_util.c | |||
diff --git a/src/messenger/messenger_api_util.h b/src/service/messenger/messenger_api_util.h index bad001da3..bad001da3 100644 --- a/src/messenger/messenger_api_util.h +++ b/src/service/messenger/messenger_api_util.h | |||
diff --git a/src/messenger/plugin_gnsrecord_messenger.c b/src/service/messenger/plugin_gnsrecord_messenger.c index e09a0330d..e09a0330d 100644 --- a/src/messenger/plugin_gnsrecord_messenger.c +++ b/src/service/messenger/plugin_gnsrecord_messenger.c | |||
diff --git a/src/messenger/test_messenger.c b/src/service/messenger/test_messenger.c index 660e6473c..660e6473c 100644 --- a/src/messenger/test_messenger.c +++ b/src/service/messenger/test_messenger.c | |||
diff --git a/src/messenger/test_messenger_anonymous.c b/src/service/messenger/test_messenger_anonymous.c index 367d1c3b7..367d1c3b7 100644 --- a/src/messenger/test_messenger_anonymous.c +++ b/src/service/messenger/test_messenger_anonymous.c | |||
diff --git a/src/messenger/test_messenger_api.conf b/src/service/messenger/test_messenger_api.conf index 968f56f6d..968f56f6d 100644 --- a/src/messenger/test_messenger_api.conf +++ b/src/service/messenger/test_messenger_api.conf | |||
diff --git a/src/messenger/testing_messenger_barrier.c b/src/service/messenger/testing_messenger_barrier.c index 60d1fc0fe..60d1fc0fe 100644 --- a/src/messenger/testing_messenger_barrier.c +++ b/src/service/messenger/testing_messenger_barrier.c | |||
diff --git a/src/messenger/testing_messenger_barrier.h b/src/service/messenger/testing_messenger_barrier.h index 5ea0fe137..5ea0fe137 100644 --- a/src/messenger/testing_messenger_barrier.h +++ b/src/service/messenger/testing_messenger_barrier.h | |||
diff --git a/src/messenger/testing_messenger_setup.c b/src/service/messenger/testing_messenger_setup.c index 65cf12e73..65cf12e73 100644 --- a/src/messenger/testing_messenger_setup.c +++ b/src/service/messenger/testing_messenger_setup.c | |||
diff --git a/src/messenger/testing_messenger_setup.h b/src/service/messenger/testing_messenger_setup.h index e5ae0c151..e5ae0c151 100644 --- a/src/messenger/testing_messenger_setup.h +++ b/src/service/messenger/testing_messenger_setup.h | |||