diff options
Diffstat (limited to 'src/transport/test_plugin_transport.c')
-rw-r--r-- | src/transport/test_plugin_transport.c | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 0c335d6ba..e66e04ead 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c | |||
@@ -90,9 +90,8 @@ static void | |||
90 | receive (void *cls, | 90 | receive (void *cls, |
91 | const struct GNUNET_PeerIdentity | 91 | const struct GNUNET_PeerIdentity |
92 | *peer, const struct GNUNET_MessageHeader *message, | 92 | *peer, const struct GNUNET_MessageHeader *message, |
93 | uint32_t distance, | 93 | uint32_t distance, |
94 | const char *sender_address, | 94 | const char *sender_address, size_t sender_address_len) |
95 | size_t sender_address_len) | ||
96 | { | 95 | { |
97 | /* do nothing */ | 96 | /* do nothing */ |
98 | } | 97 | } |
@@ -116,8 +115,7 @@ static void | |||
116 | unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) | 115 | unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) |
117 | { | 116 | { |
118 | GNUNET_assert (NULL == | 117 | GNUNET_assert (NULL == |
119 | GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp", | 118 | GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp", api)); |
120 | api)); | ||
121 | if (my_private_key != NULL) | 119 | if (my_private_key != NULL) |
122 | GNUNET_CRYPTO_rsa_key_free (my_private_key); | 120 | GNUNET_CRYPTO_rsa_key_free (my_private_key); |
123 | 121 | ||
@@ -128,6 +126,7 @@ static void | |||
128 | unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 126 | unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
129 | { | 127 | { |
130 | struct GNUNET_CONFIGURATION_Handle *cfg = cls; | 128 | struct GNUNET_CONFIGURATION_Handle *cfg = cls; |
129 | |||
131 | unload_plugins (NULL, cfg); | 130 | unload_plugins (NULL, cfg); |
132 | } | 131 | } |
133 | 132 | ||
@@ -160,8 +159,7 @@ test_validation () | |||
160 | soaddr.sin_port = htons (2368 /* FIXME: get from config! */ ); | 159 | soaddr.sin_port = htons (2368 /* FIXME: get from config! */ ); |
161 | soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); | 160 | soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); |
162 | GNUNET_assert (GNUNET_OK == | 161 | GNUNET_assert (GNUNET_OK == |
163 | api->check_address (api->cls, | 162 | api->check_address (api->cls, &soaddr, sizeof (soaddr))); |
164 | &soaddr, sizeof (soaddr))); | ||
165 | ok = 0; | 163 | ok = 0; |
166 | GNUNET_SCHEDULER_add_continuation (&unload_task, | 164 | GNUNET_SCHEDULER_add_continuation (&unload_task, |
167 | (void *) cfg, | 165 | (void *) cfg, |
@@ -207,24 +205,23 @@ run (void *cls, | |||
207 | GNUNET_CONFIGURATION_get_value_filename (c, | 205 | GNUNET_CONFIGURATION_get_value_filename (c, |
208 | "GNUNETD", | 206 | "GNUNETD", |
209 | "HOSTKEY", &keyfile))) | 207 | "HOSTKEY", &keyfile))) |
210 | { | 208 | { |
211 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 209 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
212 | _ | 210 | _ |
213 | ("Transport service is lacking key configuration settings. Exiting.\n")); | 211 | ("Transport service is lacking key configuration settings. Exiting.\n")); |
214 | GNUNET_SCHEDULER_shutdown (s); | 212 | GNUNET_SCHEDULER_shutdown (s); |
215 | return; | 213 | return; |
216 | } | 214 | } |
217 | max_connect_per_transport = (uint32_t) tneigh; | 215 | max_connect_per_transport = (uint32_t) tneigh; |
218 | my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); | 216 | my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); |
219 | GNUNET_free (keyfile); | 217 | GNUNET_free (keyfile); |
220 | if (my_private_key == NULL) | 218 | if (my_private_key == NULL) |
221 | { | 219 | { |
222 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 220 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
223 | _ | 221 | _("Transport service could not access hostkey. Exiting.\n")); |
224 | ("Transport service could not access hostkey. Exiting.\n")); | 222 | GNUNET_SCHEDULER_shutdown (s); |
225 | GNUNET_SCHEDULER_shutdown (s); | 223 | return; |
226 | return; | 224 | } |
227 | } | ||
228 | GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key); | 225 | GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key); |
229 | GNUNET_CRYPTO_hash (&my_public_key, | 226 | GNUNET_CRYPTO_hash (&my_public_key, |
230 | sizeof (my_public_key), &my_identity.hashPubKey); | 227 | sizeof (my_public_key), &my_identity.hashPubKey); |
@@ -239,12 +236,12 @@ run (void *cls, | |||
239 | api = GNUNET_PLUGIN_load (libname, &env); | 236 | api = GNUNET_PLUGIN_load (libname, &env); |
240 | GNUNET_free (libname); | 237 | GNUNET_free (libname); |
241 | if (api == NULL) | 238 | if (api == NULL) |
242 | { | 239 | { |
243 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 240 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
244 | _("Failed to load transport plugin for tcp\n")); | 241 | _("Failed to load transport plugin for tcp\n")); |
245 | /* FIXME: set some error code for main */ | 242 | /* FIXME: set some error code for main */ |
246 | return; | 243 | return; |
247 | } | 244 | } |
248 | test_validation (); | 245 | test_validation (); |
249 | } | 246 | } |
250 | 247 | ||
@@ -263,6 +260,7 @@ main (int argc, char *const *argv) | |||
263 | GNUNET_GETOPT_OPTION_END | 260 | GNUNET_GETOPT_OPTION_END |
264 | }; | 261 | }; |
265 | int ret; | 262 | int ret; |
263 | |||
266 | char *const argv_prog[] = { | 264 | char *const argv_prog[] = { |
267 | "test_plugin_transport", | 265 | "test_plugin_transport", |
268 | "-c", | 266 | "-c", |