diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/transport/test_plugin_transport_udp.c | |
parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
download | gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip |
indentation
Diffstat (limited to 'src/transport/test_plugin_transport_udp.c')
-rw-r--r-- | src/transport/test_plugin_transport_udp.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/src/transport/test_plugin_transport_udp.c b/src/transport/test_plugin_transport_udp.c index f790ccedc..b23d4eb67 100644 --- a/src/transport/test_plugin_transport_udp.c +++ b/src/transport/test_plugin_transport_udp.c | |||
@@ -90,11 +90,10 @@ static int ok; | |||
90 | */ | 90 | */ |
91 | static void | 91 | static void |
92 | receive (void *cls, | 92 | receive (void *cls, |
93 | const struct GNUNET_PeerIdentity * peer, | 93 | const struct GNUNET_PeerIdentity *peer, |
94 | const struct GNUNET_MessageHeader * message, | 94 | const struct GNUNET_MessageHeader *message, |
95 | uint32_t distance, | 95 | uint32_t distance, |
96 | const char *sender_address, | 96 | const char *sender_address, size_t sender_address_len) |
97 | size_t sender_address_len) | ||
98 | { | 97 | { |
99 | /* do nothing */ | 98 | /* do nothing */ |
100 | } | 99 | } |
@@ -118,8 +117,7 @@ static void | |||
118 | unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) | 117 | unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) |
119 | { | 118 | { |
120 | GNUNET_assert (NULL == | 119 | GNUNET_assert (NULL == |
121 | GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_udp", | 120 | GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_udp", api)); |
122 | api)); | ||
123 | if (my_private_key != NULL) | 121 | if (my_private_key != NULL) |
124 | GNUNET_CRYPTO_rsa_key_free (my_private_key); | 122 | GNUNET_CRYPTO_rsa_key_free (my_private_key); |
125 | 123 | ||
@@ -146,10 +144,9 @@ test_validation () | |||
146 | soaddr.sin_port = htons (2368 /* FIXME: get from config! */ ); | 144 | soaddr.sin_port = htons (2368 /* FIXME: get from config! */ ); |
147 | soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); | 145 | soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); |
148 | 146 | ||
149 | api->check_address(api->cls, | 147 | api->check_address (api->cls, &soaddr, sizeof (soaddr)); |
150 | &soaddr, sizeof (soaddr)); | ||
151 | 148 | ||
152 | unload_plugins(env.cls, env.cfg); | 149 | unload_plugins (env.cls, env.cfg); |
153 | } | 150 | } |
154 | 151 | ||
155 | 152 | ||
@@ -190,24 +187,23 @@ run (void *cls, | |||
190 | GNUNET_CONFIGURATION_get_value_filename (c, | 187 | GNUNET_CONFIGURATION_get_value_filename (c, |
191 | "GNUNETD", | 188 | "GNUNETD", |
192 | "HOSTKEY", &keyfile))) | 189 | "HOSTKEY", &keyfile))) |
193 | { | 190 | { |
194 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 191 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
195 | _ | 192 | _ |
196 | ("Transport service is lacking key configuration settings. Exiting.\n")); | 193 | ("Transport service is lacking key configuration settings. Exiting.\n")); |
197 | GNUNET_SCHEDULER_shutdown (s); | 194 | GNUNET_SCHEDULER_shutdown (s); |
198 | return; | 195 | return; |
199 | } | 196 | } |
200 | max_connect_per_transport = (uint32_t) tneigh; | 197 | max_connect_per_transport = (uint32_t) tneigh; |
201 | my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); | 198 | my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); |
202 | GNUNET_free (keyfile); | 199 | GNUNET_free (keyfile); |
203 | if (my_private_key == NULL) | 200 | if (my_private_key == NULL) |
204 | { | 201 | { |
205 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 202 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
206 | _ | 203 | _("Transport service could not access hostkey. Exiting.\n")); |
207 | ("Transport service could not access hostkey. Exiting.\n")); | 204 | GNUNET_SCHEDULER_shutdown (s); |
208 | GNUNET_SCHEDULER_shutdown (s); | 205 | return; |
209 | return; | 206 | } |
210 | } | ||
211 | GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key); | 207 | GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key); |
212 | GNUNET_CRYPTO_hash (&my_public_key, | 208 | GNUNET_CRYPTO_hash (&my_public_key, |
213 | sizeof (my_public_key), &my_identity.hashPubKey); | 209 | sizeof (my_public_key), &my_identity.hashPubKey); |
@@ -220,12 +216,12 @@ run (void *cls, | |||
220 | api = GNUNET_PLUGIN_load (libname, &env); | 216 | api = GNUNET_PLUGIN_load (libname, &env); |
221 | GNUNET_free (libname); | 217 | GNUNET_free (libname); |
222 | if (api == NULL) | 218 | if (api == NULL) |
223 | { | 219 | { |
224 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 220 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
225 | _("Failed to load transport plugin for udp\n")); | 221 | _("Failed to load transport plugin for udp\n")); |
226 | /* FIXME: set some error code for main */ | 222 | /* FIXME: set some error code for main */ |
227 | return; | 223 | return; |
228 | } | 224 | } |
229 | test_validation (); | 225 | test_validation (); |
230 | } | 226 | } |
231 | 227 | ||
@@ -244,6 +240,7 @@ main (int argc, char *const *argv) | |||
244 | GNUNET_GETOPT_OPTION_END | 240 | GNUNET_GETOPT_OPTION_END |
245 | }; | 241 | }; |
246 | int ret; | 242 | int ret; |
243 | |||
247 | char *const argv_prog[] = { | 244 | char *const argv_prog[] = { |
248 | "test_plugin_transport", | 245 | "test_plugin_transport", |
249 | "-c", | 246 | "-c", |