[GNUnet-SVN] r24142 - gnunet/src/stream

[gnunet]

Author: harsha
Date: 2012-09-30 16:02:30 +0200 (Sun, 30 Sep 2012)
New Revision: 24142

Modified:
   gnunet/src/stream/test_stream_2peers_halfclose.c
   gnunet/src/stream/test_stream_big.c
   gnunet/src/stream/test_stream_local.c
   gnunet/src/stream/test_stream_sequence_wraparound.c
Log:
fixes for #2570

Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c    2012-09-30 12:34:25 UTC 
(rev 24141)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c    2012-09-30 14:02:30 UTC 
(rev 24142)
@@ -334,7 +334,10 @@
     GNUNET_STREAM_close (peer2.socket);
   if (GNUNET_SCHEDULER_NO_TASK != abort_task)
     GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_TESTBED_operation_done (peer2.op);
+  if (NULL != peer2.op)
+    GNUNET_TESTBED_operation_done (peer2.op);
+  else
+    GNUNET_SCHEDULER_shutdown (); /* For shutting down testbed */
 }
 
 
@@ -697,7 +700,10 @@
   {
     lsocket = op_result;
     GNUNET_STREAM_listen_close (lsocket);
-    GNUNET_TESTBED_operation_done (peer1.op);
+    if (NULL != peer1.op)
+      GNUNET_TESTBED_operation_done (peer1.op);
+    else
+      GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if (&peer1 == cls)

Modified: gnunet/src/stream/test_stream_big.c
===================================================================
--- gnunet/src/stream/test_stream_big.c 2012-09-30 12:34:25 UTC (rev 24141)
+++ gnunet/src/stream/test_stream_big.c 2012-09-30 14:02:30 UTC (rev 24142)
@@ -90,7 +90,8 @@
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)

Modified: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c       2012-09-30 12:34:25 UTC (rev 
24141)
+++ gnunet/src/stream/test_stream_local.c       2012-09-30 14:02:30 UTC (rev 
24142)
@@ -168,7 +168,8 @@
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)

Modified: gnunet/src/stream/test_stream_sequence_wraparound.c
===================================================================
--- gnunet/src/stream/test_stream_sequence_wraparound.c 2012-09-30 12:34:25 UTC 
(rev 24141)
+++ gnunet/src/stream/test_stream_sequence_wraparound.c 2012-09-30 14:02:30 UTC 
(rev 24142)
@@ -95,7 +95,8 @@
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_STREAM_close (peer1.socket);
+  if (NULL != peer1.socket)
+    GNUNET_STREAM_close (peer1.socket);
   if (NULL != peer2.socket)
     GNUNET_STREAM_close (peer2.socket);
   if (NULL != peer2_listen_socket)