more fixes for #2570

diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c
index 3dbdda256a86d23356c0ea710f4687aa36de0214..e7e37792a8c62622c0a2da7607acca4ecccbcc83 100644 (file)
--- a/src/stream/perf_stream_api.c
+++ b/src/stream/perf_stream_api.c
@@ -588,6 +588,15 @@ stream_listen_cb (void *cls, struct GNUNET_STREAM_Socket *socket,
 {
   struct PeerData *pdata = cls;
 
+  
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (NULL != socket);
   GNUNET_assert (pdata == &peer_data[1]);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer connected: %s\n",

diff --git a/src/stream/test_stream_2peers.c b/src/stream/test_stream_2peers.c
index 86d1a84ad008cfa1ba2539be69a539a9c0cf1352..c517cc2b1d24d1053452a80e180df95f4637a98f 100644 (file)
--- a/src/stream/test_stream_2peers.c
+++ b/src/stream/test_stream_2peers.c
@@ -427,7 +427,14 @@ stream_listen_cb (void *cls,
                   struct GNUNET_STREAM_Socket *socket,
                   const struct GNUNET_PeerIdentity *initiator)
 {
-  GNUNET_assert (NULL != socket);
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (NULL != initiator);
   GNUNET_assert (socket != peer2.socket);
   GNUNET_assert (0 == memcmp (initiator, &peer2.our_id, 

diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c
index 2d14acfe30ee43aa215e24a315c840fa0cc5c027..2502615c2e65b0a035552bb6d5c1976a15f6a2d1 100644 (file)
--- a/src/stream/test_stream_2peers_halfclose.c
+++ b/src/stream/test_stream_2peers_halfclose.c
@@ -661,15 +661,19 @@ stream_listen_cb (void *cls,
                   struct GNUNET_STREAM_Socket *socket,
                   const struct GNUNET_PeerIdentity *initiator)
 {
-  GNUNET_assert (NULL != socket);
-  GNUNET_assert (NULL != initiator);
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (socket != peer1.socket);
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "%s: Peer connected: %s\n",
               GNUNET_i2s (&peer2.our_id),
               GNUNET_i2s(initiator));
-
   peer2.socket = socket;
   /* FIXME: reading should be done right now instead of a scheduled call */
   read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);

diff --git a/src/stream/test_stream_big.c b/src/stream/test_stream_big.c
index 19c7e571a7ef22c4aef8a16101830e646556d706..05da826913eb8ca55798c9bf7c51de6f94def5de 100644 (file)
--- a/src/stream/test_stream_big.c
+++ b/src/stream/test_stream_big.c
@@ -302,6 +302,14 @@ stream_listen_cb (void *cls,
                  struct GNUNET_STREAM_Socket *socket,
                  const struct GNUNET_PeerIdentity *initiator)
 {
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (NULL != socket);
   GNUNET_assert (socket != peer1.socket);
 

diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c
index 699bc8032a3e3648b32512d62daa7901c9aa4d3a..3286ade5fdd35999d898bd4e3f6f0fc3a50c17e1 100644 (file)
--- a/src/stream/test_stream_local.c
+++ b/src/stream/test_stream_local.c
@@ -320,6 +320,14 @@ stream_listen_cb (void *cls,
 {
   struct PeerData *peer=cls;
 
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (NULL != socket);
   GNUNET_assert (socket != peer1.socket);
   GNUNET_assert (&peer2 == peer);

diff --git a/src/stream/test_stream_sequence_wraparound.c b/src/stream/test_stream_sequence_wraparound.c
index 8f35a41d346b64cd50a283d69dc1bda04a4d7d92..f231716614dfddafff3fc101ee6dff245f147279 100644 (file)
--- a/src/stream/test_stream_sequence_wraparound.c
+++ b/src/stream/test_stream_sequence_wraparound.c
@@ -302,6 +302,14 @@ stream_listen_cb (void *cls,
            struct GNUNET_STREAM_Socket *socket,
            const struct GNUNET_PeerIdentity *initiator)
 {
+  if ((NULL == socket) || (NULL == initiator))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
+    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+      GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_OK;
+  }
   GNUNET_assert (NULL != socket);
   GNUNET_assert (socket != peer1.socket);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,