From 6872f3488097476c4c883248859a6f710052104b Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Thu, 4 Oct 2012 09:11:11 +0000 Subject: [PATCH] doc --- src/include/gnunet_stream_lib.h | 8 +++++--- src/stream/stream_api.c | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/include/gnunet_stream_lib.h b/src/include/gnunet_stream_lib.h index b1518d9ba..47486d76b 100644 --- a/src/include/gnunet_stream_lib.h +++ b/src/include/gnunet_stream_lib.h @@ -349,9 +349,11 @@ typedef size_t (*GNUNET_STREAM_DataProcessor) (void *cls, * @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, diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c index e3ce7f88b..5c72d7437 100644 --- a/src/stream/stream_api.c +++ b/src/stream/stream_api.c @@ -2766,9 +2766,7 @@ tunnel_cleaner (void *cls, { 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 @@ GNUNET_STREAM_write (struct GNUNET_STREAM_Socket *socket, * @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, -- 2.25.1