aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/transport/Makefile.am9
-rw-r--r--src/transport/test_transport_api.c3
-rw-r--r--src/transport/transport-testing.c12
-rw-r--r--src/transport/transport-testing.h6
4 files changed, 20 insertions, 10 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 5ea280319..310b65b2f 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -356,6 +356,15 @@ test_transport_api_disconnect_LDADD = \
356 $(top_builddir)/src/testing/libgnunettesting.la \ 356 $(top_builddir)/src/testing/libgnunettesting.la \
357 $(top_builddir)/src/util/libgnunetutil.la 357 $(top_builddir)/src/util/libgnunetutil.la
358 358
359test_transport_startonly_SOURCES = \
360 test_transport_startonly.c
361test_transport_startonly_LDADD = \
362 $(top_builddir)/src/transport/libgnunettransport.la \
363 $(top_builddir)/src/hello/libgnunethello.la \
364 $(top_builddir)/src/statistics/libgnunetstatistics.la \
365 $(top_builddir)/src/testing/libgnunettesting.la \
366 $(top_builddir)/src/util/libgnunetutil.la \
367 $(top_builddir)/src/transport/libgnunettransporttesting.la
359 368
360test_transport_ats_SOURCES = \ 369test_transport_ats_SOURCES = \
361 test_transport_ats.c $(TRANSPORT_ATS_SRC) 370 test_transport_ats.c $(TRANSPORT_ATS_SRC)
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 004c8e676..303709136 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -104,7 +104,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
104{ 104{
105 die_task = GNUNET_SCHEDULER_NO_TASK; 105 die_task = GNUNET_SCHEDULER_NO_TASK;
106 106
107 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Stopping peers\n"); 107 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
108 108
109 if (send_task != GNUNET_SCHEDULER_NO_TASK) 109 if (send_task != GNUNET_SCHEDULER_NO_TASK)
110 GNUNET_SCHEDULER_cancel (send_task); 110 GNUNET_SCHEDULER_cancel (send_task);
@@ -122,7 +122,6 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
122 GNUNET_TRANSPORT_TESTING_stop_peer (p2); 122 GNUNET_TRANSPORT_TESTING_stop_peer (p2);
123 123
124 ok = GNUNET_SYSERR; 124 ok = GNUNET_SYSERR;
125 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Stopping peers END\n");
126} 125}
127 126
128 127
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 18a002d02..61c392d77 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -266,8 +266,8 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct PeerContext *p)
266 266
267 if (p->cfg != NULL) 267 if (p->cfg != NULL)
268 GNUNET_CONFIGURATION_destroy (p->cfg); 268 GNUNET_CONFIGURATION_destroy (p->cfg);
269
270 GNUNET_free (p); 269 GNUNET_free (p);
270 p = NULL;
271} 271}
272 272
273/** 273/**
@@ -317,13 +317,9 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
317} 317}
318 318
319/** 319/**
320 * Cancels a peer connect request 320 * Cancel the request to connect two peers
321 * before. 321 * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
322 * @param p1 peer 1 322 * @param cc a connect request handle
323 * @param p2 peer 2
324 * @param cb the callback to call
325 * @param cb_cls callback cls
326 * @return connect context
327 */ 323 */
328void 324void
329GNUNET_TRANSPORT_TESTING_connect_peers_cancel (GNUNET_TRANSPORT_TESTING_ConnectRequest ccr) 325GNUNET_TRANSPORT_TESTING_connect_peers_cancel (GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 672a435aa..3e5486eb7 100644
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -102,6 +102,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct PeerContext *pc);
102 * @param p2 peer 2 102 * @param p2 peer 2
103 * @param cb the callback to call 103 * @param cb the callback to call
104 * @param cb_cls callback cls 104 * @param cb_cls callback cls
105 * @return a connect request handle
105 */ 106 */
106GNUNET_TRANSPORT_TESTING_ConnectRequest 107GNUNET_TRANSPORT_TESTING_ConnectRequest
107GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1, 108GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
@@ -109,6 +110,11 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
109 GNUNET_TRANSPORT_TESTING_connect_cb cb, 110 GNUNET_TRANSPORT_TESTING_connect_cb cb,
110 void *cls); 111 void *cls);
111 112
113/**
114 * Cancel the request to connect two peers
115 * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
116 * @param cc a connect request handle
117 */
112void 118void
113GNUNET_TRANSPORT_TESTING_connect_peers_cancel (void *cc); 119GNUNET_TRANSPORT_TESTING_connect_peers_cancel (void *cc);
114 120