next one

[oweals/gnunet.git] / src / stream / test_stream_sequence_wraparound.c

diff --git a/src/stream/test_stream_sequence_wraparound.c b/src/stream/test_stream_sequence_wraparound.c
index b00de0b1c28e52aaaf8d2fb7c15726ef47d7ffc1..3ea6596bd51af4cbbc95dfc8c609c395ecd22be1 100644 (file)
--- a/src/stream/test_stream_sequence_wraparound.c
+++ b/src/stream/test_stream_sequence_wraparound.c
@@ -313,28 +313,22 @@ stream_listen_cb (void *cls,
 
 
 /**
- * Task for connecting the peer to stream as client
- *
- * @param cls PeerData
- * @param tc the TaskContext
+ * Listen success callback; connects a peer to stream as client
  */
 static void
-stream_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stream_connect (void)
 {
-  struct PeerData *peer = cls;
-
-  GNUNET_assert (&peer1 == peer);
-  /* Connect to stream */
-  peer->socket = GNUNET_STREAM_open (config,
-                                     &self_id,         /* Null for local peer? */
-                                     10,           /* App port */
-                                     &stream_open_cb,
-                                     &peer1,
-                                     GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER,
-                                     UINT32_MAX - GNUNET_CRYPTO_random_u32
-                                     (GNUNET_CRYPTO_QUALITY_WEAK, 64),
-                                     GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer->socket);
+  peer1.socket = 
+    GNUNET_STREAM_open (config,
+                        &self_id,         /* Null for local peer? */
+                        10,           /* App port */
+                        &stream_open_cb,
+                        &peer1,
+                        GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER,
+                        UINT32_MAX - GNUNET_CRYPTO_random_u32
+                        (GNUNET_CRYPTO_QUALITY_WEAK, 64),
+                        GNUNET_STREAM_OPTION_END);
+  GNUNET_assert (NULL != peer1.socket);
 }
 
 
@@ -349,16 +343,20 @@ run (void *cls,
   config = cfg;
   self = peer;
   (void) GNUNET_TESTING_peer_get_identity (peer, &self_id);
-  peer2_listen_socket = GNUNET_STREAM_listen (config,
-                                              10, /* App port */
-                                              &stream_listen_cb,
-                                              NULL,
-                                              GNUNET_STREAM_OPTION_END);
+  peer2_listen_socket = 
+    GNUNET_STREAM_listen (config,
+                          10, /* App port */
+                          &stream_listen_cb,
+                          NULL,
+                          GNUNET_STREAM_OPTION_LISTEN_TIMEOUT,
+                          60 * 1000,
+                          GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
+                          &stream_connect,
+                          GNUNET_STREAM_OPTION_END);
   GNUNET_assert (NULL != peer2_listen_socket);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS(2), &stream_connect, &peer1);
   abort_task =
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
+                                  (GNUNET_TIME_UNIT_SECONDS, 100), &do_abort,
                                   NULL);
 }