dhtlog updates

[oweals/gnunet.git] / src / util / client.c

diff --git a/src/util/client.c b/src/util/client.c
index c7853d146cdcea055b90e93237469d911d5c23b4..3431ac44855fab17542c16e60ff1887d4d91ff22 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -290,8 +290,7 @@ do_connect (struct GNUNET_SCHEDULER_Handle *sched,
        {
          sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (sched,
                                                                    cfg,
-                                                                   unixpath,
-                                                                   GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                                                                   unixpath);
          GNUNET_free (unixpath);
          if (sock != NULL)
            return sock;
@@ -327,8 +326,7 @@ do_connect (struct GNUNET_SCHEDULER_Handle *sched,
   sock = GNUNET_CONNECTION_create_from_connect (sched,
                                                 cfg,
                                                 hostname,
-                                                port,
-                                                GNUNET_SERVER_MAX_MESSAGE_SIZE);
+                                                port);
   GNUNET_free (hostname);
   return sock;
 }
@@ -527,7 +525,8 @@ receive_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 #if DEBUG_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Received message of size %u\n",
+             "Received message of type %u and size %u\n",
+             ntohs (cmsg->type),
              msize);
 #endif
   sock->receive_task = GNUNET_SCHEDULER_NO_TASK;
@@ -579,7 +578,7 @@ GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock,
       GNUNET_assert (sock->in_receive == GNUNET_NO);
       sock->in_receive = GNUNET_YES;
       GNUNET_CONNECTION_receive (sock->sock,
-                                 GNUNET_SERVER_MAX_MESSAGE_SIZE,
+                                 GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                                  timeout, &receive_helper, sock);
     }
 }
@@ -910,7 +909,7 @@ GNUNET_CLIENT_notify_transmit_ready_cancel (struct
     }
   else
     {
-      GNUNET_break (NULL != th->th);
+      GNUNET_assert (NULL != th->th);
       GNUNET_CONNECTION_notify_transmit_ready_cancel (th->th);
     }
   th->sock->th = NULL;