aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_api.c2
-rw-r--r--src/transport/test_transport_api_limited_sockets.c2
-rw-r--r--src/transport/test_transport_api_reliability.c2
-rw-r--r--src/transport/test_transport_api_timeout.c2
-rw-r--r--src/transport/test_transport_api_unreliability_constant.c2
-rw-r--r--src/transport/test_transport_startonly.c2
-rw-r--r--src/transport/test_transport_testing.c2
-rw-r--r--src/transport/transport-testing.c26
-rw-r--r--src/transport/transport-testing.h18
9 files changed, 29 insertions, 29 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index d0159927e..70658d40b 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -74,7 +74,7 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
74 74
75struct GNUNET_TRANSPORT_TransmitHandle *th; 75struct GNUNET_TRANSPORT_TransmitHandle *th;
76 76
77struct TransportTestingHandle * tth; 77struct GNUNET_TRANSPORT_TESTING_handle * tth;
78 78
79char *cfg_file_p1; 79char *cfg_file_p1;
80 80
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index 7ceed03aa..231934f89 100644
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -77,7 +77,7 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
77 77
78struct GNUNET_TRANSPORT_TransmitHandle *th; 78struct GNUNET_TRANSPORT_TransmitHandle *th;
79 79
80struct TransportTestingHandle * tth; 80struct GNUNET_TRANSPORT_TESTING_handle * tth;
81 81
82char *cfg_file_p1; 82char *cfg_file_p1;
83 83
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 0719a9e47..21912e848 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -79,7 +79,7 @@ char *cfg_file_p1;
79 79
80char *cfg_file_p2; 80char *cfg_file_p2;
81 81
82struct TransportTestingHandle * tth; 82struct GNUNET_TRANSPORT_TESTING_handle * tth;
83 83
84/* 84/*
85 * Testcase specific declarations 85 * Testcase specific declarations
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index bb8ede313..89a74e9a9 100644
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -65,7 +65,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
65 65
66static GNUNET_SCHEDULER_TaskIdentifier timer_task; 66static GNUNET_SCHEDULER_TaskIdentifier timer_task;
67 67
68struct TransportTestingHandle * tth; 68struct GNUNET_TRANSPORT_TESTING_handle * tth;
69 69
70struct PeerContext *p1; 70struct PeerContext *p1;
71 71
diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c
index 670e34f7a..f5adeb25c 100644
--- a/src/transport/test_transport_api_unreliability_constant.c
+++ b/src/transport/test_transport_api_unreliability_constant.c
@@ -71,7 +71,7 @@ struct PeerContext *p2;
71 71
72struct GNUNET_TRANSPORT_TransmitHandle *th; 72struct GNUNET_TRANSPORT_TransmitHandle *th;
73 73
74struct TransportTestingHandle * tth; 74struct GNUNET_TRANSPORT_TESTING_handle * tth;
75 75
76char *cfg_file_p1; 76char *cfg_file_p1;
77 77
diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 730d7946c..68fac8e95 100644
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -54,7 +54,7 @@ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
54 54
55static struct PeerContext *p1; 55static struct PeerContext *p1;
56 56
57struct TransportTestingHandle * tth; 57struct GNUNET_TRANSPORT_TESTING_handle * tth;
58 58
59static int connected = GNUNET_NO; 59static int connected = GNUNET_NO;
60 60
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index 066e56d5b..44f050131 100644
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -55,7 +55,7 @@ static struct PeerContext *p2;
55 55
56static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; 56static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
57 57
58struct TransportTestingHandle * tth; 58struct GNUNET_TRANSPORT_TESTING_handle * tth;
59 59
60static int connected = GNUNET_NO; 60static int connected = GNUNET_NO;
61 61
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 45ce444f1..76d88ab84 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -27,10 +27,10 @@
27 27
28#include "transport-testing.h" 28#include "transport-testing.h"
29 29
30#define VERBOSE GNUNET_EXTRA_LOGGING 30#define VERBOSE GNUNET_YES
31 31
32struct PeerContext * 32struct PeerContext *
33find_peer_context_by_pc ( struct TransportTestingHandle *tth, 33find_peer_context_by_pc ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
34 struct PeerContext *p) 34 struct PeerContext *p)
35{ 35{
36 GNUNET_assert (tth != NULL); 36 GNUNET_assert (tth != NULL);
@@ -48,7 +48,7 @@ find_peer_context_by_pc ( struct TransportTestingHandle *tth,
48 48
49 49
50struct PeerContext * 50struct PeerContext *
51find_peer_context ( struct TransportTestingHandle *tth, 51find_peer_context ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
52 const struct GNUNET_PeerIdentity *peer) 52 const struct GNUNET_PeerIdentity *peer)
53{ 53{
54 GNUNET_assert (tth != NULL); 54 GNUNET_assert (tth != NULL);
@@ -65,7 +65,7 @@ find_peer_context ( struct TransportTestingHandle *tth,
65} 65}
66 66
67struct ConnectingContext * 67struct ConnectingContext *
68find_connecting_context ( struct TransportTestingHandle *tth, 68find_connecting_context ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
69 struct PeerContext *p1, 69 struct PeerContext *p1,
70 struct PeerContext * p2) 70 struct PeerContext * p2)
71{ 71{
@@ -243,7 +243,7 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
243 * @return the peer context 243 * @return the peer context
244 */ 244 */
245struct PeerContext * 245struct PeerContext *
246GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth, 246GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
247 const char *cfgname, 247 const char *cfgname,
248 int peer_id, 248 int peer_id,
249 GNUNET_TRANSPORT_ReceiveCallback rec, 249 GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -309,7 +309,7 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
309 * @param p the peer 309 * @param p the peer
310 */ 310 */
311void 311void
312GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth, 312GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
313 struct PeerContext *p) 313 struct PeerContext *p)
314{ 314{
315 GNUNET_assert (p != NULL); 315 GNUNET_assert (p != NULL);
@@ -359,7 +359,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
359 * @return connect context 359 * @return connect context
360 */ 360 */
361GNUNET_TRANSPORT_TESTING_ConnectRequest 361GNUNET_TRANSPORT_TESTING_ConnectRequest
362GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth, 362GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle * tth,
363 struct PeerContext *p1, 363 struct PeerContext *p1,
364 struct PeerContext *p2, 364 struct PeerContext *p2,
365 GNUNET_TRANSPORT_TESTING_connect_cb cb, 365 GNUNET_TRANSPORT_TESTING_connect_cb cb,
@@ -389,8 +389,8 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
389 GNUNET_CONTAINER_DLL_insert (tth->cc_head, tth->cc_tail, cc); 389 GNUNET_CONTAINER_DLL_insert (tth->cc_head, tth->cc_tail, cc);
390 390
391 cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc); 391 cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc);
392 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing", 392 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
393 "connect request %X!\n", cc); 393 "New connect request %X\n", cc);
394 394
395 return cc; 395 return cc;
396} 396}
@@ -401,7 +401,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
401 * @param cc a connect request handle 401 * @param cc a connect request handle
402 */ 402 */
403void GNUNET_TRANSPORT_TESTING_connect_peers_cancel 403void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
404 (struct TransportTestingHandle * tth, 404 (struct GNUNET_TRANSPORT_TESTING_handle * tth,
405 GNUNET_TRANSPORT_TESTING_ConnectRequest ccr) 405 GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
406{ 406{
407 struct ConnectingContext *cc = ccr; 407 struct ConnectingContext *cc = ccr;
@@ -425,7 +425,7 @@ void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
425 * @param tth transport testing handle 425 * @param tth transport testing handle
426 */ 426 */
427void 427void
428GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth) 428GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle * tth)
429{ 429{
430 struct ConnectingContext *cc = tth->cc_head; 430 struct ConnectingContext *cc = tth->cc_head;
431 struct ConnectingContext *ct = NULL; 431 struct ConnectingContext *ct = NULL;
@@ -460,10 +460,10 @@ GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth)
460 * Initialize the transport testing 460 * Initialize the transport testing
461 * @return transport testing handle 461 * @return transport testing handle
462 */ 462 */
463struct TransportTestingHandle * 463struct GNUNET_TRANSPORT_TESTING_handle *
464GNUNET_TRANSPORT_TESTING_init () 464GNUNET_TRANSPORT_TESTING_init ()
465{ 465{
466 struct TransportTestingHandle * tth = GNUNET_malloc (sizeof (struct TransportTestingHandle)); 466 struct GNUNET_TRANSPORT_TESTING_handle * tth = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
467 467
468 return tth; 468 return tth;
469} 469}
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 94cfaf59a..ed9238ecb 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -58,7 +58,7 @@ typedef void (*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext * p1,
58 void *cls); 58 void *cls);
59 59
60 60
61struct TransportTestingHandle; 61struct GNUNET_TRANSPORT_TESTING_handle;
62 62
63/** 63/**
64 * Context for a single peer 64 * Context for a single peer
@@ -68,7 +68,7 @@ struct PeerContext
68 struct PeerContext * next; 68 struct PeerContext * next;
69 struct PeerContext * prev; 69 struct PeerContext * prev;
70 70
71 struct TransportTestingHandle * tth; 71 struct GNUNET_TRANSPORT_TESTING_handle * tth;
72 72
73 struct GNUNET_CONFIGURATION_Handle *cfg; 73 struct GNUNET_CONFIGURATION_Handle *cfg;
74 74
@@ -113,7 +113,7 @@ struct ConnectingContext
113 int p2_c; 113 int p2_c;
114}; 114};
115 115
116struct TransportTestingHandle 116struct GNUNET_TRANSPORT_TESTING_handle
117{ 117{
118 struct ConnectingContext * cc_head; 118 struct ConnectingContext * cc_head;
119 struct ConnectingContext * cc_tail; 119 struct ConnectingContext * cc_tail;
@@ -134,7 +134,7 @@ struct TransportTestingHandle
134 * @return the peer context 134 * @return the peer context
135 */ 135 */
136struct PeerContext * 136struct PeerContext *
137GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth, 137GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
138 const char *cfgname, 138 const char *cfgname,
139 int peer_id, 139 int peer_id,
140 GNUNET_TRANSPORT_ReceiveCallback rec, 140 GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -150,7 +150,7 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
150 */ 150 */
151 151
152void 152void
153GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth, 153GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
154 struct PeerContext *pc); 154 struct PeerContext *pc);
155 155
156 156
@@ -165,7 +165,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
165 * @return a connect request handle 165 * @return a connect request handle
166 */ 166 */
167GNUNET_TRANSPORT_TESTING_ConnectRequest 167GNUNET_TRANSPORT_TESTING_ConnectRequest
168GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth, 168GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle * tth,
169 struct PeerContext *p1, 169 struct PeerContext *p1,
170 struct PeerContext *p2, 170 struct PeerContext *p2,
171 GNUNET_TRANSPORT_TESTING_connect_cb cb, 171 GNUNET_TRANSPORT_TESTING_connect_cb cb,
@@ -177,7 +177,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
177 * @param cc a connect request handle 177 * @param cc a connect request handle
178 */ 178 */
179void 179void
180GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct TransportTestingHandle *, 180GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_TRANSPORT_TESTING_handle *,
181 void *cc); 181 void *cc);
182 182
183/** 183/**
@@ -185,13 +185,13 @@ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct TransportTestingHandle *,
185 * @param tth transport testing handle 185 * @param tth transport testing handle
186 */ 186 */
187void 187void
188GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth); 188GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle * tth);
189 189
190/** 190/**
191 * Initialize the transport testing 191 * Initialize the transport testing
192 * @return transport testing handle 192 * @return transport testing handle
193 */ 193 */
194struct TransportTestingHandle * 194struct GNUNET_TRANSPORT_TESTING_handle *
195GNUNET_TRANSPORT_TESTING_init (); 195GNUNET_TRANSPORT_TESTING_init ();
196 196
197/* 197/*