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

[gnunet]

Author: harsha
Date: 2012-05-14 15:04:48 +0200 (Mon, 14 May 2012)
New Revision: 21475

Modified:
   gnunet/src/stream/stream_api.c
   gnunet/src/stream/test_stream_2peers_halfclose.c
Log:
warnings

Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c      2012-05-14 12:02:54 UTC (rev 21474)
+++ gnunet/src/stream/stream_api.c      2012-05-14 13:04:48 UTC (rev 21475)
@@ -2920,8 +2920,16 @@
 {
   struct MessageQueue *head;
 
-  GNUNET_break (NULL == socket->read_handle);
-  GNUNET_break (NULL == socket->write_handle);
+  if (NULL != socket->read_handle)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+        "Closing STREAM socket when a read handle is pending\n");
+  }
+  if (NULL != socket->write_handle)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+        "Closing STREAM socket when a write handle is pending\n");
+  }
 
   if (socket->read_task_id != GNUNET_SCHEDULER_NO_TASK)
   {

Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c    2012-05-14 12:02:54 UTC 
(rev 21474)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c    2012-05-14 13:04:48 UTC 
(rev 21475)
@@ -338,6 +338,8 @@
     case PEER1_WRITE:
       GNUNET_assert (0);
     case PEER1_WRITE_SHUTDOWN:
+      GNUNET_assert (cls == &peer1);
+      GNUNET_assert (SHUT_WR == operation);
       peer1.test_ok = GNUNET_YES;
       /* Peer2 should read with error */
       peer2.bytes_read = 0;