diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-05 21:54:44 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-05 21:54:44 +0000 |
commit | bdc3b54372a92874c2ecb58069eac5bdfe6fcddc (patch) | |
tree | 575c606a8f81c1f0baabad43bf34789023513ee7 /src | |
parent | f0963cfb7a694f9a7c7ff28471660242529f00a8 (diff) | |
download | gnunet-bdc3b54372a92874c2ecb58069eac5bdfe6fcddc.tar.gz gnunet-bdc3b54372a92874c2ecb58069eac5bdfe6fcddc.zip |
moving plugin headers
Diffstat (limited to 'src')
37 files changed, 76 insertions, 74 deletions
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 = \ | |||
60 | 60 | ||
61 | 61 | ||
62 | libgnunetblock_la_SOURCES = \ | 62 | libgnunetblock_la_SOURCES = \ |
63 | block.c plugin_block.h | 63 | block.c |
64 | libgnunetblock_la_LIBADD = \ | 64 | libgnunetblock_la_LIBADD = \ |
65 | $(top_builddir)/src/util/libgnunetutil.la | 65 | $(top_builddir)/src/util/libgnunetutil.la |
66 | 66 | ||
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 @@ | |||
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_signatures.h" | 28 | #include "gnunet_signatures.h" |
29 | #include "gnunet_block_lib.h" | 29 | #include "gnunet_block_lib.h" |
30 | #include "plugin_block.h" | 30 | #include "gnunet_block_plugin.h" |
31 | 31 | ||
32 | 32 | ||
33 | /** | 33 | /** |
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 @@ | |||
28 | 28 | ||
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_hello_lib.h" | 30 | #include "gnunet_hello_lib.h" |
31 | #include "plugin_block.h" | 31 | #include "gnunet_block_plugin.h" |
32 | 32 | ||
33 | #define DEBUG_DHT GNUNET_NO | 33 | #define DEBUG_DHT GNUNET_NO |
34 | 34 | ||
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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_block.h" | 28 | #include "gnunet_block_plugin.h" |
29 | #include "block_dns.h" | 29 | #include "block_dns.h" |
30 | #include "gnunet_signatures.h" | 30 | #include "gnunet_signatures.h" |
31 | 31 | ||
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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_block.h" | 28 | #include "gnunet_block_plugin.h" |
29 | #include "block_fs.h" | 29 | #include "block_fs.h" |
30 | #include "gnunet_signatures.h" | 30 | #include "gnunet_signatures.h" |
31 | 31 | ||
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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_block.h" | 28 | #include "gnunet_block_plugin.h" |
29 | 29 | ||
30 | #define DEBUG_TEMPLATE GNUNET_NO | 30 | #define DEBUG_TEMPLATE GNUNET_NO |
31 | 31 | ||
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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "platform.h" | 28 | #include "platform.h" |
29 | #include "plugin_block.h" | 29 | #include "gnunet_block_plugin.h" |
30 | 30 | ||
31 | #define DEBUG_TEST GNUNET_NO | 31 | #define DEBUG_TEST GNUNET_NO |
32 | 32 | ||
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 @@ | |||
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_datacache_lib.h" | 28 | #include "gnunet_datacache_lib.h" |
29 | #include "gnunet_statistics_service.h" | 29 | #include "gnunet_statistics_service.h" |
30 | #include "plugin_datacache.h" | 30 | #include "gnunet_datacache_plugin.h" |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Internal state of the datacache library. | 33 | * 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 @@ | |||
79 | */ | 79 | */ |
80 | #include "platform.h" | 80 | #include "platform.h" |
81 | #include "gnunet_util_lib.h" | 81 | #include "gnunet_util_lib.h" |
82 | #include "plugin_datacache.h" | 82 | #include "gnunet_datacache_plugin.h" |
83 | #include <mysql/mysql.h> | 83 | #include <mysql/mysql.h> |
84 | 84 | ||
85 | #define DEBUG_DATACACHE_MYSQL GNUNET_NO | 85 | #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 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "plugin_datacache.h" | 28 | #include "gnunet_datacache_plugin.h" |
29 | #include <postgresql/libpq-fe.h> | 29 | #include <postgresql/libpq-fe.h> |
30 | 30 | ||
31 | #define DEBUG_POSTGRES GNUNET_NO | 31 | #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 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "plugin_datacache.h" | 28 | #include "gnunet_datacache_plugin.h" |
29 | #include <sqlite3.h> | 29 | #include <sqlite3.h> |
30 | 30 | ||
31 | #define DEBUG_DATACACHE_SQLITE GNUNET_NO | 31 | #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 @@ | |||
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "plugin_datacache.h" | 28 | #include "gnunet_datacache_plugin.h" |
29 | 29 | ||
30 | 30 | ||
31 | /** | 31 | /** |
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 @@ | |||
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_protocols.h" | 29 | #include "gnunet_protocols.h" |
30 | #include "gnunet_statistics_service.h" | 30 | #include "gnunet_statistics_service.h" |
31 | #include "plugin_datastore.h" | 31 | #include "gnunet_datastore_plugin.h" |
32 | #include "datastore.h" | 32 | #include "datastore.h" |
33 | 33 | ||
34 | /** | 34 | /** |
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 @@ | |||
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | #include "gnunet_protocols.h" | 28 | #include "gnunet_protocols.h" |
29 | #include "plugin_datastore.h" | 29 | #include "gnunet_datastore_plugin.h" |
30 | 30 | ||
31 | #define VERBOSE GNUNET_NO | 31 | #define VERBOSE GNUNET_NO |
32 | 32 | ||
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 @@ | |||
122 | */ | 122 | */ |
123 | 123 | ||
124 | #include "platform.h" | 124 | #include "platform.h" |
125 | #include "plugin_datastore.h" | 125 | #include "gnunet_datastore_plugin.h" |
126 | #include "gnunet_util_lib.h" | 126 | #include "gnunet_util_lib.h" |
127 | #include <mysql/mysql.h> | 127 | #include <mysql/mysql.h> |
128 | 128 | ||
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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_datastore.h" | 28 | #include "gnunet_datastore_plugin.h" |
29 | #include <postgresql/libpq-fe.h> | 29 | #include <postgresql/libpq-fe.h> |
30 | 30 | ||
31 | #define DEBUG_POSTGRES GNUNET_NO | 31 | #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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_datastore.h" | 28 | #include "gnunet_datastore_plugin.h" |
29 | #include <sqlite3.h> | 29 | #include <sqlite3.h> |
30 | 30 | ||
31 | #define DEBUG_SQLITE GNUNET_YES | 31 | #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 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "plugin_datastore.h" | 28 | #include "gnunet_datastore_plugin.h" |
29 | 29 | ||
30 | 30 | ||
31 | /** | 31 | /** |
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 @@ | |||
36 | #include "gnunet_time_lib.h" | 36 | #include "gnunet_time_lib.h" |
37 | #include "gnunet_dv_service.h" | 37 | #include "gnunet_dv_service.h" |
38 | #include "dv.h" | 38 | #include "dv.h" |
39 | #include "../transport/plugin_transport.h" | 39 | #include "../transport/gnunet_transport_plugin.h" |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * Store ready to send messages | 42 | * 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 @@ | |||
34 | #include "gnunet_statistics_service.h" | 34 | #include "gnunet_statistics_service.h" |
35 | #include "gnunet_dv_service.h" | 35 | #include "gnunet_dv_service.h" |
36 | #include "gnunet_transport_service.h" | 36 | #include "gnunet_transport_service.h" |
37 | #include "../transport/plugin_transport.h" | 37 | #include "../transport/gnunet_transport_plugin.h" |
38 | #include "dv.h" | 38 | #include "dv.h" |
39 | 39 | ||
40 | #define DEBUG_TEMPLATE GNUNET_NO | 40 | #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 = \ | |||
19 | gnunet_bandwidth_lib.h \ | 19 | gnunet_bandwidth_lib.h \ |
20 | gnunet_bio_lib.h \ | 20 | gnunet_bio_lib.h \ |
21 | gnunet_block_lib.h \ | 21 | gnunet_block_lib.h \ |
22 | gnunet_block_plugin.h \ | ||
22 | gnunet_client_lib.h \ | 23 | gnunet_client_lib.h \ |
23 | gnunet_common.h \ | 24 | gnunet_common.h \ |
24 | gnunet_constants.h \ | 25 | gnunet_constants.h \ |
@@ -28,7 +29,9 @@ gnunetinclude_HEADERS = \ | |||
28 | gnunet_core_service.h \ | 29 | gnunet_core_service.h \ |
29 | gnunet_crypto_lib.h \ | 30 | gnunet_crypto_lib.h \ |
30 | gnunet_datacache_lib.h \ | 31 | gnunet_datacache_lib.h \ |
32 | gnunet_datacache_plugin.h \ | ||
31 | gnunet_datastore_service.h \ | 33 | gnunet_datastore_service.h \ |
34 | gnunet_datastore_plugin.h \ | ||
32 | gnunet_dht_service.h \ | 35 | gnunet_dht_service.h \ |
33 | gnunet_disk_lib.h \ | 36 | gnunet_disk_lib.h \ |
34 | gnunet_dv_service.h \ | 37 | gnunet_dv_service.h \ |
@@ -57,5 +60,6 @@ gnunetinclude_HEADERS = \ | |||
57 | gnunet_testing_lib.h \ | 60 | gnunet_testing_lib.h \ |
58 | gnunet_time_lib.h \ | 61 | gnunet_time_lib.h \ |
59 | gnunet_transport_service.h \ | 62 | gnunet_transport_service.h \ |
63 | gnunet_transport_plugin.h \ | ||
60 | gnunet_upnp_service.h \ | 64 | gnunet_upnp_service.h \ |
61 | gnunet_util_lib.h | 65 | gnunet_util_lib.h |
diff --git a/src/block/plugin_block.h b/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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file block/plugin_block.h | 22 | * @file block/gnunet_block_plugin.h |
23 | * @brief API for block plugins. Each block plugin must conform to | 23 | * @brief API for block plugins. Each block plugin must conform to |
24 | * the API specified by this header. | 24 | * the API specified by this header. |
25 | * @author Christian Grothoff | 25 | * @author Christian Grothoff |
diff --git a/src/datacache/plugin_datacache.h b/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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file datacache/plugin_datacache.h | 22 | * @file datacache/gnunet_datacache_plugin.h |
23 | * @brief API for database backends for the datacache | 23 | * @brief API for database backends for the datacache |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
@@ -154,5 +154,5 @@ struct GNUNET_DATACACHE_PluginFunctions { | |||
154 | } | 154 | } |
155 | #endif | 155 | #endif |
156 | 156 | ||
157 | /* end of plugin_datacache.h */ | 157 | /* end of gnunet_datacache_plugin.h */ |
158 | #endif | 158 | #endif |
diff --git a/src/datastore/plugin_datastore.h b/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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file datastore/plugin_datastore.h | 22 | * @file datastore/gnunet_datastore_plugin.h |
23 | * @brief API for the database backend plugins. | 23 | * @brief API for the database backend plugins. |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
@@ -64,7 +64,6 @@ struct GNUNET_DATASTORE_PluginEnvironment | |||
64 | */ | 64 | */ |
65 | const struct GNUNET_CONFIGURATION_Handle *cfg; | 65 | const struct GNUNET_CONFIGURATION_Handle *cfg; |
66 | 66 | ||
67 | |||
68 | /** | 67 | /** |
69 | * Function to call on disk utilization change. | 68 | * Function to call on disk utilization change. |
70 | */ | 69 | */ |
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" | |||
40 | #include "gnunet_common.h" | 40 | #include "gnunet_common.h" |
41 | #include "gnunet_configuration_lib.h" | 41 | #include "gnunet_configuration_lib.h" |
42 | #include "gnunet_scheduler_lib.h" | 42 | #include "gnunet_scheduler_lib.h" |
43 | #include "../transport/plugin_transport.h" | 43 | #include "../transport/gnunet_transport_plugin.h" |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * Version of the dv API. | 46 | * Version of the dv API. |
diff --git a/src/transport/plugin_transport.h b/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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file transport/plugin_transport.h | 22 | * @file transport/gnunet_transport_plugin.h |
23 | * @brief API for the transport services. This header | 23 | * @brief API for the transport services. This header |
24 | * specifies the struct that is given to the plugin's entry | 24 | * specifies the struct that is given to the plugin's entry |
25 | * method and the other struct that must be returned. | 25 | * 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 | |||
19 | HTTP_API_TEST = test_transport_api_http | 19 | HTTP_API_TEST = test_transport_api_http |
20 | HTTP_REL_TEST = test_transport_api_reliability_http | 20 | HTTP_REL_TEST = test_transport_api_reliability_http |
21 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | 21 | HTTP_QUOTA_TEST = test_quota_compliance_http \ |
22 | test_quota_compliance_http_asymmetric_recv_constant | 22 | test_quota_compliance_http_asymmetric_recv_constant |
23 | |||
24 | HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la | 23 | HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la |
25 | HTTPS_PLUGIN_TEST = test_plugin_transport_https | 24 | HTTPS_PLUGIN_TEST = test_plugin_transport_https |
26 | HTTPS_API_TEST = test_transport_api_https | 25 | HTTPS_API_TEST = test_transport_api_https |
27 | HTTPS_REL_TEST = test_transport_api_reliability_https | 26 | HTTPS_REL_TEST = test_transport_api_reliability_https |
28 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ | 27 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ |
29 | test_quota_compliance_https_asymmetric_recv_constant | 28 | test_quota_compliance_https_asymmetric_recv_constant |
30 | endif | 29 | endif |
31 | 30 | ||
32 | if USE_COVERAGE | 31 | if USE_COVERAGE |
@@ -175,7 +174,7 @@ libgnunet_plugin_transport_http_la_LIBADD = \ | |||
175 | libgnunet_plugin_transport_http_la_LDFLAGS = \ | 174 | libgnunet_plugin_transport_http_la_LDFLAGS = \ |
176 | $(GN_LIBMHD) \ | 175 | $(GN_LIBMHD) \ |
177 | $(GN_PLUGIN_LDFLAGS) | 176 | $(GN_PLUGIN_LDFLAGS) |
178 | 177 | ||
179 | libgnunet_plugin_transport_https_la_SOURCES = \ | 178 | libgnunet_plugin_transport_https_la_SOURCES = \ |
180 | plugin_transport_http.c | 179 | plugin_transport_http.c |
181 | libgnunet_plugin_transport_https_la_LIBADD = \ | 180 | libgnunet_plugin_transport_https_la_LIBADD = \ |
@@ -298,7 +297,7 @@ test_transport_api_reliability_http_SOURCES = \ | |||
298 | test_transport_api_reliability_http_LDADD = \ | 297 | test_transport_api_reliability_http_LDADD = \ |
299 | $(top_builddir)/src/transport/libgnunettransport.la \ | 298 | $(top_builddir)/src/transport/libgnunettransport.la \ |
300 | $(top_builddir)/src/util/libgnunetutil.la | 299 | $(top_builddir)/src/util/libgnunetutil.la |
301 | 300 | ||
302 | test_plugin_transport_https_SOURCES = \ | 301 | test_plugin_transport_https_SOURCES = \ |
303 | test_plugin_transport_https.c | 302 | test_plugin_transport_https.c |
304 | test_plugin_transport_https_LDADD = \ | 303 | test_plugin_transport_https_LDADD = \ |
@@ -330,7 +329,7 @@ test_quota_compliance_tcp_asymmetric_recv_constant_SOURCES = \ | |||
330 | test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \ | 329 | test_quota_compliance_tcp_asymmetric_recv_constant_LDADD = \ |
331 | $(top_builddir)/src/transport/libgnunettransport.la \ | 330 | $(top_builddir)/src/transport/libgnunettransport.la \ |
332 | $(top_builddir)/src/util/libgnunetutil.la | 331 | $(top_builddir)/src/util/libgnunetutil.la |
333 | 332 | ||
334 | #test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \ | 333 | #test_quota_compliance_tcp_asymmetric_send_constant_SOURCES = \ |
335 | # test_quota_compliance.c | 334 | # test_quota_compliance.c |
336 | #test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \ | 335 | #test_quota_compliance_tcp_asymmetric_send_constant_LDADD = \ |
@@ -342,13 +341,13 @@ test_quota_compliance_http_SOURCES = \ | |||
342 | test_quota_compliance_http_LDADD = \ | 341 | test_quota_compliance_http_LDADD = \ |
343 | $(top_builddir)/src/transport/libgnunettransport.la \ | 342 | $(top_builddir)/src/transport/libgnunettransport.la \ |
344 | $(top_builddir)/src/util/libgnunetutil.la | 343 | $(top_builddir)/src/util/libgnunetutil.la |
345 | 344 | ||
346 | test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \ | 345 | test_quota_compliance_http_asymmetric_recv_constant_SOURCES = \ |
347 | test_quota_compliance.c | 346 | test_quota_compliance.c |
348 | test_quota_compliance_http_asymmetric_recv_constant_LDADD = \ | 347 | test_quota_compliance_http_asymmetric_recv_constant_LDADD = \ |
349 | $(top_builddir)/src/transport/libgnunettransport.la \ | 348 | $(top_builddir)/src/transport/libgnunettransport.la \ |
350 | $(top_builddir)/src/util/libgnunetutil.la | 349 | $(top_builddir)/src/util/libgnunetutil.la |
351 | 350 | ||
352 | #test_quota_compliance_http_asymmetric_send_constant_SOURCES = \ | 351 | #test_quota_compliance_http_asymmetric_send_constant_SOURCES = \ |
353 | # test_quota_compliance.c | 352 | # test_quota_compliance.c |
354 | #test_quota_compliance_http_asymmetric_send_constant_LDADD = \ | 353 | #test_quota_compliance_http_asymmetric_send_constant_LDADD = \ |
@@ -366,7 +365,7 @@ test_quota_compliance_https_LDADD = \ | |||
366 | test_quota_compliance_https_asymmetric_recv_constant_LDADD = \ | 365 | test_quota_compliance_https_asymmetric_recv_constant_LDADD = \ |
367 | $(top_builddir)/src/transport/libgnunettransport.la \ | 366 | $(top_builddir)/src/transport/libgnunettransport.la \ |
368 | $(top_builddir)/src/util/libgnunetutil.la | 367 | $(top_builddir)/src/util/libgnunetutil.la |
369 | 368 | ||
370 | #test_quota_compliance_https_asymmetric_send_constant_SOURCES = \ | 369 | #test_quota_compliance_https_asymmetric_send_constant_SOURCES = \ |
371 | # test_quota_compliance.c | 370 | # test_quota_compliance.c |
372 | #test_quota_compliance_https_asymmetric_send_constant_LDADD = \ | 371 | #test_quota_compliance_https_asymmetric_send_constant_LDADD = \ |
@@ -378,13 +377,13 @@ test_quota_compliance_udp_SOURCES = \ | |||
378 | test_quota_compliance_udp_LDADD = \ | 377 | test_quota_compliance_udp_LDADD = \ |
379 | $(top_builddir)/src/transport/libgnunettransport.la \ | 378 | $(top_builddir)/src/transport/libgnunettransport.la \ |
380 | $(top_builddir)/src/util/libgnunetutil.la | 379 | $(top_builddir)/src/util/libgnunetutil.la |
381 | 380 | ||
382 | test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \ | 381 | test_quota_compliance_udp_asymmetric_recv_constant_SOURCES = \ |
383 | test_quota_compliance.c | 382 | test_quota_compliance.c |
384 | test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \ | 383 | test_quota_compliance_udp_asymmetric_recv_constant_LDADD = \ |
385 | $(top_builddir)/src/transport/libgnunettransport.la \ | 384 | $(top_builddir)/src/transport/libgnunettransport.la \ |
386 | $(top_builddir)/src/util/libgnunetutil.la | 385 | $(top_builddir)/src/util/libgnunetutil.la |
387 | 386 | ||
388 | #test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \ | 387 | #test_quota_compliance_udp_asymmetric_send_constant_SOURCES = \ |
389 | # test_quota_compliance.c | 388 | # test_quota_compliance.c |
390 | #test_quota_compliance_udp_asymmetric_send_constant_LDADD = \ | 389 | #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 @@ | |||
36 | #include "gnunet_protocols.h" | 36 | #include "gnunet_protocols.h" |
37 | #include "gnunet_service_lib.h" | 37 | #include "gnunet_service_lib.h" |
38 | #include "gnunet_signatures.h" | 38 | #include "gnunet_signatures.h" |
39 | #include "plugin_transport.h" | 39 | #include "gnunet_transport_plugin.h" |
40 | #include "transport.h" | 40 | #include "transport.h" |
41 | 41 | ||
42 | #define DEBUG_BLACKLIST GNUNET_YES | 42 | #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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file transport/plugin_transport_http.c | 22 | * @file transport/gnunet_transport_plugin.http.c |
23 | * @brief http transport service plugin | 23 | * @brief http transport service plugin |
24 | * @author Matthias Wachs | 24 | * @author Matthias Wachs |
25 | */ | 25 | */ |
@@ -35,19 +35,19 @@ | |||
35 | #include "gnunet_resolver_service.h" | 35 | #include "gnunet_resolver_service.h" |
36 | #include "gnunet_server_lib.h" | 36 | #include "gnunet_server_lib.h" |
37 | #include "gnunet_container_lib.h" | 37 | #include "gnunet_container_lib.h" |
38 | #include "plugin_transport.h" | 38 | #include "gnunet_transport_plugin.h" |
39 | #include "gnunet_os_lib.h" | 39 | #include "gnunet_os_lib.h" |
40 | #include "microhttpd.h" | 40 | #include "microhttpd.h" |
41 | #include <curl/curl.h> | 41 | #include <curl/curl.h> |
42 | 42 | ||
43 | #if BUILD_HTTPS | 43 | #if BUILD_HTTPS |
44 | #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init | 44 | #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_gnunet_transport_plugin.https_init |
45 | #define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done | 45 | #define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_gnunet_transport_plugin.https_done |
46 | #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https | 46 | #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https |
47 | #define PROTOCOL_PREFIX "https" | 47 | #define PROTOCOL_PREFIX "https" |
48 | #else | 48 | #else |
49 | #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init | 49 | #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_gnunet_transport_plugin.http_init |
50 | #define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done | 50 | #define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_gnunet_transport_plugin.http_done |
51 | #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http | 51 | #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http |
52 | #define PROTOCOL_PREFIX "http" | 52 | #define PROTOCOL_PREFIX "http" |
53 | #endif | 53 | #endif |
@@ -3099,4 +3099,4 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3099 | return api; | 3099 | return api; |
3100 | } | 3100 | } |
3101 | 3101 | ||
3102 | /* end of plugin_transport_http.c */ | 3102 | /* 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 @@ | |||
34 | #include "gnunet_signatures.h" | 34 | #include "gnunet_signatures.h" |
35 | #include "gnunet_statistics_service.h" | 35 | #include "gnunet_statistics_service.h" |
36 | #include "gnunet_transport_service.h" | 36 | #include "gnunet_transport_service.h" |
37 | #include "plugin_transport.h" | 37 | #include "gnunet_transport_plugin.h" |
38 | #include "transport.h" | 38 | #include "transport.h" |
39 | 39 | ||
40 | #define DEBUG_TCP GNUNET_NO | 40 | #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 @@ | |||
31 | #include "gnunet_service_lib.h" | 31 | #include "gnunet_service_lib.h" |
32 | #include "gnunet_statistics_service.h" | 32 | #include "gnunet_statistics_service.h" |
33 | #include "gnunet_transport_service.h" | 33 | #include "gnunet_transport_service.h" |
34 | #include "plugin_transport.h" | 34 | #include "gnunet_transport_plugin.h" |
35 | 35 | ||
36 | #define DEBUG_TEMPLATE GNUNET_NO | 36 | #define DEBUG_TEMPLATE GNUNET_NO |
37 | 37 | ||
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 @@ | |||
50 | #include "gnunet_signatures.h" | 50 | #include "gnunet_signatures.h" |
51 | #include "gnunet_statistics_service.h" | 51 | #include "gnunet_statistics_service.h" |
52 | #include "gnunet_transport_service.h" | 52 | #include "gnunet_transport_service.h" |
53 | #include "plugin_transport.h" | 53 | #include "gnunet_transport_plugin.h" |
54 | #include "transport.h" | 54 | #include "transport.h" |
55 | 55 | ||
56 | #define DEBUG_UDP GNUNET_YES | 56 | #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 @@ | |||
30 | #include "gnunet_util_lib.h" | 30 | #include "gnunet_util_lib.h" |
31 | #include "gnunet_statistics_service.h" | 31 | #include "gnunet_statistics_service.h" |
32 | #include "gnunet_transport_service.h" | 32 | #include "gnunet_transport_service.h" |
33 | #include "plugin_transport.h" | 33 | #include "gnunet_transport_plugin.h" |
34 | #include "plugin_transport_wlan.h" | 34 | #include "plugin_transport_wlan.h" |
35 | #include "gnunet_common.h" | 35 | #include "gnunet_common.h" |
36 | #include "gnunet_crypto_lib.h" | 36 | #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 @@ | |||
34 | #include "gnunet_protocols.h" | 34 | #include "gnunet_protocols.h" |
35 | #include "gnunet_program_lib.h" | 35 | #include "gnunet_program_lib.h" |
36 | #include "gnunet_signatures.h" | 36 | #include "gnunet_signatures.h" |
37 | #include "plugin_transport.h" | 37 | #include "gnunet_transport_plugin.h" |
38 | #include "transport.h" | 38 | #include "transport.h" |
39 | 39 | ||
40 | #define VERBOSE GNUNET_NO | 40 | #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 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file transport/test_plugin_transport_http.c | 21 | * @file transport/test_gnunet_transport_plugin.http.c |
22 | * @brief testcase for plugin_transport_http.c | 22 | * @brief testcase for gnunet_transport_plugin.http.c |
23 | * @author Matthias Wachs | 23 | * @author Matthias Wachs |
24 | */ | 24 | */ |
25 | 25 | ||
@@ -37,7 +37,7 @@ | |||
37 | #include "gnunet_service_lib.h" | 37 | #include "gnunet_service_lib.h" |
38 | #include "gnunet_crypto_lib.h" | 38 | #include "gnunet_crypto_lib.h" |
39 | 39 | ||
40 | #include "plugin_transport.h" | 40 | #include "gnunet_transport_plugin.h" |
41 | #include "gnunet_statistics_service.h" | 41 | #include "gnunet_statistics_service.h" |
42 | #include "transport.h" | 42 | #include "transport.h" |
43 | #include <curl/curl.h> | 43 | #include <curl/curl.h> |
@@ -459,10 +459,10 @@ shutdown_clean () | |||
459 | 459 | ||
460 | GNUNET_free(test_addr); | 460 | GNUNET_free(test_addr); |
461 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n"); | 461 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n"); |
462 | GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http", api)); | 462 | GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin.http", api)); |
463 | 463 | ||
464 | GNUNET_SCHEDULER_shutdown(); | 464 | GNUNET_SCHEDULER_shutdown(); |
465 | GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); | 465 | GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); |
466 | 466 | ||
467 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n"); | 467 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n"); |
468 | exit(fail); | 468 | exit(fail); |
@@ -1200,7 +1200,7 @@ run (void *cls, | |||
1200 | 1200 | ||
1201 | /* load plugins... */ | 1201 | /* load plugins... */ |
1202 | setup_plugin_environment (); | 1202 | setup_plugin_environment (); |
1203 | GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http"); | 1203 | GNUNET_asprintf (&libname, "libgnunet_gnunet_transport_plugin.http"); |
1204 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),libname); | 1204 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),libname); |
1205 | api = GNUNET_PLUGIN_load (libname, &env); | 1205 | api = GNUNET_PLUGIN_load (libname, &env); |
1206 | GNUNET_free (libname); | 1206 | GNUNET_free (libname); |
@@ -1311,7 +1311,7 @@ main (int argc, char *const *argv) | |||
1311 | }; | 1311 | }; |
1312 | int ret; | 1312 | int ret; |
1313 | char *const argv_prog[] = { | 1313 | char *const argv_prog[] = { |
1314 | "test_plugin_transport_http", | 1314 | "test_gnunet_transport_plugin.http", |
1315 | "-c", | 1315 | "-c", |
1316 | "test_plugin_transport_data_http.conf", | 1316 | "test_plugin_transport_data_http.conf", |
1317 | "-L", | 1317 | "-L", |
@@ -1322,7 +1322,7 @@ main (int argc, char *const *argv) | |||
1322 | #endif | 1322 | #endif |
1323 | NULL | 1323 | NULL |
1324 | }; | 1324 | }; |
1325 | GNUNET_log_setup ("test_plugin_transport_http", | 1325 | GNUNET_log_setup ("test_gnunet_transport_plugin.http", |
1326 | #if VERBOSE | 1326 | #if VERBOSE |
1327 | "DEBUG", | 1327 | "DEBUG", |
1328 | #else | 1328 | #else |
@@ -1333,12 +1333,12 @@ main (int argc, char *const *argv) | |||
1333 | ret = (GNUNET_OK == | 1333 | ret = (GNUNET_OK == |
1334 | GNUNET_PROGRAM_run (5, | 1334 | GNUNET_PROGRAM_run (5, |
1335 | argv_prog, | 1335 | argv_prog, |
1336 | "test_plugin_transport_http", | 1336 | "test_gnunet_transport_plugin.http", |
1337 | "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; | 1337 | "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; |
1338 | 1338 | ||
1339 | GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); | 1339 | GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); |
1340 | 1340 | ||
1341 | return fail; | 1341 | return fail; |
1342 | } | 1342 | } |
1343 | 1343 | ||
1344 | /* end of test_plugin_transport_http.c */ | 1344 | /* 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 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file transport/test_plugin_transport_https.c | 21 | * @file transport/test_gnunet_transport_plugin.https.c |
22 | * @brief testcase for plugin_transport_https.c | 22 | * @brief testcase for gnunet_transport_plugin.https.c |
23 | * @author Matthias Wachs | 23 | * @author Matthias Wachs |
24 | */ | 24 | */ |
25 | 25 | ||
@@ -37,7 +37,7 @@ | |||
37 | #include "gnunet_service_lib.h" | 37 | #include "gnunet_service_lib.h" |
38 | #include "gnunet_crypto_lib.h" | 38 | #include "gnunet_crypto_lib.h" |
39 | 39 | ||
40 | #include "plugin_transport.h" | 40 | #include "gnunet_transport_plugin.h" |
41 | #include "gnunet_statistics_service.h" | 41 | #include "gnunet_statistics_service.h" |
42 | #include "transport.h" | 42 | #include "transport.h" |
43 | #include <curl/curl.h> | 43 | #include <curl/curl.h> |
@@ -462,10 +462,10 @@ shutdown_clean () | |||
462 | 462 | ||
463 | GNUNET_free(test_addr); | 463 | GNUNET_free(test_addr); |
464 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading https plugin\n"); | 464 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading https plugin\n"); |
465 | GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_https", api)); | 465 | GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin.https", api)); |
466 | 466 | ||
467 | GNUNET_SCHEDULER_shutdown(); | 467 | GNUNET_SCHEDULER_shutdown(); |
468 | GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http"); | 468 | GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.http"); |
469 | 469 | ||
470 | struct stat sbuf; | 470 | struct stat sbuf; |
471 | if (0 == stat (cert_file, &sbuf )) | 471 | if (0 == stat (cert_file, &sbuf )) |
@@ -1266,7 +1266,7 @@ run (void *cls, | |||
1266 | 1266 | ||
1267 | /* load plugins... */ | 1267 | /* load plugins... */ |
1268 | setup_plugin_environment (); | 1268 | setup_plugin_environment (); |
1269 | GNUNET_asprintf (&libname, "libgnunet_plugin_transport_https"); | 1269 | GNUNET_asprintf (&libname, "libgnunet_gnunet_transport_plugin.https"); |
1270 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTPS transport plugin `%s'\n"),libname); | 1270 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTPS transport plugin `%s'\n"),libname); |
1271 | api = GNUNET_PLUGIN_load (libname, &env); | 1271 | api = GNUNET_PLUGIN_load (libname, &env); |
1272 | GNUNET_free (libname); | 1272 | GNUNET_free (libname); |
@@ -1376,7 +1376,7 @@ main (int argc, char *const *argv) | |||
1376 | }; | 1376 | }; |
1377 | int ret; | 1377 | int ret; |
1378 | char *const argv_prog[] = { | 1378 | char *const argv_prog[] = { |
1379 | "test_plugin_transport_https", | 1379 | "test_gnunet_transport_plugin.https", |
1380 | "-c", | 1380 | "-c", |
1381 | "test_plugin_transport_data_http.conf", | 1381 | "test_plugin_transport_data_http.conf", |
1382 | "-L", | 1382 | "-L", |
@@ -1387,7 +1387,7 @@ main (int argc, char *const *argv) | |||
1387 | #endif | 1387 | #endif |
1388 | NULL | 1388 | NULL |
1389 | }; | 1389 | }; |
1390 | GNUNET_log_setup ("test_plugin_transport_https", | 1390 | GNUNET_log_setup ("test_gnunet_transport_plugin.https", |
1391 | #if VERBOSE | 1391 | #if VERBOSE |
1392 | "DEBUG", | 1392 | "DEBUG", |
1393 | #else | 1393 | #else |
@@ -1398,12 +1398,12 @@ main (int argc, char *const *argv) | |||
1398 | ret = (GNUNET_OK == | 1398 | ret = (GNUNET_OK == |
1399 | GNUNET_PROGRAM_run (5, | 1399 | GNUNET_PROGRAM_run (5, |
1400 | argv_prog, | 1400 | argv_prog, |
1401 | "test_plugin_transport_https", | 1401 | "test_gnunet_transport_plugin.https", |
1402 | "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; | 1402 | "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES; |
1403 | 1403 | ||
1404 | GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_https"); | 1404 | GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin.https"); |
1405 | 1405 | ||
1406 | return fail; | 1406 | return fail; |
1407 | } | 1407 | } |
1408 | 1408 | ||
1409 | /* end of test_plugin_transport_http.c */ | 1409 | /* 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 @@ | |||
35 | #include "gnunet_protocols.h" | 35 | #include "gnunet_protocols.h" |
36 | #include "gnunet_program_lib.h" | 36 | #include "gnunet_program_lib.h" |
37 | #include "gnunet_signatures.h" | 37 | #include "gnunet_signatures.h" |
38 | #include "plugin_transport.h" | 38 | #include "gnunet_transport_plugin.h" |
39 | #include "transport.h" | 39 | #include "transport.h" |
40 | 40 | ||
41 | #define VERBOSE GNUNET_NO | 41 | #define VERBOSE GNUNET_NO |