/*
This file is part of GNUnet.
- Copyright (C) 2009-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "util-server", __VA_ARGS__)
-#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util-server", syscall)
-#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util-server", syscall, filename)
/**
*
* @param cls handle to our server for which we are processing the listen
* socket
- * @param tc reason why we are running right now
*/
static void
-process_listen_socket (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_listen_socket (void *cls)
{
struct GNUNET_SERVER_Handle *server = cls;
+ const struct GNUNET_SCHEDULER_TaskContext *tc;
struct GNUNET_CONNECTION_Handle *sock;
unsigned int i;
server->listen_task = NULL;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- {
- /* ignore shutdown, someone else will take care of it! */
- GNUNET_SERVER_resume (server);
- return;
- }
+ tc = GNUNET_SCHEDULER_get_task_context ();
for (i = 0; NULL != server->listen_sockets[i]; i++)
{
if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
* @return NULL on error, otherwise the listen socket
*/
static struct GNUNET_NETWORK_Handle *
-open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen)
+open_listen_socket (const struct sockaddr *server_addr,
+ socklen_t socklen)
{
struct GNUNET_NETWORK_Handle *sock;
uint16_t port;
* Helper function for #test_monitor_clients() to trigger
* #GNUNET_SERVER_destroy() after the stack has unwound.
*
- * @param cls the 'struct GNUNET_SERVER_Handle' to destroy
- * @param tc unused
+ * @param cls the `struct GNUNET_SERVER_Handle *` to destroy
*/
static void
-do_destroy (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_destroy (void *cls)
{
struct GNUNET_SERVER_Handle *server = cls;
if (GNUNET_NO == client->is_monitor)
return; /* not done yet */
server->in_soft_shutdown = GNUNET_SYSERR;
- GNUNET_SCHEDULER_add_now (&do_destroy, server);
+ (void) GNUNET_SCHEDULER_add_now (&do_destroy, server);
}
return; /* nothing to do, no listen sockets! */
if (NULL == server->listen_sockets[1])
{
- /* simplified method: no fd set needed; this is then much simpler and
- much more efficient */
+ /* simplified method: no fd set needed; this is then much simpler
+ and much more efficient */
server->listen_task =
GNUNET_SCHEDULER_add_read_net_with_priority (GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_SCHEDULER_PRIORITY_HIGH,
* Task run to warn about missing calls to #GNUNET_SERVER_receive_done.
*
* @param cls our `struct GNUNET_SERVER_Client *` to process more requests from
- * @param tc scheduler context (unused)
*/
static void
-warn_no_receive_done (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+warn_no_receive_done (void *cls)
{
struct GNUNET_SERVER_Client *client = cls;
client->warn_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
&warn_no_receive_done, client);
- if (0 == (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- LOG (GNUNET_ERROR_TYPE_WARNING,
- _("Processing code for message of type %u did not call `GNUNET_SERVER_receive_done' after %s\n"),
- (unsigned int) client->warn_type,
- GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (client->warn_start), GNUNET_YES));
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Processing code for message of type %u did not call `GNUNET_SERVER_receive_done' after %s\n"),
+ (unsigned int) client->warn_type,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (client->warn_start),
+ GNUNET_YES));
}
type = ntohs (message->type);
size = ntohs (message->size);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Server schedules transmission of %u-byte message of type %u to client.\n",
- size, type);
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Received message of type %u and size %u from client\n",
+ type, size);
found = GNUNET_NO;
for (pos = server->handlers; NULL != pos; pos = pos->next)
{
sender->warn_start = GNUNET_TIME_absolute_get ();
sender->warn_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_no_receive_done, sender);
+ &warn_no_receive_done,
+ sender);
sender->warn_type = type;
}
sender->suspended++;
* and process requests.
*
* @param cls our `struct GNUNET_SERVER_Client *` to process more requests from
- * @param tc scheduler context (unused)
*/
static void
-restart_processing (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+restart_processing (void *cls)
{
struct GNUNET_SERVER_Client *client = cls;
int ret;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Tokenizer gives server message of type %u from client\n",
- ntohs (message->type));
+ "Tokenizer gives server message of type %u and size %u from client\n",
+ ntohs (message->type), ntohs (message->size));
sender->in_process_client_buffer = GNUNET_YES;
ret = GNUNET_SERVER_inject (server, sender, message);
sender->in_process_client_buffer = GNUNET_NO;
* 'connection.c' is not allowed (see #2329).
*
* @param cls connection to destroy
- * @param tc scheduler context (unused)
*/
static void
-destroy_connection (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+destroy_connection (void *cls)
{
struct GNUNET_CONNECTION_Handle *connection = cls;