diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-08 19:54:24 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-08 19:54:24 +0000 |
commit | 815115e815d829c0bfc5dccf45f12e223ea0865e (patch) | |
tree | 6f53e5c372d9450f642bb72d1e66a59021627412 /src/transport | |
parent | f403f931fd0dcf6cd78358540cc52f13c8852a4a (diff) | |
download | gnunet-815115e815d829c0bfc5dccf45f12e223ea0865e.tar.gz gnunet-815115e815d829c0bfc5dccf45f12e223ea0865e.zip |
-cleanup
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/test_plugin_transport.c | 7 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 19 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 794c8311d..f101f14e1 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file transport/test_transport_api.c | 21 | * @file transport/test_plugin_transport.c |
22 | * @brief testcase for transport_api.c | 22 | * @brief testcase for transport_api.c |
23 | * @author Sailor Siraj | 23 | * @author Sailor Siraj |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
@@ -26,13 +26,10 @@ | |||
26 | 26 | ||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_constants.h" | 28 | #include "gnunet_constants.h" |
29 | #include "gnunet_getopt_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_hello_lib.h" | 30 | #include "gnunet_hello_lib.h" |
31 | #include "gnunet_os_lib.h" | ||
32 | #include "gnunet_peerinfo_service.h" | 31 | #include "gnunet_peerinfo_service.h" |
33 | #include "gnunet_plugin_lib.h" | ||
34 | #include "gnunet_protocols.h" | 32 | #include "gnunet_protocols.h" |
35 | #include "gnunet_program_lib.h" | ||
36 | #include "gnunet_signatures.h" | 33 | #include "gnunet_signatures.h" |
37 | #include "gnunet_transport_plugin.h" | 34 | #include "gnunet_transport_plugin.h" |
38 | #include "transport.h" | 35 | #include "transport.h" |
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index ad26833af..566d892b1 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c | |||
@@ -65,26 +65,28 @@ static char *test_name; | |||
65 | static int ok; | 65 | static int ok; |
66 | 66 | ||
67 | static int s_started; | 67 | static int s_started; |
68 | |||
68 | static int s_connected; | 69 | static int s_connected; |
70 | |||
69 | static int s_sending; | 71 | static int s_sending; |
70 | 72 | ||
71 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 73 | static GNUNET_SCHEDULER_TaskIdentifier die_task; |
72 | 74 | ||
73 | static GNUNET_SCHEDULER_TaskIdentifier send_task; | 75 | static GNUNET_SCHEDULER_TaskIdentifier send_task; |
74 | 76 | ||
75 | struct PeerContext *p1; | 77 | static struct PeerContext *p1; |
76 | 78 | ||
77 | struct PeerContext *p2; | 79 | static struct PeerContext *p2; |
78 | 80 | ||
79 | static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; | 81 | static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; |
80 | 82 | ||
81 | struct GNUNET_TRANSPORT_TransmitHandle *th; | 83 | static struct GNUNET_TRANSPORT_TransmitHandle *th; |
82 | 84 | ||
83 | struct GNUNET_TRANSPORT_TESTING_handle *tth; | 85 | static struct GNUNET_TRANSPORT_TESTING_handle *tth; |
84 | 86 | ||
85 | char *cfg_file_p1; | 87 | static char *cfg_file_p1; |
86 | 88 | ||
87 | char *cfg_file_p2; | 89 | static char *cfg_file_p2; |
88 | 90 | ||
89 | #if VERBOSE | 91 | #if VERBOSE |
90 | #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) | 92 | #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) |
@@ -302,6 +304,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
302 | th = NULL; | 304 | th = NULL; |
303 | } | 305 | } |
304 | 306 | ||
307 | |||
305 | static void | 308 | static void |
306 | testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | 309 | testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) |
307 | { | 310 | { |
@@ -317,8 +320,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | |||
317 | } | 320 | } |
318 | 321 | ||
319 | 322 | ||
320 | 323 | static void | |
321 | void | ||
322 | start_cb (struct PeerContext *p, void *cls) | 324 | start_cb (struct PeerContext *p, void *cls) |
323 | { | 325 | { |
324 | static int started; | 326 | static int started; |
@@ -344,6 +346,7 @@ start_cb (struct PeerContext *p, void *cls) | |||
344 | 346 | ||
345 | } | 347 | } |
346 | 348 | ||
349 | |||
347 | static void | 350 | static void |
348 | run (void *cls, char *const *args, const char *cfgfile, | 351 | run (void *cls, char *const *args, const char *cfgfile, |
349 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 352 | const struct GNUNET_CONFIGURATION_Handle *cfg) |