[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21138 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21138 - gnunet/src/util |
Date: |
Tue, 24 Apr 2012 15:31:29 +0200 |
Author: grothoff
Date: 2012-04-24 15:31:29 +0200 (Tue, 24 Apr 2012)
New Revision: 21138
Modified:
gnunet/src/util/client.c
gnunet/src/util/connection.c
Log:
-minor fixes
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2012-04-24 13:24:53 UTC (rev 21137)
+++ gnunet/src/util/client.c 2012-04-24 13:31:29 UTC (rev 21138)
@@ -465,6 +465,7 @@
void *receive_handler_cls;
GNUNET_assert (GNUNET_NO == client->msg_complete);
+ GNUNET_assert (GNUNET_YES == client->in_receive);
client->in_receive = GNUNET_NO;
if ((0 == available) || (NULL == client->connection) || (0 != errCode))
{
@@ -572,9 +573,9 @@
}
else
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "calling GNUNET_CONNECTION_receive\n");
GNUNET_assert (GNUNET_NO == client->in_receive);
client->in_receive = GNUNET_YES;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "calling GNUNET_CONNECTION_receive\n");
GNUNET_CONNECTION_receive (client->connection,
GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
timeout, &receive_helper, client);
}
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2012-04-24 13:24:53 UTC (rev 21137)
+++ gnunet/src/util/connection.c 2012-04-24 13:31:29 UTC (rev 21138)
@@ -1064,7 +1064,7 @@
*
* @param connection connection handle
* @param max maximum number of bytes to read
- * @param timeout maximum amount of time to wait (use -1 for "forever")
+ * @param timeout maximum amount of time to wait
* @param receiver function to call with received data
* @param receiver_cls closure for receiver
*/
@@ -1076,6 +1076,7 @@
{
GNUNET_assert ((GNUNET_SCHEDULER_NO_TASK == connection->read_task) &&
(NULL == connection->receiver));
+ GNUNET_assert (NULL != receiver);
connection->receiver = receiver;
connection->receiver_cls = receiver_cls;
connection->receive_timeout = GNUNET_TIME_relative_to_absolute (timeout);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21138 - gnunet/src/util,
gnunet <=