aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-11 13:15:25 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-11 13:15:25 +0100
commit3b76938ba264c296d14f6912f22f3116e5893eb4 (patch)
treee4cd46f510972e084ccd554de8a4bb2e233c6c82 /src/cadet
parentc1ca3b26ef3dc26bb853505a87b49f9a9d654caf (diff)
downloadgnunet-3b76938ba264c296d14f6912f22f3116e5893eb4.tar.gz
gnunet-3b76938ba264c296d14f6912f22f3116e5893eb4.zip
rename cadet*new to just cadet, except for libgnunetcadetnew-logic (where the 'old' one is not yet entirely dead)
Diffstat (limited to 'src/cadet')
-rw-r--r--src/cadet/Makefile.am80
-rw-r--r--src/cadet/cadet.conf.in2
-rw-r--r--src/cadet/cadet.h2
-rw-r--r--src/cadet/cadet_protocol.h150
-rw-r--r--src/cadet/cadet_test_lib.c (renamed from src/cadet/cadet_test_lib_new.c)0
-rw-r--r--src/cadet/cadet_test_lib.h (renamed from src/cadet/cadet_test_lib_new.h)0
-rw-r--r--src/cadet/gnunet-service-cadet.c (renamed from src/cadet/gnunet-service-cadet-new.c)20
-rw-r--r--src/cadet/gnunet-service-cadet.h (renamed from src/cadet/gnunet-service-cadet-new.h)2
-rw-r--r--src/cadet/gnunet-service-cadet_channel.c (renamed from src/cadet/gnunet-service-cadet-new_channel.c)13
-rw-r--r--src/cadet/gnunet-service-cadet_channel.h (renamed from src/cadet/gnunet-service-cadet-new_channel.h)6
-rw-r--r--src/cadet/gnunet-service-cadet_connection.c (renamed from src/cadet/gnunet-service-cadet-new_connection.c)12
-rw-r--r--src/cadet/gnunet-service-cadet_connection.h (renamed from src/cadet/gnunet-service-cadet-new_connection.h)6
-rw-r--r--src/cadet/gnunet-service-cadet_core.c (renamed from src/cadet/gnunet-service-cadet-new_core.c)10
-rw-r--r--src/cadet/gnunet-service-cadet_core.h (renamed from src/cadet/gnunet-service-cadet-new_core.h)0
-rw-r--r--src/cadet/gnunet-service-cadet_dht.c (renamed from src/cadet/gnunet-service-cadet-new_dht.c)12
-rw-r--r--src/cadet/gnunet-service-cadet_dht.h (renamed from src/cadet/gnunet-service-cadet-new_dht.h)0
-rw-r--r--src/cadet/gnunet-service-cadet_hello.c (renamed from src/cadet/gnunet-service-cadet-new_hello.c)10
-rw-r--r--src/cadet/gnunet-service-cadet_hello.h (renamed from src/cadet/gnunet-service-cadet-new_hello.h)0
-rw-r--r--src/cadet/gnunet-service-cadet_paths.c (renamed from src/cadet/gnunet-service-cadet-new_paths.c)10
-rw-r--r--src/cadet/gnunet-service-cadet_paths.h (renamed from src/cadet/gnunet-service-cadet-new_paths.h)2
-rw-r--r--src/cadet/gnunet-service-cadet_peer.c (renamed from src/cadet/gnunet-service-cadet-new_peer.c)13
-rw-r--r--src/cadet/gnunet-service-cadet_peer.h (renamed from src/cadet/gnunet-service-cadet-new_peer.h)2
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.c (renamed from src/cadet/gnunet-service-cadet-new_tunnels.c)13
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.h (renamed from src/cadet/gnunet-service-cadet-new_tunnels.h)4
-rw-r--r--src/cadet/test_cadet.c (renamed from src/cadet/test_cadet_new.c)4
25 files changed, 105 insertions, 268 deletions
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index d7208d601..1fe912305 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -22,7 +22,7 @@ plugindir = $(libdir)/gnunet
22AM_CLFAGS = -g 22AM_CLFAGS = -g
23 23
24libexec_PROGRAMS = \ 24libexec_PROGRAMS = \
25 gnunet-service-cadet-new \ 25 gnunet-service-cadet \
26 $(EXP_LIBEXEC) 26 $(EXP_LIBEXEC)
27 27
28bin_PROGRAMS = \ 28bin_PROGRAMS = \
@@ -60,17 +60,17 @@ gnunet_cadet_LDADD = \
60 libgnunetcadetnew.la \ 60 libgnunetcadetnew.la \
61 $(top_builddir)/src/util/libgnunetutil.la 61 $(top_builddir)/src/util/libgnunetutil.la
62 62
63gnunet_service_cadet_new_SOURCES = \ 63gnunet_service_cadet_SOURCES = \
64 gnunet-service-cadet-new.c gnunet-service-cadet-new.h \ 64 gnunet-service-cadet.c gnunet-service-cadet.h \
65 gnunet-service-cadet-new_channel.c gnunet-service-cadet-new_channel.h \ 65 gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \
66 gnunet-service-cadet-new_connection.c gnunet-service-cadet-new_connection.h \ 66 gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \
67 gnunet-service-cadet-new_core.c gnunet-service-cadet-new_core.h \ 67 gnunet-service-cadet_core.c gnunet-service-cadet_core.h \
68 gnunet-service-cadet-new_dht.c gnunet-service-cadet-new_dht.h \ 68 gnunet-service-cadet_dht.c gnunet-service-cadet_dht.h \
69 gnunet-service-cadet-new_hello.c gnunet-service-cadet-new_hello.h \ 69 gnunet-service-cadet_hello.c gnunet-service-cadet_hello.h \
70 gnunet-service-cadet-new_tunnels.c gnunet-service-cadet-new_tunnels.h \ 70 gnunet-service-cadet_tunnels.c gnunet-service-cadet_tunnels.h \
71 gnunet-service-cadet-new_paths.c gnunet-service-cadet-new_paths.h \ 71 gnunet-service-cadet_paths.c gnunet-service-cadet_paths.h \
72 gnunet-service-cadet-new_peer.c gnunet-service-cadet-new_peer.h 72 gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h
73gnunet_service_cadet_new_LDADD = \ 73gnunet_service_cadet_LDADD = \
74 $(top_builddir)/src/util/libgnunetutil.la \ 74 $(top_builddir)/src/util/libgnunetutil.la \
75 $(top_builddir)/src/ats/libgnunetats.la \ 75 $(top_builddir)/src/ats/libgnunetats.la \
76 $(top_builddir)/src/core/libgnunetcore.la \ 76 $(top_builddir)/src/core/libgnunetcore.la \
@@ -87,7 +87,7 @@ endif
87 87
88if HAVE_TESTING 88if HAVE_TESTING
89 noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) 89 noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP)
90 noinst_PROGRAMS = gnunet-cadet-profiler 90# noinst_PROGRAMS = gnunet-cadet-profiler
91endif 91endif
92 92
93if HAVE_TESTING 93if HAVE_TESTING
@@ -112,23 +112,10 @@ check_PROGRAMS = \
112 test_cadet_5_speed_backwards 112 test_cadet_5_speed_backwards
113endif 113endif
114 114
115ld_cadet_test_lib = \
116 $(top_builddir)/src/util/libgnunetutil.la \
117 $(top_builddir)/src/testing/libgnunettesting.la \
118 libgnunetcadettest.la \
119 libgnunetcadet.la \
120 $(top_builddir)/src/testbed/libgnunettestbed.la \
121 $(top_builddir)/src/statistics/libgnunetstatistics.la
122 115
123dep_cadet_test_lib = \ 116#gnunet_cadet_profiler_SOURCES = \
124 libgnunetcadet.la \ 117# gnunet-cadet-profiler.c
125 libgnunetcadettest.la \ 118#gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib)
126 $(top_builddir)/src/statistics/libgnunetstatistics.la
127
128
129gnunet_cadet_profiler_SOURCES = \
130 gnunet-cadet-profiler.c
131gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib)
132 119
133 120
134test_cadet_local_mq_SOURCES = \ 121test_cadet_local_mq_SOURCES = \
@@ -140,7 +127,7 @@ test_cadet_local_mq_LDADD = \
140 127
141 128
142libgnunetcadettest_la_SOURCES = \ 129libgnunetcadettest_la_SOURCES = \
143 cadet_test_lib_new.c cadet_test_lib_new.h 130 cadet_test_lib.c cadet_test_lib.h
144libgnunetcadettest_la_LIBADD = \ 131libgnunetcadettest_la_LIBADD = \
145 $(top_builddir)/src/util/libgnunetutil.la \ 132 $(top_builddir)/src/util/libgnunetutil.la \
146 $(top_builddir)/src/testbed/libgnunettestbed.la \ 133 $(top_builddir)/src/testbed/libgnunettestbed.la \
@@ -159,68 +146,67 @@ dep_cadet_test_lib = \
159 $(top_builddir)/src/statistics/libgnunetstatistics.la 146 $(top_builddir)/src/statistics/libgnunetstatistics.la
160 147
161test_cadet_2_forward_SOURCES = \ 148test_cadet_2_forward_SOURCES = \
162 test_cadet_new.c 149 test_cadet.c
163test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) 150test_cadet_2_forward_LDADD = $(ld_cadet_test_lib)
164 151
165test_cadet_2_signal_SOURCES = \ 152test_cadet_2_signal_SOURCES = \
166 test_cadet_new.c 153 test_cadet.c
167test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) 154test_cadet_2_signal_LDADD = $(ld_cadet_test_lib)
168 155
169test_cadet_2_keepalive_SOURCES = \ 156test_cadet_2_keepalive_SOURCES = \
170 test_cadet_new.c 157 test_cadet.c
171test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) 158test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib)
172 159
173test_cadet_2_speed_SOURCES = \ 160test_cadet_2_speed_SOURCES = \
174 test_cadet_new.c 161 test_cadet.c
175test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) 162test_cadet_2_speed_LDADD = $(ld_cadet_test_lib)
176 163
177test_cadet_2_speed_ack_SOURCES = \ 164test_cadet_2_speed_ack_SOURCES = \
178 test_cadet_new.c 165 test_cadet.c
179test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) 166test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib)
180 167
181test_cadet_2_speed_backwards_SOURCES = \ 168test_cadet_2_speed_backwards_SOURCES = \
182 test_cadet_new.c 169 test_cadet.c
183test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) 170test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib)
184 171
185test_cadet_2_speed_reliable_SOURCES = \ 172test_cadet_2_speed_reliable_SOURCES = \
186 test_cadet_new.c 173 test_cadet.c
187test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) 174test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib)
188 175
189test_cadet_2_speed_reliable_backwards_SOURCES = \ 176test_cadet_2_speed_reliable_backwards_SOURCES = \
190 test_cadet_new.c 177 test_cadet.c
191test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) 178test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
192 179
193
194test_cadet_5_forward_SOURCES = \ 180test_cadet_5_forward_SOURCES = \
195 test_cadet_new.c 181 test_cadet.c
196test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) 182test_cadet_5_forward_LDADD = $(ld_cadet_test_lib)
197 183
198test_cadet_5_signal_SOURCES = \ 184test_cadet_5_signal_SOURCES = \
199 test_cadet_new.c 185 test_cadet.c
200test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) 186test_cadet_5_signal_LDADD = $(ld_cadet_test_lib)
201 187
202test_cadet_5_keepalive_SOURCES = \ 188test_cadet_5_keepalive_SOURCES = \
203 test_cadet_new.c 189 test_cadet.c
204test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) 190test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib)
205 191
206test_cadet_5_speed_SOURCES = \ 192test_cadet_5_speed_SOURCES = \
207 test_cadet_new.c 193 test_cadet.c
208test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) 194test_cadet_5_speed_LDADD = $(ld_cadet_test_lib)
209 195
210test_cadet_5_speed_ack_SOURCES = \ 196test_cadet_5_speed_ack_SOURCES = \
211 test_cadet_new.c 197 test_cadet.c
212test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) 198test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib)
213 199
214test_cadet_5_speed_backwards_SOURCES = \ 200test_cadet_5_speed_backwards_SOURCES = \
215 test_cadet_new.c 201 test_cadet.c
216test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) 202test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib)
217 203
218test_cadet_5_speed_reliable_SOURCES = \ 204test_cadet_5_speed_reliable_SOURCES = \
219 test_cadet_new.c 205 test_cadet.c
220test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) 206test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib)
221 207
222test_cadet_5_speed_reliable_backwards_SOURCES = \ 208test_cadet_5_speed_reliable_backwards_SOURCES = \
223 test_cadet_new.c 209 test_cadet.c
224test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) 210test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib)
225 211
226 212
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index 86ba2e535..d50e168f0 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -3,7 +3,7 @@ FORCESTART = YES
3AUTOSTART = @AUTOSTART@ 3AUTOSTART = @AUTOSTART@
4@JAVAPORT@PORT = 2096 4@JAVAPORT@PORT = 2096
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-cadet-new 6BINARY = gnunet-service-cadet
7# PREFIX = valgrind --leak-check=yes 7# PREFIX = valgrind --leak-check=yes
8ACCEPT_FROM = 127.0.0.1; 8ACCEPT_FROM = 127.0.0.1;
9ACCEPT_FROM6 = ::1; 9ACCEPT_FROM6 = ::1;
diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index 451d1f354..99f9f2653 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -59,7 +59,7 @@ extern "C"
59#include "gnunet_core_service.h" 59#include "gnunet_core_service.h"
60#include "gnunet_cadet_service.h" 60#include "gnunet_cadet_service.h"
61#include "gnunet_protocols.h" 61#include "gnunet_protocols.h"
62#include <gnunet_cadet_service.h> 62#include "gnunet_cadet_service.h"
63 63
64/******************************************************************************/ 64/******************************************************************************/
65/************************** CONSTANTS ******************************/ 65/************************** CONSTANTS ******************************/
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h
index d2426addb..560c186cd 100644
--- a/src/cadet/cadet_protocol.h
+++ b/src/cadet/cadet_protocol.h
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 Copyright (C) 2001 - 2011 GNUnet e.V. 3 Copyright (C) 2007 - 2017 GNUnet e.V.
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -19,8 +19,10 @@
19*/ 19*/
20 20
21/** 21/**
22 * @author Bartlomiej Polot
23 * @file cadet/cadet_protocol.h 22 * @file cadet/cadet_protocol.h
23 * @brief P2P messages used by CADET
24 * @author Bartlomiej Polot
25 * @author Christian Grothoff
24 */ 26 */
25 27
26#ifndef CADET_PROTOCOL_H_ 28#ifndef CADET_PROTOCOL_H_
@@ -298,17 +300,10 @@ struct GNUNET_CADET_TunnelEncryptedMessage
298 */ 300 */
299 struct GNUNET_MessageHeader header; 301 struct GNUNET_MessageHeader header;
300 302
301#if NEW_CADET
302 /** 303 /**
303 * Reserved, for alignment. 304 * Reserved, for alignment.
304 */ 305 */
305 uint32_t reserved GNUNET_PACKED; 306 uint32_t reserved GNUNET_PACKED;
306#else
307 /**
308 * Maximum packet ID authorized.
309 */
310 struct CadetEncryptedMessageIdentifier cemi;
311#endif
312 307
313 /** 308 /**
314 * ID of the connection. 309 * ID of the connection.
@@ -322,89 +317,18 @@ struct GNUNET_CADET_TunnelEncryptedMessage
322 */ 317 */
323 struct GNUNET_ShortHashCode hmac; 318 struct GNUNET_ShortHashCode hmac;
324 319
325 #if NEW_CADET
326 /** 320 /**
327 * Axolotl-header that specifies which keys to use in which ratchet 321 * Axolotl-header that specifies which keys to use in which ratchet
328 * to decrypt the body that follows. 322 * to decrypt the body that follows.
329 */ 323 */
330 struct GNUNET_CADET_AxHeader ax_header; 324 struct GNUNET_CADET_AxHeader ax_header;
331#else
332 /**
333 * Number of messages sent with the current ratchet key.
334 */
335 uint32_t Ns GNUNET_PACKED;
336
337 /**
338 * Number of messages sent with the previous ratchet key.
339 */
340 uint32_t PNs GNUNET_PACKED;
341 325
342 /** 326 /**
343 * Current ratchet key.
344 */
345 struct GNUNET_CRYPTO_EcdhePublicKey DHRs;
346#endif
347 /**
348 * Encrypted content follows. 327 * Encrypted content follows.
349 */ 328 */
350}; 329};
351 330
352 331
353#ifndef NEW_CADET
354
355/**
356 * Message to query a peer about its Flow Control status regarding a tunnel.
357 *
358 * It is NOT yet clear if we need this.
359 */
360struct GNUNET_CADET_ConnectionHopByHopPollMessage
361{
362 /**
363 * Type: #GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL
364 */
365 struct GNUNET_MessageHeader header;
366
367 /**
368 * Last packet sent.
369 */
370 struct CadetEncryptedMessageIdentifier cemi;
371
372 /**
373 * ID of the connection.
374 */
375 struct GNUNET_CADET_ConnectionTunnelIdentifier cid;
376
377};
378
379
380/**
381 * Message to acknowledge cadet encrypted traffic, used for
382 * flow-control on a hop-by-hop basis on the connection-level. Note
383 * that we do use the @e cemi from the tunnel layer as the connection
384 * layer's header is included/shared with the tunnel layer messages,
385 * and we only do flow control for the payload.
386 */
387struct GNUNET_CADET_ConnectionEncryptedAckMessage
388{
389 /**
390 * Type: #GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK
391 */
392 struct GNUNET_MessageHeader header;
393
394 /**
395 * Maximum packet ID authorized.
396 */
397 struct CadetEncryptedMessageIdentifier cemi_max;
398
399 /**
400 * ID of the connection.
401 */
402 struct GNUNET_CADET_ConnectionTunnelIdentifier cid;
403};
404
405#endif
406
407
408/******************************************************************************/ 332/******************************************************************************/
409/******************************* CHANNEL ***********************************/ 333/******************************* CHANNEL ***********************************/
410/******************************************************************************/ 334/******************************************************************************/
@@ -450,83 +374,19 @@ struct GNUNET_CADET_ChannelManageMessage
450 */ 374 */
451 struct GNUNET_MessageHeader header; 375 struct GNUNET_MessageHeader header;
452 376
453#ifdef NEW_CADET
454 /** 377 /**
455 * For alignment. 378 * For alignment.
456 */ 379 */
457 uint32_t reserved GNUNET_PACKED; 380 uint32_t reserved GNUNET_PACKED;
458#endif
459
460 /**
461 * ID of the channel
462 */
463 struct GNUNET_CADET_ChannelTunnelNumber ctn;
464};
465
466
467#ifndef NEW_CADET
468
469/**
470 * Message for cadet data traffic.
471 */
472struct GNUNET_CADET_ChannelAppDataMessage
473{
474 /**
475 * Type: #GNUNET_MESSAGE_TYPE_CADET_UNICAST,
476 * #GNUNET_MESSAGE_TYPE_CADET_TO_ORIGIN
477 */
478 struct GNUNET_MessageHeader header;
479
480 /**
481 * Unique ID of the payload message
482 */
483 /* NEW: struct ChannelMessageIdentifier */
484 uint32_t mid GNUNET_PACKED;
485 381
486 /** 382 /**
487 * ID of the channel 383 * ID of the channel
488 */ 384 */
489 struct GNUNET_CADET_ChannelTunnelNumber ctn; 385 struct GNUNET_CADET_ChannelTunnelNumber ctn;
490
491 /**
492 * Payload follows
493 */
494}; 386};
495 387
496 388
497/** 389/**
498 * Message to acknowledge end-to-end data.
499 */
500struct GNUNET_CADET_ChannelDataAckMessage
501{
502 /**
503 * Type: #GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA_ACK
504 */
505 struct GNUNET_MessageHeader header;
506
507 /**
508 * ID of the channel
509 */
510 struct GNUNET_CADET_ChannelTunnelNumber ctn;
511
512 /**
513 * Bitfield of already-received messages past @e mid.
514 * pid + 1 @ LSB
515 * pid + 64 @ MSB
516 */
517 uint64_t futures GNUNET_PACKED;
518
519 /**
520 * Last message ID received.
521 */
522 /* NEW: struct ChannelMessageIdentifier */
523 uint32_t mid GNUNET_PACKED;
524};
525
526#else
527
528
529/**
530 * Number used to uniquely identify messages in a CADET Channel. 390 * Number used to uniquely identify messages in a CADET Channel.
531 */ 391 */
532struct ChannelMessageIdentifier 392struct ChannelMessageIdentifier
@@ -595,8 +455,6 @@ struct GNUNET_CADET_ChannelDataAckMessage
595}; 455};
596 456
597 457
598#endif
599
600GNUNET_NETWORK_STRUCT_END 458GNUNET_NETWORK_STRUCT_END
601 459
602#if 0 /* keep Emacsens' auto-indent happy */ 460#if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/cadet/cadet_test_lib_new.c b/src/cadet/cadet_test_lib.c
index c3a1540f4..c3a1540f4 100644
--- a/src/cadet/cadet_test_lib_new.c
+++ b/src/cadet/cadet_test_lib.c
diff --git a/src/cadet/cadet_test_lib_new.h b/src/cadet/cadet_test_lib.h
index 4b3a6b18d..4b3a6b18d 100644
--- a/src/cadet/cadet_test_lib_new.h
+++ b/src/cadet/cadet_test_lib.h
diff --git a/src/cadet/gnunet-service-cadet-new.c b/src/cadet/gnunet-service-cadet.c
index 93f53de4c..a7e1fca47 100644
--- a/src/cadet/gnunet-service-cadet-new.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file cadet/gnunet-service-cadet-new.c 22 * @file cadet/gnunet-service-cadet.c
23 * @brief GNUnet CADET service with encryption 23 * @brief GNUnet CADET service with encryption
24 * @author Bartlomiej Polot 24 * @author Bartlomiej Polot
25 * @author Christian Grothoff 25 * @author Christian Grothoff
@@ -37,15 +37,15 @@
37#include "gnunet_util_lib.h" 37#include "gnunet_util_lib.h"
38#include "cadet.h" 38#include "cadet.h"
39#include "gnunet_statistics_service.h" 39#include "gnunet_statistics_service.h"
40#include "gnunet-service-cadet-new.h" 40#include "gnunet-service-cadet.h"
41#include "gnunet-service-cadet-new_channel.h" 41#include "gnunet-service-cadet_channel.h"
42#include "gnunet-service-cadet-new_connection.h" 42#include "gnunet-service-cadet_connection.h"
43#include "gnunet-service-cadet-new_core.h" 43#include "gnunet-service-cadet_core.h"
44#include "gnunet-service-cadet-new_dht.h" 44#include "gnunet-service-cadet_dht.h"
45#include "gnunet-service-cadet-new_hello.h" 45#include "gnunet-service-cadet_hello.h"
46#include "gnunet-service-cadet-new_tunnels.h" 46#include "gnunet-service-cadet_tunnels.h"
47#include "gnunet-service-cadet-new_peer.h" 47#include "gnunet-service-cadet_peer.h"
48#include "gnunet-service-cadet-new_paths.h" 48#include "gnunet-service-cadet_paths.h"
49 49
50#define LOG(level, ...) GNUNET_log (level,__VA_ARGS__) 50#define LOG(level, ...) GNUNET_log (level,__VA_ARGS__)
51 51
diff --git a/src/cadet/gnunet-service-cadet-new.h b/src/cadet/gnunet-service-cadet.h
index bee5c67cc..2f2d7baf3 100644
--- a/src/cadet/gnunet-service-cadet-new.h
+++ b/src/cadet/gnunet-service-cadet.h
@@ -20,7 +20,7 @@
20*/ 20*/
21 21
22/** 22/**
23 * @file cadet/gnunet-service-cadet-new.h 23 * @file cadet/gnunet-service-cadet.h
24 * @brief Information we track per peer. 24 * @brief Information we track per peer.
25 * @author Bartlomiej Polot 25 * @author Bartlomiej Polot
26 * @author Christian Grothoff 26 * @author Christian Grothoff
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 43c905816..68e29b66b 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -18,7 +18,7 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/gnunet-service-cadet-new_channel.c 21 * @file cadet/gnunet-service-cadet_channel.c
22 * @brief logical links between CADET clients 22 * @brief logical links between CADET clients
23 * @author Bartlomiej Polot 23 * @author Bartlomiej Polot
24 * @author Christian Grothoff 24 * @author Christian Grothoff
@@ -34,15 +34,12 @@
34 * reserve more bits in 'options' to allow for buffer size control? 34 * reserve more bits in 'options' to allow for buffer size control?
35 */ 35 */
36#include "platform.h" 36#include "platform.h"
37#include "gnunet_util_lib.h"
38#include "cadet.h" 37#include "cadet.h"
39#include "gnunet_statistics_service.h" 38#include "gnunet_statistics_service.h"
40#include "gnunet-service-cadet-new.h" 39#include "gnunet-service-cadet_channel.h"
41#include "gnunet-service-cadet-new_channel.h" 40#include "gnunet-service-cadet_connection.h"
42#include "gnunet-service-cadet-new_connection.h" 41#include "gnunet-service-cadet_tunnels.h"
43#include "gnunet-service-cadet-new_tunnels.h" 42#include "gnunet-service-cadet_paths.h"
44#include "gnunet-service-cadet-new_peer.h"
45#include "gnunet-service-cadet-new_paths.h"
46 43
47#define LOG(level,...) GNUNET_log_from (level,"cadet-chn",__VA_ARGS__) 44#define LOG(level,...) GNUNET_log_from (level,"cadet-chn",__VA_ARGS__)
48 45
diff --git a/src/cadet/gnunet-service-cadet-new_channel.h b/src/cadet/gnunet-service-cadet_channel.h
index 5167305a6..a3ef9a06d 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.h
+++ b/src/cadet/gnunet-service-cadet_channel.h
@@ -20,7 +20,7 @@
20*/ 20*/
21 21
22/** 22/**
23 * @file cadet/gnunet-service-cadet-new_channel.h 23 * @file cadet/gnunet-service-cadet_channel.h
24 * @brief GNUnet CADET service with encryption 24 * @brief GNUnet CADET service with encryption
25 * @author Bartlomiej Polot 25 * @author Bartlomiej Polot
26 * @author Christian Grothoff 26 * @author Christian Grothoff
@@ -28,8 +28,8 @@
28#ifndef GNUNET_SERVICE_CADET_CHANNEL_H 28#ifndef GNUNET_SERVICE_CADET_CHANNEL_H
29#define GNUNET_SERVICE_CADET_CHANNEL_H 29#define GNUNET_SERVICE_CADET_CHANNEL_H
30 30
31#include "gnunet-service-cadet-new.h" 31#include "gnunet-service-cadet.h"
32#include "gnunet-service-cadet-new_peer.h" 32#include "gnunet-service-cadet_peer.h"
33#include "cadet_protocol.h" 33#include "cadet_protocol.h"
34 34
35 35
diff --git a/src/cadet/gnunet-service-cadet-new_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 6976e66e4..7b66f61a2 100644
--- a/src/cadet/gnunet-service-cadet-new_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -19,19 +19,17 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file cadet/gnunet-service-cadet-new_connection.c 22 * @file cadet/gnunet-service-cadet_connection.c
23 * @brief management of CORE-level end-to-end connections; establishes 23 * @brief management of CORE-level end-to-end connections; establishes
24 * end-to-end routes and transmits messages along the route 24 * end-to-end routes and transmits messages along the route
25 * @author Bartlomiej Polot 25 * @author Bartlomiej Polot
26 * @author Christian Grothoff 26 * @author Christian Grothoff
27 */ 27 */
28#include "platform.h" 28#include "platform.h"
29#include "gnunet-service-cadet-new.h" 29#include "gnunet-service-cadet_connection.h"
30#include "gnunet-service-cadet-new_channel.h" 30#include "gnunet-service-cadet_channel.h"
31#include "gnunet-service-cadet-new_connection.h" 31#include "gnunet-service-cadet_paths.h"
32#include "gnunet-service-cadet-new_paths.h" 32#include "gnunet-service-cadet_tunnels.h"
33#include "gnunet-service-cadet-new_peer.h"
34#include "gnunet-service-cadet-new_tunnels.h"
35#include "gnunet_cadet_service.h" 33#include "gnunet_cadet_service.h"
36#include "gnunet_statistics_service.h" 34#include "gnunet_statistics_service.h"
37#include "cadet_protocol.h" 35#include "cadet_protocol.h"
diff --git a/src/cadet/gnunet-service-cadet-new_connection.h b/src/cadet/gnunet-service-cadet_connection.h
index e48b208fd..fdb184366 100644
--- a/src/cadet/gnunet-service-cadet-new_connection.h
+++ b/src/cadet/gnunet-service-cadet_connection.h
@@ -20,7 +20,7 @@
20*/ 20*/
21 21
22/** 22/**
23 * @file cadet/gnunet-service-cadet-new_connection.h 23 * @file cadet/gnunet-service-cadet_connection.h
24 * @brief A connection is a live end-to-end messaging mechanism 24 * @brief A connection is a live end-to-end messaging mechanism
25 * where the peers are identified by a path and know how 25 * where the peers are identified by a path and know how
26 * to forward along the route using a connection identifier 26 * to forward along the route using a connection identifier
@@ -32,8 +32,8 @@
32#define GNUNET_SERVICE_CADET_CONNECTION_H 32#define GNUNET_SERVICE_CADET_CONNECTION_H
33 33
34#include "gnunet_util_lib.h" 34#include "gnunet_util_lib.h"
35#include "gnunet-service-cadet-new.h" 35#include "gnunet-service-cadet.h"
36#include "gnunet-service-cadet-new_peer.h" 36#include "gnunet-service-cadet_peer.h"
37#include "cadet_protocol.h" 37#include "cadet_protocol.h"
38 38
39 39
diff --git a/src/cadet/gnunet-service-cadet-new_core.c b/src/cadet/gnunet-service-cadet_core.c
index 3768c36a5..ae03b4f35 100644
--- a/src/cadet/gnunet-service-cadet-new_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -30,11 +30,11 @@
30 * - Optimization: given BROKEN messages, destroy paths (?) 30 * - Optimization: given BROKEN messages, destroy paths (?)
31 */ 31 */
32#include "platform.h" 32#include "platform.h"
33#include "gnunet-service-cadet-new_core.h" 33#include "gnunet-service-cadet_core.h"
34#include "gnunet-service-cadet-new_paths.h" 34#include "gnunet-service-cadet_paths.h"
35#include "gnunet-service-cadet-new_peer.h" 35#include "gnunet-service-cadet_peer.h"
36#include "gnunet-service-cadet-new_connection.h" 36#include "gnunet-service-cadet_connection.h"
37#include "gnunet-service-cadet-new_tunnels.h" 37#include "gnunet-service-cadet_tunnels.h"
38#include "gnunet_core_service.h" 38#include "gnunet_core_service.h"
39#include "gnunet_statistics_service.h" 39#include "gnunet_statistics_service.h"
40#include "cadet_protocol.h" 40#include "cadet_protocol.h"
diff --git a/src/cadet/gnunet-service-cadet-new_core.h b/src/cadet/gnunet-service-cadet_core.h
index 65b0a6ba5..65b0a6ba5 100644
--- a/src/cadet/gnunet-service-cadet-new_core.h
+++ b/src/cadet/gnunet-service-cadet_core.h
diff --git a/src/cadet/gnunet-service-cadet-new_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index 849562f23..f00c0caf3 100644
--- a/src/cadet/gnunet-service-cadet-new_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -18,7 +18,7 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/gnunet-service-cadet-new_dht.c 21 * @file cadet/gnunet-service-cadet_dht.c
22 * @brief Information we track per peer. 22 * @brief Information we track per peer.
23 * @author Bartlomiej Polot 23 * @author Bartlomiej Polot
24 * @author Christian Grothoff 24 * @author Christian Grothoff
@@ -28,11 +28,11 @@
28#include "gnunet_util_lib.h" 28#include "gnunet_util_lib.h"
29#include "gnunet_dht_service.h" 29#include "gnunet_dht_service.h"
30#include "gnunet_statistics_service.h" 30#include "gnunet_statistics_service.h"
31#include "gnunet-service-cadet-new.h" 31#include "gnunet-service-cadet.h"
32#include "gnunet-service-cadet-new_dht.h" 32#include "gnunet-service-cadet_dht.h"
33#include "gnunet-service-cadet-new_hello.h" 33#include "gnunet-service-cadet_hello.h"
34#include "gnunet-service-cadet-new_peer.h" 34#include "gnunet-service-cadet_peer.h"
35#include "gnunet-service-cadet-new_paths.h" 35#include "gnunet-service-cadet_paths.h"
36 36
37/** 37/**
38 * How long do we wait before first announcing our presence to the DHT. 38 * How long do we wait before first announcing our presence to the DHT.
diff --git a/src/cadet/gnunet-service-cadet-new_dht.h b/src/cadet/gnunet-service-cadet_dht.h
index 5d7ab29a0..5d7ab29a0 100644
--- a/src/cadet/gnunet-service-cadet-new_dht.h
+++ b/src/cadet/gnunet-service-cadet_dht.h
diff --git a/src/cadet/gnunet-service-cadet-new_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index a24325ada..6d85de39f 100644
--- a/src/cadet/gnunet-service-cadet-new_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -18,7 +18,7 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/gnunet-service-cadet-new_hello.c 21 * @file cadet/gnunet-service-cadet_hello.c
22 * @brief spread knowledge about how to contact other peers from PEERINFO 22 * @brief spread knowledge about how to contact other peers from PEERINFO
23 * @author Bartlomiej Polot 23 * @author Bartlomiej Polot
24 * @author Christian Grothoff 24 * @author Christian Grothoff
@@ -33,10 +33,10 @@
33#include "gnunet_statistics_service.h" 33#include "gnunet_statistics_service.h"
34#include "gnunet_peerinfo_service.h" 34#include "gnunet_peerinfo_service.h"
35#include "cadet_protocol.h" 35#include "cadet_protocol.h"
36#include "gnunet-service-cadet-new.h" 36#include "gnunet-service-cadet.h"
37#include "gnunet-service-cadet-new_dht.h" 37#include "gnunet-service-cadet_dht.h"
38#include "gnunet-service-cadet-new_hello.h" 38#include "gnunet-service-cadet_hello.h"
39#include "gnunet-service-cadet-new_peer.h" 39#include "gnunet-service-cadet_peer.h"
40 40
41#define LOG(level, ...) GNUNET_log_from(level,"cadet-hll",__VA_ARGS__) 41#define LOG(level, ...) GNUNET_log_from(level,"cadet-hll",__VA_ARGS__)
42 42
diff --git a/src/cadet/gnunet-service-cadet-new_hello.h b/src/cadet/gnunet-service-cadet_hello.h
index 4291ae985..4291ae985 100644
--- a/src/cadet/gnunet-service-cadet-new_hello.h
+++ b/src/cadet/gnunet-service-cadet_hello.h
diff --git a/src/cadet/gnunet-service-cadet-new_paths.c b/src/cadet/gnunet-service-cadet_paths.c
index c6121a133..13752643c 100644
--- a/src/cadet/gnunet-service-cadet-new_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -18,16 +18,16 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/gnunet-service-cadet-new_paths.c 21 * @file cadet/gnunet-service-cadet_paths.c
22 * @brief Information we track per path. 22 * @brief Information we track per path.
23 * @author Bartlomiej Polot 23 * @author Bartlomiej Polot
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "platform.h" 26#include "platform.h"
27#include "gnunet-service-cadet-new_connection.h" 27#include "gnunet-service-cadet_connection.h"
28#include "gnunet-service-cadet-new_tunnels.h" 28#include "gnunet-service-cadet_tunnels.h"
29#include "gnunet-service-cadet-new_peer.h" 29#include "gnunet-service-cadet_peer.h"
30#include "gnunet-service-cadet-new_paths.h" 30#include "gnunet-service-cadet_paths.h"
31 31
32 32
33#define LOG(level, ...) GNUNET_log_from(level,"cadet-pat",__VA_ARGS__) 33#define LOG(level, ...) GNUNET_log_from(level,"cadet-pat",__VA_ARGS__)
diff --git a/src/cadet/gnunet-service-cadet-new_paths.h b/src/cadet/gnunet-service-cadet_paths.h
index 7310d75e6..6b7bef640 100644
--- a/src/cadet/gnunet-service-cadet-new_paths.h
+++ b/src/cadet/gnunet-service-cadet_paths.h
@@ -29,7 +29,7 @@
29#define GNUNET_SERVICE_CADET_PATHS_H 29#define GNUNET_SERVICE_CADET_PATHS_H
30 30
31#include "gnunet_util_lib.h" 31#include "gnunet_util_lib.h"
32#include "gnunet-service-cadet-new.h" 32#include "gnunet-service-cadet.h"
33 33
34/** 34/**
35 * Create a peer path based on the result of a DHT lookup. If we 35 * Create a peer path based on the result of a DHT lookup. If we
diff --git a/src/cadet/gnunet-service-cadet-new_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 29aef6895..71c7c67d0 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -19,7 +19,7 @@
19*/ 19*/
20 20
21/** 21/**
22 * @file cadet/gnunet-service-cadet-new_peer.c 22 * @file cadet/gnunet-service-cadet_peer.c
23 * @brief Information we track per peer. 23 * @brief Information we track per peer.
24 * @author Bartlomiej Polot 24 * @author Bartlomiej Polot
25 * @author Christian Grothoff 25 * @author Christian Grothoff
@@ -39,12 +39,11 @@
39#include "gnunet_core_service.h" 39#include "gnunet_core_service.h"
40#include "gnunet_statistics_service.h" 40#include "gnunet_statistics_service.h"
41#include "cadet_protocol.h" 41#include "cadet_protocol.h"
42#include "gnunet-service-cadet-new.h" 42#include "gnunet-service-cadet_connection.h"
43#include "gnunet-service-cadet-new_connection.h" 43#include "gnunet-service-cadet_dht.h"
44#include "gnunet-service-cadet-new_dht.h" 44#include "gnunet-service-cadet_peer.h"
45#include "gnunet-service-cadet-new_peer.h" 45#include "gnunet-service-cadet_paths.h"
46#include "gnunet-service-cadet-new_paths.h" 46#include "gnunet-service-cadet_tunnels.h"
47#include "gnunet-service-cadet-new_tunnels.h"
48 47
49 48
50#define LOG(level, ...) GNUNET_log_from(level,"cadet-per",__VA_ARGS__) 49#define LOG(level, ...) GNUNET_log_from(level,"cadet-per",__VA_ARGS__)
diff --git a/src/cadet/gnunet-service-cadet-new_peer.h b/src/cadet/gnunet-service-cadet_peer.h
index e1d6fc33a..a2a6c6a92 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.h
+++ b/src/cadet/gnunet-service-cadet_peer.h
@@ -28,7 +28,7 @@
28#ifndef GNUNET_SERVICE_CADET_PEER_H 28#ifndef GNUNET_SERVICE_CADET_PEER_H
29#define GNUNET_SERVICE_CADET_PEER_H 29#define GNUNET_SERVICE_CADET_PEER_H
30 30
31#include "gnunet-service-cadet-new.h" 31#include "gnunet-service-cadet.h"
32#include "gnunet_hello_lib.h" 32#include "gnunet_hello_lib.h"
33 33
34 34
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index d50860629..bcdeeb4da 100644
--- a/src/cadet/gnunet-service-cadet-new_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -18,7 +18,7 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/gnunet-service-cadet-new_tunnels.c 21 * @file cadet/gnunet-service-cadet_tunnels.c
22 * @brief Information we track per tunnel. 22 * @brief Information we track per tunnel.
23 * @author Bartlomiej Polot 23 * @author Bartlomiej Polot
24 * @author Christian Grothoff 24 * @author Christian Grothoff
@@ -34,13 +34,12 @@
34#include "gnunet_util_lib.h" 34#include "gnunet_util_lib.h"
35#include "gnunet_statistics_service.h" 35#include "gnunet_statistics_service.h"
36#include "gnunet_signatures.h" 36#include "gnunet_signatures.h"
37#include "gnunet-service-cadet-new.h"
38#include "cadet_protocol.h" 37#include "cadet_protocol.h"
39#include "gnunet-service-cadet-new_channel.h" 38#include "gnunet-service-cadet_channel.h"
40#include "gnunet-service-cadet-new_connection.h" 39#include "gnunet-service-cadet_connection.h"
41#include "gnunet-service-cadet-new_tunnels.h" 40#include "gnunet-service-cadet_tunnels.h"
42#include "gnunet-service-cadet-new_peer.h" 41#include "gnunet-service-cadet_peer.h"
43#include "gnunet-service-cadet-new_paths.h" 42#include "gnunet-service-cadet_paths.h"
44 43
45 44
46#define LOG(level, ...) GNUNET_log_from(level,"cadet-tun",__VA_ARGS__) 45#define LOG(level, ...) GNUNET_log_from(level,"cadet-tun",__VA_ARGS__)
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h
index a81bc2341..4a3619ab6 100644
--- a/src/cadet/gnunet-service-cadet-new_tunnels.h
+++ b/src/cadet/gnunet-service-cadet_tunnels.h
@@ -20,7 +20,7 @@
20*/ 20*/
21 21
22/** 22/**
23 * @file cadet/gnunet-service-cadet-new_tunnels.h 23 * @file cadet/gnunet-service-cadet_tunnels.h
24 * @brief Information we track per tunnel. 24 * @brief Information we track per tunnel.
25 * @author Bartlomiej Polot 25 * @author Bartlomiej Polot
26 * @author Christian Grothoff 26 * @author Christian Grothoff
@@ -28,7 +28,7 @@
28#ifndef GNUNET_SERVICE_CADET_TUNNELS_H 28#ifndef GNUNET_SERVICE_CADET_TUNNELS_H
29#define GNUNET_SERVICE_CADET_TUNNELS_H 29#define GNUNET_SERVICE_CADET_TUNNELS_H
30 30
31#include "gnunet-service-cadet-new.h" 31#include "gnunet-service-cadet.h"
32#include "cadet_protocol.h" 32#include "cadet_protocol.h"
33 33
34 34
diff --git a/src/cadet/test_cadet_new.c b/src/cadet/test_cadet.c
index 374e86bf3..4fe43b3bf 100644
--- a/src/cadet/test_cadet_new.c
+++ b/src/cadet/test_cadet.c
@@ -18,14 +18,14 @@
18 Boston, MA 02110-1301, USA. 18 Boston, MA 02110-1301, USA.
19*/ 19*/
20/** 20/**
21 * @file cadet/test_cadet_mq.c 21 * @file cadet/test_cadet.c
22 * @author Bart Polot 22 * @author Bart Polot
23 * @author Christian Grothoff 23 * @author Christian Grothoff
24 * @brief Test for the cadet service using mq API. 24 * @brief Test for the cadet service using mq API.
25 */ 25 */
26#include <stdio.h> 26#include <stdio.h>
27#include "platform.h" 27#include "platform.h"
28#include "cadet_test_lib_new.h" 28#include "cadet_test_lib.h"
29#include "gnunet_cadet_service.h" 29#include "gnunet_cadet_service.h"
30#include "gnunet_statistics_service.h" 30#include "gnunet_statistics_service.h"
31#include <gauger.h> 31#include <gauger.h>