summaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_blacklisting.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_api_blacklisting.c')
-rw-r--r--src/transport/test_transport_api_blacklisting.c63
1 files changed, 9 insertions, 54 deletions
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index 72f8a71a3..a2add5957 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -117,42 +117,9 @@ notify_receive (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Unexpectedly even received the message despite blacklist\n");
- GNUNET_SCHEDULER_shutdown ();
-}
-
-
-static size_t
-notify_ready (void *cls,
- size_t size,
- void *buf)
-{
- struct GNUNET_MessageHeader *hdr;
-
- th = NULL;
- if (NULL == buf)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Timeout occurred while waiting for transmit_ready\n");
- GNUNET_SCHEDULER_shutdown ();
- return 0;
- }
- GNUNET_assert (size >= TEST_MESSAGE_SIZE);
- hdr = buf;
- hdr->size = htons (TEST_MESSAGE_SIZE);
- hdr->type = htons (TEST_MESSAGE_TYPE);
- return TEST_MESSAGE_SIZE;
-}
-
-
-static void
-sendtask (void *cls)
-{
- th = GNUNET_TRANSPORT_notify_transmit_ready (ccc->p[1]->th,
- &ccc->p[0]->id,
- TEST_MESSAGE_SIZE,
- TIMEOUT,
- &notify_ready,
- ccc->p[0]);
+ connected = GNUNET_YES;
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ end (NULL);
}
@@ -172,22 +139,6 @@ notify_connect (void *cls,
}
-static void
-notify_disconnect (void *cls,
- struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
- const struct GNUNET_PeerIdentity *other)
-{
- GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
- me,
- other);
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
-}
-
-
static int
blacklist_cb (void *cls,
const struct GNUNET_PeerIdentity *pid)
@@ -244,13 +195,17 @@ int
main (int argc,
char *argv[])
{
+ struct GNUNET_TRANSPORT_TESTING_SendClosure sc = {
+ .num_messages = 1
+ };
struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext my_ccc = {
.pre_connect_task = &start_blacklist,
- .connect_continuation = &sendtask,
+ .connect_continuation = &GNUNET_TRANSPORT_TESTING_simple_send,
+ .connect_continuation_cls = &sc,
.config_file = "test_transport_api_data.conf",
.rec = &notify_receive,
.nc = &notify_connect,
- .nd = &notify_disconnect,
+ .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
.shutdown_task = &custom_shutdown,
.timeout = TIMEOUT,
.bi_directional = GNUNET_YES