dhtlog updates

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

diff --git a/src/util/server.c b/src/util/server.c
index c31168e8c47015fe39834c7a8019d0675ce7009e..6a59ce86688d628741e942f7095e86a4946861ad 100644 (file)
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -121,11 +121,6 @@ struct GNUNET_SERVER_Handle
    */
   struct GNUNET_TIME_Relative idle_timeout;
 
-  /**
-   * maximum write buffer size for accepted sockets
-   */
-  size_t maxbuf;
-
   /**
    * Task scheduled to do the listening.
    */
@@ -273,8 +268,7 @@ process_listen_socket (void *cls,
           sock =
             GNUNET_CONNECTION_create_from_accept (tc->sched, server->access,
                                                   server->access_cls,
-                                                  server->listen_sockets[i],
-                                                  server->maxbuf);
+                                                  server->listen_sockets[i]);
           if (sock != NULL)
             {
 #if DEBUG_SERVER
@@ -396,7 +390,6 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
  * @param access function for access control
  * @param access_cls closure for access
  * @param lsocks NULL-terminated array of listen sockets
- * @param maxbuf maximum write buffer size for accepted sockets
  * @param idle_timeout after how long should we timeout idle connections?
  * @param require_found if YES, connections sending messages of unknown type
  *        will be closed
@@ -407,7 +400,6 @@ struct GNUNET_SERVER_Handle *
 GNUNET_SERVER_create_with_sockets (struct GNUNET_SCHEDULER_Handle *sched,
                                   GNUNET_CONNECTION_AccessCheck access, void *access_cls,
                                   struct GNUNET_NETWORK_Handle **lsocks,
-                                  size_t maxbuf,
                                   struct GNUNET_TIME_Relative
                                   idle_timeout,
                                   int require_found)
@@ -418,7 +410,6 @@ GNUNET_SERVER_create_with_sockets (struct GNUNET_SCHEDULER_Handle *sched,
 
   ret = GNUNET_malloc (sizeof (struct GNUNET_SERVER_Handle));
   ret->sched = sched;
-  ret->maxbuf = maxbuf;
   ret->idle_timeout = idle_timeout;
   ret->listen_sockets = lsocks;
   ret->access = access;
@@ -451,7 +442,6 @@ GNUNET_SERVER_create_with_sockets (struct GNUNET_SCHEDULER_Handle *sched,
  * @param access_cls closure for access
  * @param serverAddr address to listen on (including port), NULL terminated array
  * @param socklen length of serverAddr
- * @param maxbuf maximum write buffer size for accepted sockets
  * @param idle_timeout after how long should we timeout idle connections?
  * @param require_found if YES, connections sending messages of unknown type
  *        will be closed
@@ -464,7 +454,6 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched,
                       void *access_cls,
                       struct sockaddr *const *serverAddr,
                       const socklen_t * socklen,
-                      size_t maxbuf,
                       struct GNUNET_TIME_Relative
                       idle_timeout, int require_found)
 {
@@ -503,7 +492,6 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched,
   return GNUNET_SERVER_create_with_sockets (sched,
                                            access, access_cls,
                                            lsocks,
-                                           maxbuf, 
                                            idle_timeout,
                                            require_found);
 }
@@ -629,6 +617,13 @@ GNUNET_SERVER_inject (struct GNUNET_SERVER_Handle *server,
             {
               if ((mh->expected_size != 0) && (mh->expected_size != size))
                 {
+#if DEBUG_SERVER
+                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                             "Expected %u bytes for message of type %u, got %u\n",
+                             mh->expected_size,
+                             mh->type,
+                             size);
+#endif
                   GNUNET_break_op (0);
                   return GNUNET_SYSERR;
                 }
@@ -701,7 +696,7 @@ process_mst (struct GNUNET_SERVER_Client *client,
                      "Server re-enters receive loop.\n");
 #endif
          GNUNET_CONNECTION_receive (client->connection,
-                                    GNUNET_SERVER_MAX_MESSAGE_SIZE,
+                                    GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                                     client->server->idle_timeout, 
                                     &process_incoming, client);
          break;
@@ -811,7 +806,7 @@ restart_processing (void *cls,
 #endif
       client->receive_pending = GNUNET_YES;
       GNUNET_CONNECTION_receive (client->connection,
-                                GNUNET_SERVER_MAX_MESSAGE_SIZE,
+                                GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                                 client->server->idle_timeout, &process_incoming, client);
       return;
     }
@@ -877,8 +872,7 @@ GNUNET_SERVER_connect_socket (struct
 
   client = GNUNET_malloc (sizeof (struct GNUNET_SERVER_Client));
   client->connection = connection;
-  client->mst = GNUNET_SERVER_mst_create (GNUNET_SERVER_MAX_MESSAGE_SIZE,
-                                         &client_message_tokenizer_callback,
+  client->mst = GNUNET_SERVER_mst_create (&client_message_tokenizer_callback,
                                          server);
   client->reference_count = 1;
   client->server = server;
@@ -887,7 +881,7 @@ GNUNET_SERVER_connect_socket (struct
   server->clients = client;
   client->receive_pending = GNUNET_YES;
   GNUNET_CONNECTION_receive (client->connection,
-                            GNUNET_SERVER_MAX_MESSAGE_SIZE,
+                            GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                             server->idle_timeout, &process_incoming, client);
   return client;
 }