From 3b76938ba264c296d14f6912f22f3116e5893eb4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 11 Mar 2017 13:15:25 +0100 Subject: [PATCH] rename cadet*new to just cadet, except for libgnunetcadetnew-logic (where the 'old' one is not yet entirely dead) --- src/cadet/Makefile.am | 80 ++++------ src/cadet/cadet.conf.in | 2 +- src/cadet/cadet.h | 2 +- src/cadet/cadet_protocol.h | 150 +----------------- ...{cadet_test_lib_new.c => cadet_test_lib.c} | 0 ...{cadet_test_lib_new.h => cadet_test_lib.h} | 0 ...ice-cadet-new.c => gnunet-service-cadet.c} | 20 +-- ...ice-cadet-new.h => gnunet-service-cadet.h} | 2 +- ...annel.c => gnunet-service-cadet_channel.c} | 13 +- ...annel.h => gnunet-service-cadet_channel.h} | 6 +- ...on.c => gnunet-service-cadet_connection.c} | 12 +- ...on.h => gnunet-service-cadet_connection.h} | 6 +- ...new_core.c => gnunet-service-cadet_core.c} | 10 +- ...new_core.h => gnunet-service-cadet_core.h} | 0 ...t-new_dht.c => gnunet-service-cadet_dht.c} | 12 +- ...t-new_dht.h => gnunet-service-cadet_dht.h} | 0 ...w_hello.c => gnunet-service-cadet_hello.c} | 10 +- ...w_hello.h => gnunet-service-cadet_hello.h} | 0 ...w_paths.c => gnunet-service-cadet_paths.c} | 10 +- ...w_paths.h => gnunet-service-cadet_paths.h} | 2 +- ...new_peer.c => gnunet-service-cadet_peer.c} | 13 +- ...new_peer.h => gnunet-service-cadet_peer.h} | 2 +- ...nnels.c => gnunet-service-cadet_tunnels.c} | 13 +- ...nnels.h => gnunet-service-cadet_tunnels.h} | 4 +- src/cadet/{test_cadet_new.c => test_cadet.c} | 4 +- 25 files changed, 105 insertions(+), 268 deletions(-) rename src/cadet/{cadet_test_lib_new.c => cadet_test_lib.c} (100%) rename src/cadet/{cadet_test_lib_new.h => cadet_test_lib.h} (100%) rename src/cadet/{gnunet-service-cadet-new.c => gnunet-service-cadet.c} (99%) rename src/cadet/{gnunet-service-cadet-new.h => gnunet-service-cadet.h} (99%) rename src/cadet/{gnunet-service-cadet-new_channel.c => gnunet-service-cadet_channel.c} (99%) rename src/cadet/{gnunet-service-cadet-new_channel.h => gnunet-service-cadet_channel.h} (98%) rename src/cadet/{gnunet-service-cadet-new_connection.c => gnunet-service-cadet_connection.c} (98%) rename src/cadet/{gnunet-service-cadet-new_connection.h => gnunet-service-cadet_connection.h} (98%) rename src/cadet/{gnunet-service-cadet-new_core.c => gnunet-service-cadet_core.c} (99%) rename src/cadet/{gnunet-service-cadet-new_core.h => gnunet-service-cadet_core.h} (100%) rename src/cadet/{gnunet-service-cadet-new_dht.c => gnunet-service-cadet_dht.c} (97%) rename src/cadet/{gnunet-service-cadet-new_dht.h => gnunet-service-cadet_dht.h} (100%) rename src/cadet/{gnunet-service-cadet-new_hello.c => gnunet-service-cadet_hello.c} (94%) rename src/cadet/{gnunet-service-cadet-new_hello.h => gnunet-service-cadet_hello.h} (100%) rename src/cadet/{gnunet-service-cadet-new_paths.c => gnunet-service-cadet_paths.c} (99%) rename src/cadet/{gnunet-service-cadet-new_paths.h => gnunet-service-cadet_paths.h} (99%) rename src/cadet/{gnunet-service-cadet-new_peer.c => gnunet-service-cadet_peer.c} (99%) rename src/cadet/{gnunet-service-cadet-new_peer.h => gnunet-service-cadet_peer.h} (99%) rename src/cadet/{gnunet-service-cadet-new_tunnels.c => gnunet-service-cadet_tunnels.c} (99%) rename src/cadet/{gnunet-service-cadet-new_tunnels.h => gnunet-service-cadet_tunnels.h} (99%) rename src/cadet/{test_cadet_new.c => test_cadet.c} (99%) 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 AM_CLFAGS = -g libexec_PROGRAMS = \ - gnunet-service-cadet-new \ + gnunet-service-cadet \ $(EXP_LIBEXEC) bin_PROGRAMS = \ @@ -60,17 +60,17 @@ gnunet_cadet_LDADD = \ libgnunetcadetnew.la \ $(top_builddir)/src/util/libgnunetutil.la -gnunet_service_cadet_new_SOURCES = \ - gnunet-service-cadet-new.c gnunet-service-cadet-new.h \ - gnunet-service-cadet-new_channel.c gnunet-service-cadet-new_channel.h \ - gnunet-service-cadet-new_connection.c gnunet-service-cadet-new_connection.h \ - gnunet-service-cadet-new_core.c gnunet-service-cadet-new_core.h \ - gnunet-service-cadet-new_dht.c gnunet-service-cadet-new_dht.h \ - gnunet-service-cadet-new_hello.c gnunet-service-cadet-new_hello.h \ - gnunet-service-cadet-new_tunnels.c gnunet-service-cadet-new_tunnels.h \ - gnunet-service-cadet-new_paths.c gnunet-service-cadet-new_paths.h \ - gnunet-service-cadet-new_peer.c gnunet-service-cadet-new_peer.h -gnunet_service_cadet_new_LDADD = \ +gnunet_service_cadet_SOURCES = \ + gnunet-service-cadet.c gnunet-service-cadet.h \ + gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \ + gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \ + gnunet-service-cadet_core.c gnunet-service-cadet_core.h \ + gnunet-service-cadet_dht.c gnunet-service-cadet_dht.h \ + gnunet-service-cadet_hello.c gnunet-service-cadet_hello.h \ + gnunet-service-cadet_tunnels.c gnunet-service-cadet_tunnels.h \ + gnunet-service-cadet_paths.c gnunet-service-cadet_paths.h \ + gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h +gnunet_service_cadet_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/ats/libgnunetats.la \ $(top_builddir)/src/core/libgnunetcore.la \ @@ -87,7 +87,7 @@ endif if HAVE_TESTING noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) - noinst_PROGRAMS = gnunet-cadet-profiler +# noinst_PROGRAMS = gnunet-cadet-profiler endif if HAVE_TESTING @@ -112,23 +112,10 @@ check_PROGRAMS = \ test_cadet_5_speed_backwards endif -ld_cadet_test_lib = \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - libgnunetcadettest.la \ - libgnunetcadet.la \ - $(top_builddir)/src/testbed/libgnunettestbed.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la -dep_cadet_test_lib = \ - libgnunetcadet.la \ - libgnunetcadettest.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la - - -gnunet_cadet_profiler_SOURCES = \ - gnunet-cadet-profiler.c -gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) +#gnunet_cadet_profiler_SOURCES = \ +# gnunet-cadet-profiler.c +#gnunet_cadet_profiler_LDADD = $(ld_cadet_test_lib) test_cadet_local_mq_SOURCES = \ @@ -140,7 +127,7 @@ test_cadet_local_mq_LDADD = \ libgnunetcadettest_la_SOURCES = \ - cadet_test_lib_new.c cadet_test_lib_new.h + cadet_test_lib.c cadet_test_lib.h libgnunetcadettest_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ @@ -159,68 +146,67 @@ dep_cadet_test_lib = \ $(top_builddir)/src/statistics/libgnunetstatistics.la test_cadet_2_forward_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) test_cadet_2_signal_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) test_cadet_2_keepalive_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) test_cadet_2_speed_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) test_cadet_2_speed_ack_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) test_cadet_2_speed_backwards_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) test_cadet_2_speed_reliable_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) test_cadet_2_speed_reliable_backwards_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) - test_cadet_5_forward_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) test_cadet_5_signal_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) test_cadet_5_keepalive_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) test_cadet_5_speed_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) test_cadet_5_speed_ack_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) test_cadet_5_speed_backwards_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) test_cadet_5_speed_reliable_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) test_cadet_5_speed_reliable_backwards_SOURCES = \ - test_cadet_new.c + test_cadet.c test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) 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 AUTOSTART = @AUTOSTART@ @JAVAPORT@PORT = 2096 HOSTNAME = localhost -BINARY = gnunet-service-cadet-new +BINARY = gnunet-service-cadet # PREFIX = valgrind --leak-check=yes ACCEPT_FROM = 127.0.0.1; ACCEPT_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" #include "gnunet_core_service.h" #include "gnunet_cadet_service.h" #include "gnunet_protocols.h" -#include +#include "gnunet_cadet_service.h" /******************************************************************************/ /************************** 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 @@ /* This file is part of GNUnet. - Copyright (C) 2001 - 2011 GNUnet e.V. + Copyright (C) 2007 - 2017 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -19,8 +19,10 @@ */ /** - * @author Bartlomiej Polot * @file cadet/cadet_protocol.h + * @brief P2P messages used by CADET + * @author Bartlomiej Polot + * @author Christian Grothoff */ #ifndef CADET_PROTOCOL_H_ @@ -298,17 +300,10 @@ struct GNUNET_CADET_TunnelEncryptedMessage */ struct GNUNET_MessageHeader header; -#if NEW_CADET /** * Reserved, for alignment. */ uint32_t reserved GNUNET_PACKED; -#else - /** - * Maximum packet ID authorized. - */ - struct CadetEncryptedMessageIdentifier cemi; -#endif /** * ID of the connection. @@ -322,89 +317,18 @@ struct GNUNET_CADET_TunnelEncryptedMessage */ struct GNUNET_ShortHashCode hmac; - #if NEW_CADET /** * Axolotl-header that specifies which keys to use in which ratchet * to decrypt the body that follows. */ struct GNUNET_CADET_AxHeader ax_header; -#else - /** - * Number of messages sent with the current ratchet key. - */ - uint32_t Ns GNUNET_PACKED; - - /** - * Number of messages sent with the previous ratchet key. - */ - uint32_t PNs GNUNET_PACKED; - /** - * Current ratchet key. - */ - struct GNUNET_CRYPTO_EcdhePublicKey DHRs; -#endif /** * Encrypted content follows. */ }; -#ifndef NEW_CADET - -/** - * Message to query a peer about its Flow Control status regarding a tunnel. - * - * It is NOT yet clear if we need this. - */ -struct GNUNET_CADET_ConnectionHopByHopPollMessage -{ - /** - * Type: #GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL - */ - struct GNUNET_MessageHeader header; - - /** - * Last packet sent. - */ - struct CadetEncryptedMessageIdentifier cemi; - - /** - * ID of the connection. - */ - struct GNUNET_CADET_ConnectionTunnelIdentifier cid; - -}; - - -/** - * Message to acknowledge cadet encrypted traffic, used for - * flow-control on a hop-by-hop basis on the connection-level. Note - * that we do use the @e cemi from the tunnel layer as the connection - * layer's header is included/shared with the tunnel layer messages, - * and we only do flow control for the payload. - */ -struct GNUNET_CADET_ConnectionEncryptedAckMessage -{ - /** - * Type: #GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK - */ - struct GNUNET_MessageHeader header; - - /** - * Maximum packet ID authorized. - */ - struct CadetEncryptedMessageIdentifier cemi_max; - - /** - * ID of the connection. - */ - struct GNUNET_CADET_ConnectionTunnelIdentifier cid; -}; - -#endif - - /******************************************************************************/ /******************************* CHANNEL ***********************************/ /******************************************************************************/ @@ -450,82 +374,18 @@ struct GNUNET_CADET_ChannelManageMessage */ struct GNUNET_MessageHeader header; -#ifdef NEW_CADET /** * For alignment. */ uint32_t reserved GNUNET_PACKED; -#endif - - /** - * ID of the channel - */ - struct GNUNET_CADET_ChannelTunnelNumber ctn; -}; - - -#ifndef NEW_CADET - -/** - * Message for cadet data traffic. - */ -struct GNUNET_CADET_ChannelAppDataMessage -{ - /** - * Type: #GNUNET_MESSAGE_TYPE_CADET_UNICAST, - * #GNUNET_MESSAGE_TYPE_CADET_TO_ORIGIN - */ - struct GNUNET_MessageHeader header; - - /** - * Unique ID of the payload message - */ - /* NEW: struct ChannelMessageIdentifier */ - uint32_t mid GNUNET_PACKED; /** * ID of the channel */ struct GNUNET_CADET_ChannelTunnelNumber ctn; - - /** - * Payload follows - */ }; -/** - * Message to acknowledge end-to-end data. - */ -struct GNUNET_CADET_ChannelDataAckMessage -{ - /** - * Type: #GNUNET_MESSAGE_TYPE_CADET_CHANNEL_APP_DATA_ACK - */ - struct GNUNET_MessageHeader header; - - /** - * ID of the channel - */ - struct GNUNET_CADET_ChannelTunnelNumber ctn; - - /** - * Bitfield of already-received messages past @e mid. - * pid + 1 @ LSB - * pid + 64 @ MSB - */ - uint64_t futures GNUNET_PACKED; - - /** - * Last message ID received. - */ - /* NEW: struct ChannelMessageIdentifier */ - uint32_t mid GNUNET_PACKED; -}; - -#else - - /** * Number used to uniquely identify messages in a CADET Channel. */ @@ -595,8 +455,6 @@ struct GNUNET_CADET_ChannelDataAckMessage }; -#endif - GNUNET_NETWORK_STRUCT_END #if 0 /* keep Emacsens' auto-indent happy */ diff --git a/src/cadet/cadet_test_lib_new.c b/src/cadet/cadet_test_lib.c similarity index 100% rename from src/cadet/cadet_test_lib_new.c rename to src/cadet/cadet_test_lib.c diff --git a/src/cadet/cadet_test_lib_new.h b/src/cadet/cadet_test_lib.h similarity index 100% rename from src/cadet/cadet_test_lib_new.h rename to src/cadet/cadet_test_lib.h diff --git a/src/cadet/gnunet-service-cadet-new.c b/src/cadet/gnunet-service-cadet.c similarity index 99% rename from src/cadet/gnunet-service-cadet-new.c rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new.c + * @file cadet/gnunet-service-cadet.c * @brief GNUnet CADET service with encryption * @author Bartlomiej Polot * @author Christian Grothoff @@ -37,15 +37,15 @@ #include "gnunet_util_lib.h" #include "cadet.h" #include "gnunet_statistics_service.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_channel.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_core.h" -#include "gnunet-service-cadet-new_dht.h" -#include "gnunet-service-cadet-new_hello.h" -#include "gnunet-service-cadet-new_tunnels.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" +#include "gnunet-service-cadet.h" +#include "gnunet-service-cadet_channel.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_core.h" +#include "gnunet-service-cadet_dht.h" +#include "gnunet-service-cadet_hello.h" +#include "gnunet-service-cadet_tunnels.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_paths.h" #define LOG(level, ...) GNUNET_log (level,__VA_ARGS__) diff --git a/src/cadet/gnunet-service-cadet-new.h b/src/cadet/gnunet-service-cadet.h similarity index 99% rename from src/cadet/gnunet-service-cadet-new.h rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new.h + * @file cadet/gnunet-service-cadet.h * @brief Information we track per peer. * @author Bartlomiej Polot * @author Christian Grothoff diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet_channel.c similarity index 99% rename from src/cadet/gnunet-service-cadet-new_channel.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/gnunet-service-cadet-new_channel.c + * @file cadet/gnunet-service-cadet_channel.c * @brief logical links between CADET clients * @author Bartlomiej Polot * @author Christian Grothoff @@ -34,15 +34,12 @@ * reserve more bits in 'options' to allow for buffer size control? */ #include "platform.h" -#include "gnunet_util_lib.h" #include "cadet.h" #include "gnunet_statistics_service.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_channel.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_tunnels.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" +#include "gnunet-service-cadet_channel.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_tunnels.h" +#include "gnunet-service-cadet_paths.h" #define LOG(level,...) GNUNET_log_from (level,"cadet-chn",__VA_ARGS__) diff --git a/src/cadet/gnunet-service-cadet-new_channel.h b/src/cadet/gnunet-service-cadet_channel.h similarity index 98% rename from src/cadet/gnunet-service-cadet-new_channel.h rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new_channel.h + * @file cadet/gnunet-service-cadet_channel.h * @brief GNUnet CADET service with encryption * @author Bartlomiej Polot * @author Christian Grothoff @@ -28,8 +28,8 @@ #ifndef GNUNET_SERVICE_CADET_CHANNEL_H #define GNUNET_SERVICE_CADET_CHANNEL_H -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_peer.h" +#include "gnunet-service-cadet.h" +#include "gnunet-service-cadet_peer.h" #include "cadet_protocol.h" diff --git a/src/cadet/gnunet-service-cadet-new_connection.c b/src/cadet/gnunet-service-cadet_connection.c similarity index 98% rename from src/cadet/gnunet-service-cadet-new_connection.c rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new_connection.c + * @file cadet/gnunet-service-cadet_connection.c * @brief management of CORE-level end-to-end connections; establishes * end-to-end routes and transmits messages along the route * @author Bartlomiej Polot * @author Christian Grothoff */ #include "platform.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_channel.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_paths.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_tunnels.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_channel.h" +#include "gnunet-service-cadet_paths.h" +#include "gnunet-service-cadet_tunnels.h" #include "gnunet_cadet_service.h" #include "gnunet_statistics_service.h" #include "cadet_protocol.h" diff --git a/src/cadet/gnunet-service-cadet-new_connection.h b/src/cadet/gnunet-service-cadet_connection.h similarity index 98% rename from src/cadet/gnunet-service-cadet-new_connection.h rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new_connection.h + * @file cadet/gnunet-service-cadet_connection.h * @brief A connection is a live end-to-end messaging mechanism * where the peers are identified by a path and know how * to forward along the route using a connection identifier @@ -32,8 +32,8 @@ #define GNUNET_SERVICE_CADET_CONNECTION_H #include "gnunet_util_lib.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_peer.h" +#include "gnunet-service-cadet.h" +#include "gnunet-service-cadet_peer.h" #include "cadet_protocol.h" diff --git a/src/cadet/gnunet-service-cadet-new_core.c b/src/cadet/gnunet-service-cadet_core.c similarity index 99% rename from src/cadet/gnunet-service-cadet-new_core.c rename to 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 @@ * - Optimization: given BROKEN messages, destroy paths (?) */ #include "platform.h" -#include "gnunet-service-cadet-new_core.h" -#include "gnunet-service-cadet-new_paths.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_tunnels.h" +#include "gnunet-service-cadet_core.h" +#include "gnunet-service-cadet_paths.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_tunnels.h" #include "gnunet_core_service.h" #include "gnunet_statistics_service.h" #include "cadet_protocol.h" diff --git a/src/cadet/gnunet-service-cadet-new_core.h b/src/cadet/gnunet-service-cadet_core.h similarity index 100% rename from src/cadet/gnunet-service-cadet-new_core.h rename to 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 similarity index 97% rename from src/cadet/gnunet-service-cadet-new_dht.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/gnunet-service-cadet-new_dht.c + * @file cadet/gnunet-service-cadet_dht.c * @brief Information we track per peer. * @author Bartlomiej Polot * @author Christian Grothoff @@ -28,11 +28,11 @@ #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" #include "gnunet_statistics_service.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_dht.h" -#include "gnunet-service-cadet-new_hello.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" +#include "gnunet-service-cadet.h" +#include "gnunet-service-cadet_dht.h" +#include "gnunet-service-cadet_hello.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_paths.h" /** * 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 similarity index 100% rename from src/cadet/gnunet-service-cadet-new_dht.h rename to 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 similarity index 94% rename from src/cadet/gnunet-service-cadet-new_hello.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/gnunet-service-cadet-new_hello.c + * @file cadet/gnunet-service-cadet_hello.c * @brief spread knowledge about how to contact other peers from PEERINFO * @author Bartlomiej Polot * @author Christian Grothoff @@ -33,10 +33,10 @@ #include "gnunet_statistics_service.h" #include "gnunet_peerinfo_service.h" #include "cadet_protocol.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_dht.h" -#include "gnunet-service-cadet-new_hello.h" -#include "gnunet-service-cadet-new_peer.h" +#include "gnunet-service-cadet.h" +#include "gnunet-service-cadet_dht.h" +#include "gnunet-service-cadet_hello.h" +#include "gnunet-service-cadet_peer.h" #define LOG(level, ...) GNUNET_log_from(level,"cadet-hll",__VA_ARGS__) diff --git a/src/cadet/gnunet-service-cadet-new_hello.h b/src/cadet/gnunet-service-cadet_hello.h similarity index 100% rename from src/cadet/gnunet-service-cadet-new_hello.h rename to 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 similarity index 99% rename from src/cadet/gnunet-service-cadet-new_paths.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/gnunet-service-cadet-new_paths.c + * @file cadet/gnunet-service-cadet_paths.c * @brief Information we track per path. * @author Bartlomiej Polot * @author Christian Grothoff */ #include "platform.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_tunnels.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_tunnels.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_paths.h" #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 similarity index 99% rename from src/cadet/gnunet-service-cadet-new_paths.h rename to 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 @@ #define GNUNET_SERVICE_CADET_PATHS_H #include "gnunet_util_lib.h" -#include "gnunet-service-cadet-new.h" +#include "gnunet-service-cadet.h" /** * 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 similarity index 99% rename from src/cadet/gnunet-service-cadet-new_peer.c rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new_peer.c + * @file cadet/gnunet-service-cadet_peer.c * @brief Information we track per peer. * @author Bartlomiej Polot * @author Christian Grothoff @@ -39,12 +39,11 @@ #include "gnunet_core_service.h" #include "gnunet_statistics_service.h" #include "cadet_protocol.h" -#include "gnunet-service-cadet-new.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_dht.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" -#include "gnunet-service-cadet-new_tunnels.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_dht.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_paths.h" +#include "gnunet-service-cadet_tunnels.h" #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 similarity index 99% rename from src/cadet/gnunet-service-cadet-new_peer.h rename to 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 @@ #ifndef GNUNET_SERVICE_CADET_PEER_H #define GNUNET_SERVICE_CADET_PEER_H -#include "gnunet-service-cadet-new.h" +#include "gnunet-service-cadet.h" #include "gnunet_hello_lib.h" diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c similarity index 99% rename from src/cadet/gnunet-service-cadet-new_tunnels.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/gnunet-service-cadet-new_tunnels.c + * @file cadet/gnunet-service-cadet_tunnels.c * @brief Information we track per tunnel. * @author Bartlomiej Polot * @author Christian Grothoff @@ -34,13 +34,12 @@ #include "gnunet_util_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_signatures.h" -#include "gnunet-service-cadet-new.h" #include "cadet_protocol.h" -#include "gnunet-service-cadet-new_channel.h" -#include "gnunet-service-cadet-new_connection.h" -#include "gnunet-service-cadet-new_tunnels.h" -#include "gnunet-service-cadet-new_peer.h" -#include "gnunet-service-cadet-new_paths.h" +#include "gnunet-service-cadet_channel.h" +#include "gnunet-service-cadet_connection.h" +#include "gnunet-service-cadet_tunnels.h" +#include "gnunet-service-cadet_peer.h" +#include "gnunet-service-cadet_paths.h" #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 similarity index 99% rename from src/cadet/gnunet-service-cadet-new_tunnels.h rename to 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 @@ */ /** - * @file cadet/gnunet-service-cadet-new_tunnels.h + * @file cadet/gnunet-service-cadet_tunnels.h * @brief Information we track per tunnel. * @author Bartlomiej Polot * @author Christian Grothoff @@ -28,7 +28,7 @@ #ifndef GNUNET_SERVICE_CADET_TUNNELS_H #define GNUNET_SERVICE_CADET_TUNNELS_H -#include "gnunet-service-cadet-new.h" +#include "gnunet-service-cadet.h" #include "cadet_protocol.h" diff --git a/src/cadet/test_cadet_new.c b/src/cadet/test_cadet.c similarity index 99% rename from src/cadet/test_cadet_new.c rename to 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 @@ Boston, MA 02110-1301, USA. */ /** - * @file cadet/test_cadet_mq.c + * @file cadet/test_cadet.c * @author Bart Polot * @author Christian Grothoff * @brief Test for the cadet service using mq API. */ #include #include "platform.h" -#include "cadet_test_lib_new.h" +#include "cadet_test_lib.h" #include "gnunet_cadet_service.h" #include "gnunet_statistics_service.h" #include -- 2.25.1