/*
This file is part of GNUnet.
- (C) 2008, 2009, 2010, 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008, 2009, 2010, 2014 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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* Our primary task for IPv4.
*/
-static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v4;
+static struct GNUNET_SCHEDULER_Task *hostlist_task_v4;
/**
* Our primary task for IPv6.
*/
-static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v6;
+static struct GNUNET_SCHEDULER_Task *hostlist_task_v6;
/**
* Our canonical response.
"Creating hostlist response with %u bytes\n",
(unsigned int) builder->size);
response =
- MHD_create_response_from_data (builder->size, builder->data, MHD_YES,
- MHD_NO);
+ MHD_create_response_from_buffer (builder->size,
+ builder->data,
+ MHD_RESPMEM_MUST_FREE);
add_cors_headers (response);
if ((NULL == daemon_handle_v4) && (NULL == daemon_handle_v6))
{
builder->pitr = NULL;
GNUNET_free_non_null (builder->data);
GNUNET_free (builder);
+ builder = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Error in communication with PEERINFO service: %s\n"),
err_msg);
if (NULL == *con_cls)
{
(*con_cls) = &dummy;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending 100 CONTINUE reply\n");
- return MHD_YES; /* send 100 continue */
+ return MHD_YES;
}
if (0 != *upload_data_size)
{
/**
* Handler called by CORE when CORE is ready to transmit message
*
- * @param cls closure
+ * @param cls closure with the `const struct GNUNET_PeerIdentity *` of
+ * the peer we are sending to
* @param size size of buffer to copy message to
* @param buf buffer to copy message to
* @return number of bytes copied to @a buf
size_t size,
void *buf)
{
+ const struct GNUNET_PeerIdentity *peer = cls;
static uint64_t hostlist_adv_count;
size_t transmission_size;
size_t uri_size; /* Including \0 termination! */
struct GNUNET_MessageHeader header;
char *cbuf;
+ struct GNUNET_CORE_TransmitHandle *th;
+ th = GNUNET_CONTAINER_multipeermap_get (advertisements,
+ peer);
+ GNUNET_assert (NULL != th);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (advertisements,
+ peer,
+ th));
if (NULL == buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
(unsigned int) transmission_size);
hostlist_adv_count++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " # Sent advertisement message: %u\n",
- hostlist_adv_count);
+ " # Sent advertisement message: %llu\n",
+ (unsigned long long) hostlist_adv_count);
GNUNET_STATISTICS_update (stats,
gettext_noop ("# hostlist advertisements send"), 1,
GNUNET_NO);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked CORE to transmit advertisement message with a size of %u bytes to peer `%s'\n",
- size,
+ (unsigned int) size,
GNUNET_i2s (peer));
if (NULL ==
(th = GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES,
GNUNET_ADV_TIMEOUT,
peer,
size,
- &adv_transmit_ready, NULL)) )
+ &adv_transmit_ready,
+ (void *) peer)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Advertisement message could not be queued by core\n"));
* Function that queries MHD's select sets and
* starts the task waiting for them.
*/
-static GNUNET_SCHEDULER_TaskIdentifier
+static struct GNUNET_SCHEDULER_Task *
prepare_daemon (struct MHD_Daemon *daemon_handle);
* and schedule the next run.
*
* @param cls the `struct MHD_Daemon` of the HTTP server to run
- * @param tc scheduler context
*/
static void
-run_daemon (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_daemon (void *cls)
{
struct MHD_Daemon *daemon_handle = cls;
if (daemon_handle == daemon_handle_v4)
- hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK;
+ hostlist_task_v4 = NULL;
else
- hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
+ hostlist_task_v6 = NULL;
GNUNET_assert (MHD_YES == MHD_run (daemon_handle));
if (daemon_handle == daemon_handle_v4)
hostlist_task_v4 = prepare_daemon (daemon_handle);
*
* @param daemon_handle HTTP server to prepare to run
*/
-static GNUNET_SCHEDULER_TaskIdentifier
+static struct GNUNET_SCHEDULER_Task *
prepare_daemon (struct MHD_Daemon *daemon_handle)
{
- GNUNET_SCHEDULER_TaskIdentifier ret;
+ struct GNUNET_SCHEDULER_Task * ret;
fd_set rs;
fd_set ws;
fd_set es;
wrs = GNUNET_NETWORK_fdset_create ();
wws = GNUNET_NETWORK_fdset_create ();
max = -1;
- GNUNET_assert (MHD_YES == MHD_get_fdset (daemon_handle, &rs, &ws, &es, &max));
+ GNUNET_assert (MHD_YES ==
+ MHD_get_fdset (daemon_handle,
+ &rs, &ws, &es, &max));
haveto = MHD_get_timeout (daemon_handle, &timeout);
if (haveto == MHD_YES)
tv.rel_value_us = (uint64_t) timeout * 1000LL;
tv = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
- ret =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
- tv, wrs, wws,
- &run_daemon, daemon_handle);
+ ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
+ tv, wrs, wws,
+ &run_daemon, daemon_handle);
GNUNET_NETWORK_fdset_destroy (wrs);
GNUNET_NETWORK_fdset_destroy (wws);
return ret;
&accept_policy_callback, NULL,
&access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
- (unsigned int) 16,
+ (unsigned int) 128,
MHD_OPTION_PER_IP_CONNECTION_LIMIT,
- (unsigned int) 1,
+ (unsigned int) 32,
MHD_OPTION_CONNECTION_TIMEOUT,
(unsigned int) 16,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
&accept_policy_callback, NULL,
&access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
- (unsigned int) 16,
+ (unsigned int) 128,
MHD_OPTION_PER_IP_CONNECTION_LIMIT,
- (unsigned int) 1,
+ (unsigned int) 32,
MHD_OPTION_CONNECTION_TIMEOUT,
(unsigned int) 16,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Hostlist server shutdown\n");
- if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v6)
+ if (NULL != hostlist_task_v6)
{
GNUNET_SCHEDULER_cancel (hostlist_task_v6);
- hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+ hostlist_task_v6 = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v4)
+ if (NULL != hostlist_task_v4)
{
GNUNET_SCHEDULER_cancel (hostlist_task_v4);
- hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK;
+ hostlist_task_v4 = NULL;
}
if (NULL != daemon_handle_v4)
{
}
GNUNET_free_non_null (builder->data);
GNUNET_free (builder);
+ builder = NULL;
}
if (NULL != peerinfo)
{
projects / oweals / gnunet.git / blobdiff