[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24171 - in gnunet/src: include stream
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24171 - in gnunet/src: include stream |
Date: |
Thu, 4 Oct 2012 11:11:11 +0200 |
Author: harsha
Date: 2012-10-04 11:11:11 +0200 (Thu, 04 Oct 2012)
New Revision: 24171
Modified:
gnunet/src/include/gnunet_stream_lib.h
gnunet/src/stream/stream_api.c
Log:
doc
Modified: gnunet/src/include/gnunet_stream_lib.h
===================================================================
--- gnunet/src/include/gnunet_stream_lib.h 2012-10-04 08:53:20 UTC (rev
24170)
+++ gnunet/src/include/gnunet_stream_lib.h 2012-10-04 09:11:11 UTC (rev
24171)
@@ -349,9 +349,11 @@
* @param proc function to call with data (once only)
* @param proc_cls the closure for proc
*
- * @return handle to cancel the operation; if the stream has been shutdown for
- * this type of opeartion then the DataProcessor is immediately
- * called with GNUNET_STREAM_SHUTDOWN as status and NULL if returned
+ * @return handle to cancel the operation; NULL is returned if: the stream has
+ * been shutdown for this type of opeartion (the DataProcessor is
+ * immediately called with GNUNET_STREAM_SHUTDOWN as status) OR
another
+ * read handle is present (only one read handle per socket is present
+ * at any time)
*/
struct GNUNET_STREAM_IOReadHandle *
GNUNET_STREAM_read (struct GNUNET_STREAM_Socket *socket,
Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c 2012-10-04 08:53:20 UTC (rev 24170)
+++ gnunet/src/stream/stream_api.c 2012-10-04 09:11:11 UTC (rev 24171)
@@ -2766,9 +2766,7 @@
{
struct GNUNET_STREAM_Socket *socket = tunnel_ctx;
- if (tunnel != socket->tunnel)
- return;
-
+ GNUNET_assert (tunnel == socket->tunnel);
GNUNET_break_op(0);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"%s: Peer %s has terminated connection abruptly\n",
@@ -3376,9 +3374,11 @@
* @param proc function to call with data (once only)
* @param proc_cls the closure for proc
*
- * @return handle to cancel the operation; if the stream has been shutdown for
- * this type of opeartion then the DataProcessor is immediately
- * called with GNUNET_STREAM_SHUTDOWN as status and NULL if returned
+ * @return handle to cancel the operation; NULL is returned if: the stream has
+ * been shutdown for this type of opeartion (the DataProcessor is
+ * immediately called with GNUNET_STREAM_SHUTDOWN as status) OR
another
+ * read handle is present (only one read handle per socket is present
+ * at any time)
*/
struct GNUNET_STREAM_IOReadHandle *
GNUNET_STREAM_read (struct GNUNET_STREAM_Socket *socket,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24171 - in gnunet/src: include stream,
gnunet <=