From bdc3b54372a92874c2ecb58069eac5bdfe6fcddc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 5 Nov 2010 21:54:44 +0000 Subject: [PATCH] moving plugin headers --- src/block/Makefile.am | 2 +- src/block/block.c | 2 +- src/block/plugin_block_dht.c | 2 +- src/block/plugin_block_dns.c | 2 +- src/block/plugin_block_fs.c | 2 +- src/block/plugin_block_template.c | 2 +- src/block/plugin_block_test.c | 2 +- src/datacache/datacache.c | 2 +- src/datacache/plugin_datacache_mysql.c | 2 +- src/datacache/plugin_datacache_postgres.c | 2 +- src/datacache/plugin_datacache_sqlite.c | 2 +- src/datacache/plugin_datacache_template.c | 2 +- src/datastore/gnunet-service-datastore.c | 2 +- src/datastore/perf_plugin_datastore.c | 2 +- src/datastore/plugin_datastore_mysql.c | 2 +- src/datastore/plugin_datastore_postgres.c | 2 +- src/datastore/plugin_datastore_sqlite.c | 2 +- src/datastore/plugin_datastore_template.c | 2 +- src/dv/dv_api.c | 2 +- src/dv/plugin_transport_dv.c | 2 +- src/include/Makefile.am | 4 ++++ .../gnunet_block_plugin.h} | 2 +- .../gnunet_datacache_plugin.h} | 4 ++-- .../gnunet_datastore_plugin.h} | 3 +-- src/include/gnunet_dv_service.h | 2 +- .../gnunet_transport_plugin.h} | 2 +- src/transport/Makefile.am | 21 +++++++++--------- src/transport/gnunet-service-transport.c | 2 +- src/transport/plugin_transport_http.c | 14 ++++++------ src/transport/plugin_transport_tcp.c | 2 +- src/transport/plugin_transport_template.c | 2 +- src/transport/plugin_transport_udp.c | 2 +- src/transport/plugin_transport_wlan.c | 2 +- src/transport/test_plugin_transport.c | 2 +- src/transport/test_plugin_transport_http.c | 22 +++++++++---------- src/transport/test_plugin_transport_https.c | 22 +++++++++---------- src/transport/test_plugin_transport_udp.c | 2 +- 37 files changed, 76 insertions(+), 74 deletions(-) rename src/{block/plugin_block.h => include/gnunet_block_plugin.h} (98%) rename src/{datacache/plugin_datacache.h => include/gnunet_datacache_plugin.h} (97%) rename src/{datastore/plugin_datastore.h => include/gnunet_datastore_plugin.h} (99%) rename src/{transport/plugin_transport.h => include/gnunet_transport_plugin.h} (99%) diff --git a/src/block/Makefile.am b/src/block/Makefile.am index 11dea77d7..1d24b1bfa 100644 --- a/src/block/Makefile.am +++ b/src/block/Makefile.am @@ -60,7 +60,7 @@ libgnunet_plugin_block_test_la_LDFLAGS = \ libgnunetblock_la_SOURCES = \ - block.c plugin_block.h + block.c libgnunetblock_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la diff --git a/src/block/block.c b/src/block/block.c index 29382dad1..276f8ee77 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -27,7 +27,7 @@ #include "gnunet_util_lib.h" #include "gnunet_signatures.h" #include "gnunet_block_lib.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" /** diff --git a/src/block/plugin_block_dht.c b/src/block/plugin_block_dht.c index c636f00c2..0e499b821 100644 --- a/src/block/plugin_block_dht.c +++ b/src/block/plugin_block_dht.c @@ -28,7 +28,7 @@ #include "platform.h" #include "gnunet_hello_lib.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" #define DEBUG_DHT GNUNET_NO diff --git a/src/block/plugin_block_dns.c b/src/block/plugin_block_dns.c index 338e07dc2..4321baf34 100644 --- a/src/block/plugin_block_dns.c +++ b/src/block/plugin_block_dns.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" #include "block_dns.h" #include "gnunet_signatures.h" diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c index 248878765..caf009ddf 100644 --- a/src/block/plugin_block_fs.c +++ b/src/block/plugin_block_fs.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" #include "block_fs.h" #include "gnunet_signatures.h" diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c index 23a25ae02..77e7c0ab9 100644 --- a/src/block/plugin_block_template.c +++ b/src/block/plugin_block_template.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" #define DEBUG_TEMPLATE GNUNET_NO diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c index eb3e200b0..639a5c46e 100644 --- a/src/block/plugin_block_test.c +++ b/src/block/plugin_block_test.c @@ -26,7 +26,7 @@ */ #include "platform.h" -#include "plugin_block.h" +#include "gnunet_block_plugin.h" #define DEBUG_TEST GNUNET_NO diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 9bb0f14b9..10b2721ee 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -27,7 +27,7 @@ #include "gnunet_util_lib.h" #include "gnunet_datacache_lib.h" #include "gnunet_statistics_service.h" -#include "plugin_datacache.h" +#include "gnunet_datacache_plugin.h" /** * Internal state of the datacache library. diff --git a/src/datacache/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c index 7936e0a1b..4a78a96ac 100644 --- a/src/datacache/plugin_datacache_mysql.c +++ b/src/datacache/plugin_datacache_mysql.c @@ -79,7 +79,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "plugin_datacache.h" +#include "gnunet_datacache_plugin.h" #include #define DEBUG_DATACACHE_MYSQL GNUNET_NO diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 75d644da9..182341b98 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "plugin_datacache.h" +#include "gnunet_datacache_plugin.h" #include #define DEBUG_POSTGRES GNUNET_NO diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 7674402c7..b5d0ea715 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "plugin_datacache.h" +#include "gnunet_datacache_plugin.h" #include #define DEBUG_DATACACHE_SQLITE GNUNET_NO diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index 25e4c9a42..60862dac2 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "plugin_datacache.h" +#include "gnunet_datacache_plugin.h" /** diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 09df51d9b..aedf94f38 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -28,7 +28,7 @@ #include "gnunet_util_lib.h" #include "gnunet_protocols.h" #include "gnunet_statistics_service.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" #include "datastore.h" /** diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index b60bb07c6..c55fb6258 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -26,7 +26,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_protocols.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" #define VERBOSE GNUNET_NO diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c index ae6a98c6e..ac81c9011 100644 --- a/src/datastore/plugin_datastore_mysql.c +++ b/src/datastore/plugin_datastore_mysql.c @@ -122,7 +122,7 @@ */ #include "platform.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" #include "gnunet_util_lib.h" #include diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 9886b1c8b..54cfac3b3 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" #include #define DEBUG_POSTGRES GNUNET_NO diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index b9edb4e57..8169d1e26 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" #include #define DEBUG_SQLITE GNUNET_YES diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c index f736dcf20..09dfe85d9 100644 --- a/src/datastore/plugin_datastore_template.c +++ b/src/datastore/plugin_datastore_template.c @@ -25,7 +25,7 @@ */ #include "platform.h" -#include "plugin_datastore.h" +#include "gnunet_datastore_plugin.h" /** diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index 28c66af41..f1b73eb35 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -36,7 +36,7 @@ #include "gnunet_time_lib.h" #include "gnunet_dv_service.h" #include "dv.h" -#include "../transport/plugin_transport.h" +#include "../transport/gnunet_transport_plugin.h" /** * Store ready to send messages diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index b7616d2ac..68c584822 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -34,7 +34,7 @@ #include "gnunet_statistics_service.h" #include "gnunet_dv_service.h" #include "gnunet_transport_service.h" -#include "../transport/plugin_transport.h" +#include "../transport/gnunet_transport_plugin.h" #include "dv.h" #define DEBUG_TEMPLATE GNUNET_NO diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 70fd97bd0..a01c9268c 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -19,6 +19,7 @@ gnunetinclude_HEADERS = \ gnunet_bandwidth_lib.h \ gnunet_bio_lib.h \ gnunet_block_lib.h \ + gnunet_block_plugin.h \ gnunet_client_lib.h \ gnunet_common.h \ gnunet_constants.h \ @@ -28,7 +29,9 @@ gnunetinclude_HEADERS = \ gnunet_core_service.h \ gnunet_crypto_lib.h \ gnunet_datacache_lib.h \ + gnunet_datacache_plugin.h \ gnunet_datastore_service.h \ + gnunet_datastore_plugin.h \ gnunet_dht_service.h \ gnunet_disk_lib.h \ gnunet_dv_service.h \ @@ -57,5 +60,6 @@ gnunetinclude_HEADERS = \ gnunet_testing_lib.h \ gnunet_time_lib.h \ gnunet_transport_service.h \ + gnunet_transport_plugin.h \ gnunet_upnp_service.h \ gnunet_util_lib.h diff --git a/src/block/plugin_block.h b/src/include/gnunet_block_plugin.h similarity index 98% rename from src/block/plugin_block.h rename to src/include/gnunet_block_plugin.h index e0a323d25..2a3e9e2ed 100644 --- a/src/block/plugin_block.h +++ b/src/include/gnunet_block_plugin.h @@ -19,7 +19,7 @@ */ /** - * @file block/plugin_block.h + * @file block/gnunet_block_plugin.h * @brief API for block plugins. Each block plugin must conform to * the API specified by this header. * @author Christian Grothoff diff --git a/src/datacache/plugin_datacache.h b/src/include/gnunet_datacache_plugin.h similarity index 97% rename from src/datacache/plugin_datacache.h rename to src/include/gnunet_datacache_plugin.h index 850d3961e..6aa9b1d06 100644 --- a/src/datacache/plugin_datacache.h +++ b/src/include/gnunet_datacache_plugin.h @@ -19,7 +19,7 @@ */ /** - * @file datacache/plugin_datacache.h + * @file datacache/gnunet_datacache_plugin.h * @brief API for database backends for the datacache * @author Christian Grothoff */ @@ -154,5 +154,5 @@ struct GNUNET_DATACACHE_PluginFunctions { } #endif -/* end of plugin_datacache.h */ +/* end of gnunet_datacache_plugin.h */ #endif diff --git a/src/datastore/plugin_datastore.h b/src/include/gnunet_datastore_plugin.h similarity index 99% rename from src/datastore/plugin_datastore.h rename to src/include/gnunet_datastore_plugin.h index cb8686c62..832d53a68 100644 --- a/src/datastore/plugin_datastore.h +++ b/src/include/gnunet_datastore_plugin.h @@ -19,7 +19,7 @@ */ /** - * @file datastore/plugin_datastore.h + * @file datastore/gnunet_datastore_plugin.h * @brief API for the database backend plugins. * @author Christian Grothoff */ @@ -64,7 +64,6 @@ struct GNUNET_DATASTORE_PluginEnvironment */ const struct GNUNET_CONFIGURATION_Handle *cfg; - /** * Function to call on disk utilization change. */ diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h index 2bc77fefc..6915fb065 100644 --- a/src/include/gnunet_dv_service.h +++ b/src/include/gnunet_dv_service.h @@ -40,7 +40,7 @@ extern "C" #include "gnunet_common.h" #include "gnunet_configuration_lib.h" #include "gnunet_scheduler_lib.h" -#include "../transport/plugin_transport.h" +#include "../transport/gnunet_transport_plugin.h" /** * Version of the dv API. diff --git a/src/transport/plugin_transport.h b/src/include/gnunet_transport_plugin.h similarity index 99% rename from src/transport/plugin_transport.h rename to src/include/gnunet_transport_plugin.h index 5f6d6fcfb..38c79f07f 100644 --- a/src/transport/plugin_transport.h +++ b/src/include/gnunet_transport_plugin.h @@ -19,7 +19,7 @@ */ /** - * @file transport/plugin_transport.h + * @file transport/gnunet_transport_plugin.h * @brief API for the transport services. This header * specifies the struct that is given to the plugin's entry * method and the other struct that must be returned. diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index d9b53bc40..dc1eebfbb 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -19,14 +19,13 @@ if HAVE_MHD HTTP_API_TEST = test_transport_api_http HTTP_REL_TEST = test_transport_api_reliability_http HTTP_QUOTA_TEST = test_quota_compliance_http \ - test_quota_compliance_http_asymmetric_recv_constant - + test_quota_compliance_http_asymmetric_recv_constant HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la HTTPS_PLUGIN_TEST = test_plugin_transport_https HTTPS_API_TEST = test_transport_api_https HTTPS_REL_TEST = test_transport_api_reliability_https HTTPS_QUOTA_TEST = test_quota_compliance_https \ - test_quota_compliance_https_asymmetric_recv_constant + test_quota_compliance_https_asymmetric_recv_constant endif if USE_COVERAGE @@ -175,7 +174,7 @@ libgnunet_plugin_transport_http_la_LIBADD = \ libgnunet_plugin_transport_http_la_LDFLAGS = \ $(GN_LIBMHD) \ $(GN_PLUGIN_LDFLAGS) - + libgnunet_plugin_transport_https_la_SOURCES = \ plugin_transport_http.c libgnunet_plugin_transport_https_la_LIBADD = \ @@ -298,7 +297,7 @@ test_transport_api_reliability_http_SOURCES = \ test_transport_api_reliability_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_plugin_transport_https_SOURCES = \ test_plugin_transport_https.c test_plugin_transport_https_LDADD = \ @@ -330,7 +329,7 @@ test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \ test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + #test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \ # test_quota_compliance.c #test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \ @@ -342,13 +341,13 @@ test_quota_compliance_http_SOURCES = \ test_quota_compliance_http_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_http_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + #test_quota_compliance_http_asymmetric_send_constant_SOURCES = \ # test_quota_compliance.c #test_quota_compliance_http_asymmetric_send_constant_LDADD = \ @@ -366,7 +365,7 @@ test_quota_compliance_https_LDADD = \ test_quota_compliance_https_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + #test_quota_compliance_https_asymmetric_send_constant_SOURCES = \ # test_quota_compliance.c #test_quota_compliance_https_asymmetric_send_constant_LDADD = \ @@ -378,13 +377,13 @@ test_quota_compliance_udp_SOURCES = \ test_quota_compliance_udp_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \ test_quota_compliance.c test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la - + #test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \ # test_quota_compliance.c #test_quota_compliance_udp_asymmetric_send_constant_LDADD = \ diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 0ade42512..bd060a561 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -36,7 +36,7 @@ #include "gnunet_protocols.h" #include "gnunet_service_lib.h" #include "gnunet_signatures.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "transport.h" #define DEBUG_BLACKLIST GNUNET_YES diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index ad8ced567..f70397dc5 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c @@ -19,7 +19,7 @@ */ /** - * @file transport/plugin_transport_http.c + * @file transport/gnunet_transport_plugin.http.c * @brief http transport service plugin * @author Matthias Wachs */ @@ -35,19 +35,19 @@ #include "gnunet_resolver_service.h" #include "gnunet_server_lib.h" #include "gnunet_container_lib.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "gnunet_os_lib.h" #include "microhttpd.h" #include #if BUILD_HTTPS -#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init -#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done +#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_gnunet_transport_plugin.https_init +#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_gnunet_transport_plugin.https_done #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https #define PROTOCOL_PREFIX "https" #else -#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init -#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done +#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_gnunet_transport_plugin.http_init +#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_gnunet_transport_plugin.http_done #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http #define PROTOCOL_PREFIX "http" #endif @@ -3099,4 +3099,4 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) return api; } -/* end of plugin_transport_http.c */ +/* end of gnunet_transport_plugin.http.c */ diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index b4d332d48..ba07fcb48 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -34,7 +34,7 @@ #include "gnunet_signatures.h" #include "gnunet_statistics_service.h" #include "gnunet_transport_service.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "transport.h" #define DEBUG_TCP GNUNET_NO diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c index 6a9b8612b..fb0421ee3 100644 --- a/src/transport/plugin_transport_template.c +++ b/src/transport/plugin_transport_template.c @@ -31,7 +31,7 @@ #include "gnunet_service_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_transport_service.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #define DEBUG_TEMPLATE GNUNET_NO diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 5c3682e2a..3b669d80c 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -50,7 +50,7 @@ #include "gnunet_signatures.h" #include "gnunet_statistics_service.h" #include "gnunet_transport_service.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "transport.h" #define DEBUG_UDP GNUNET_YES diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 41f2958a2..5ebe0a76d 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -30,7 +30,7 @@ #include "gnunet_util_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_transport_service.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "plugin_transport_wlan.h" #include "gnunet_common.h" #include "gnunet_crypto_lib.h" diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 11e00b80e..ca69b7601 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -34,7 +34,7 @@ #include "gnunet_protocols.h" #include "gnunet_program_lib.h" #include "gnunet_signatures.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "transport.h" #define VERBOSE GNUNET_NO diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c index b1a0077cd..a4446576b 100644 --- a/src/transport/test_plugin_transport_http.c +++ b/src/transport/test_plugin_transport_http.c @@ -18,8 +18,8 @@ Boston, MA 02111-1307, USA. */ /** - * @file transport/test_plugin_transport_http.c - * @brief testcase for plugin_transport_http.c + * @file transport/test_gnunet_transport_plugin.http.c + * @brief testcase for gnunet_transport_plugin.http.c * @author Matthias Wachs */ @@ -37,7 +37,7 @@ #include "gnunet_service_lib.h" #include "gnunet_crypto_lib.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "gnunet_statistics_service.h" #include "transport.h" #include @@ -459,10 +459,10 @@ shutdown_clean () GNUNET_free(test_addr); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n"); - GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http", api)); + GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin.http", api)); GNUNET_SCHEDULER_shutdown(); - GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); + GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n"); exit(fail); @@ -1200,7 +1200,7 @@ run (void *cls, /* load plugins... */ setup_plugin_environment (); - GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http"); + GNUNET_asprintf (&libname, "libgnunet_gnunet_transport_plugin.http"); GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),libname); api = GNUNET_PLUGIN_load (libname, &env); GNUNET_free (libname); @@ -1311,7 +1311,7 @@ main (int argc, char *const *argv) }; int ret; char *const argv_prog[] = { - "test_plugin_transport_http", + "test_gnunet_transport_plugin.http", "-c", "test_plugin_transport_data_http.conf", "-L", @@ -1322,7 +1322,7 @@ main (int argc, char *const *argv) #endif NULL }; - GNUNET_log_setup ("test_plugin_transport_http", + GNUNET_log_setup ("test_gnunet_transport_plugin.http", #if VERBOSE "DEBUG", #else @@ -1333,12 +1333,12 @@ main (int argc, char *const *argv) ret = (GNUNET_OK == GNUNET_PROGRAM_run (5, argv_prog, - "test_plugin_transport_http", + "test_gnunet_transport_plugin.http", "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; - GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); + GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); return fail; } -/* end of test_plugin_transport_http.c */ +/* end of test_gnunet_transport_plugin.http.c */ diff --git a/src/transport/test_plugin_transport_https.c b/src/transport/test_plugin_transport_https.c index 0abc307b4..d13c2346a 100644 --- a/src/transport/test_plugin_transport_https.c +++ b/src/transport/test_plugin_transport_https.c @@ -18,8 +18,8 @@ Boston, MA 02111-1307, USA. */ /** - * @file transport/test_plugin_transport_https.c - * @brief testcase for plugin_transport_https.c + * @file transport/test_gnunet_transport_plugin.https.c + * @brief testcase for gnunet_transport_plugin.https.c * @author Matthias Wachs */ @@ -37,7 +37,7 @@ #include "gnunet_service_lib.h" #include "gnunet_crypto_lib.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "gnunet_statistics_service.h" #include "transport.h" #include @@ -462,10 +462,10 @@ shutdown_clean () GNUNET_free(test_addr); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading https plugin\n"); - GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_https", api)); + GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin.https", api)); GNUNET_SCHEDULER_shutdown(); - GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); + GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); struct stat sbuf; if (0 == stat (cert_file, &sbuf )) @@ -1266,7 +1266,7 @@ run (void *cls, /* load plugins... */ setup_plugin_environment (); - GNUNET_asprintf (&libname, "libgnunet_plugin_transport_https"); + GNUNET_asprintf (&libname, "libgnunet_gnunet_transport_plugin.https"); GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTPS transport plugin `%s'\n"),libname); api = GNUNET_PLUGIN_load (libname, &env); GNUNET_free (libname); @@ -1376,7 +1376,7 @@ main (int argc, char *const *argv) }; int ret; char *const argv_prog[] = { - "test_plugin_transport_https", + "test_gnunet_transport_plugin.https", "-c", "test_plugin_transport_data_http.conf", "-L", @@ -1387,7 +1387,7 @@ main (int argc, char *const *argv) #endif NULL }; - GNUNET_log_setup ("test_plugin_transport_https", + GNUNET_log_setup ("test_gnunet_transport_plugin.https", #if VERBOSE "DEBUG", #else @@ -1398,12 +1398,12 @@ main (int argc, char *const *argv) ret = (GNUNET_OK == GNUNET_PROGRAM_run (5, argv_prog, - "test_plugin_transport_https", + "test_gnunet_transport_plugin.https", "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; - GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_https"); + GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.https"); return fail; } -/* end of test_plugin_transport_http.c */ +/* end of test_gnunet_transport_plugin.http.c */ diff --git a/src/transport/test_plugin_transport_udp.c b/src/transport/test_plugin_transport_udp.c index f297a05c1..f790ccedc 100644 --- a/src/transport/test_plugin_transport_udp.c +++ b/src/transport/test_plugin_transport_udp.c @@ -35,7 +35,7 @@ #include "gnunet_protocols.h" #include "gnunet_program_lib.h" #include "gnunet_signatures.h" -#include "plugin_transport.h" +#include "gnunet_transport_plugin.h" #include "transport.h" #define VERBOSE GNUNET_NO -- 2.25.1