diff options
Diffstat (limited to 'src/util/server.c')
-rw-r--r-- | src/util/server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/util/server.c b/src/util/server.c index b2264479a..05463e1cb 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2009, 2012 Christian Grothoff (and other contributing authors) | 3 | (C) 2009-2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
7 | by the Free Software Foundation; either version 2, or (at your | 7 | by the Free Software Foundation; either version 3, or (at your |
8 | option) any later version. | 8 | option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
@@ -1032,8 +1032,8 @@ process_mst (struct GNUNET_SERVER_Client *client, int ret) | |||
1032 | if (GNUNET_OK == ret) | 1032 | if (GNUNET_OK == ret) |
1033 | { | 1033 | { |
1034 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1034 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1035 | "Server re-enters receive loop, timeout: %llu.\n", | 1035 | "Server re-enters receive loop, timeout: %s.\n", |
1036 | client->idle_timeout.rel_value); | 1036 | GNUNET_STRINGS_relative_time_to_string (client->idle_timeout, GNUNET_YES)); |
1037 | client->receive_pending = GNUNET_YES; | 1037 | client->receive_pending = GNUNET_YES; |
1038 | GNUNET_CONNECTION_receive (client->connection, | 1038 | GNUNET_CONNECTION_receive (client->connection, |
1039 | GNUNET_SERVER_MAX_MESSAGE_SIZE - 1, | 1039 | GNUNET_SERVER_MAX_MESSAGE_SIZE - 1, |
@@ -1094,7 +1094,7 @@ process_incoming (void *cls, const void *buf, size_t available, | |||
1094 | if ((NULL == buf) && (0 == available) && (NULL == addr) && (0 == errCode) && | 1094 | if ((NULL == buf) && (0 == available) && (NULL == addr) && (0 == errCode) && |
1095 | (GNUNET_YES != client->shutdown_now) && (NULL != server) && | 1095 | (GNUNET_YES != client->shutdown_now) && (NULL != server) && |
1096 | (GNUNET_YES == GNUNET_CONNECTION_check (client->connection)) && | 1096 | (GNUNET_YES == GNUNET_CONNECTION_check (client->connection)) && |
1097 | (end.abs_value > now.abs_value)) | 1097 | (end.abs_value_us > now.abs_value_us)) |
1098 | { | 1098 | { |
1099 | /* wait longer, timeout changed (i.e. due to us sending) */ | 1099 | /* wait longer, timeout changed (i.e. due to us sending) */ |
1100 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1100 | LOG (GNUNET_ERROR_TYPE_DEBUG, |