#include "gnunet-daemon-hostlist.h"
#include "gnunet_resolver_service.h"
-#define DEBUG_HOSTLIST_SERVER GNUNET_NO
/**
* Handle to the HTTP server as provided by libmicrohttpd for IPv6.
static struct MHD_Response *response;
/**
- * NULL if we are not currenlty iterating over peer information.
+ * Handle for accessing peerinfo service.
*/
-static struct GNUNET_PEERINFO_IteratorContext *pitr;
+static struct GNUNET_PEERINFO_Handle *peerinfo;
/**
- * Handle for accessing peerinfo service.
+ * Set if we are allowed to advertise our hostlist to others.
*/
-static struct GNUNET_PEERINFO_Handle *peerinfo;
+static int advertising;
+
+/**
+ * Buffer for the hostlist address
+ */
+static char *hostlist_uri;
+
/**
* Context for host processor.
unsigned int size;
char *data;
+
+ struct GNUNET_PEERINFO_IteratorContext *pitr;
};
-/**
- * Set if we are allowed to advertise our hostlist to others.
- */
-static int advertising;
/**
- * Buffer for the hostlist address
+ * NULL if we are not currenlty iterating over peer information.
*/
-static char *hostlist_uri;
+static struct HostSet *builder;
+
+
/**
* Function that assembles our response.
*/
static void
-finish_response (struct HostSet *results)
+finish_response ()
{
- if (response != NULL)
+ if (NULL != response)
MHD_destroy_response (response);
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating hostlist response with %u bytes\n",
- (unsigned int) results->size);
-#endif
+ (unsigned int) builder->size);
response =
- MHD_create_response_from_data (results->size, results->data, MHD_YES,
+ MHD_create_response_from_data (builder->size, builder->data, MHD_YES,
MHD_NO);
- if ((daemon_handle_v4 == NULL) && (daemon_handle_v6 == NULL))
+ if ((NULL == daemon_handle_v4) && (NULL == daemon_handle_v6))
{
MHD_destroy_response (response);
response = NULL;
}
GNUNET_STATISTICS_set (stats, gettext_noop ("bytes in hostlist"),
- results->size, GNUNET_YES);
- GNUNET_free (results);
+ builder->size, GNUNET_YES);
+ GNUNET_free (builder);
+ builder = NULL;
}
* Set 'cls' to GNUNET_YES (we have an address!).
*
* @param cls closure, an 'int*'
- * @param tname name of the transport (ignored)
+ * @param address the address (ignored)
* @param expiration expiration time (call is ignored if this is in the past)
- * @param addr the address (ignored)
- * @param addrlen length of the address (ignored)
* @return GNUNET_SYSERR to stop iterating (unless expiration has occured)
*/
static int
-check_has_addr (void *cls, const char *tname,
- struct GNUNET_TIME_Absolute expiration, const void *addr,
- uint16_t addrlen)
+check_has_addr (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute expiration)
{
int *arg = cls;
- if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0)
+ if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
{
GNUNET_STATISTICS_update (stats,
gettext_noop ("expired addresses encountered"), 1,
host_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
- struct HostSet *results = cls;
size_t old;
size_t s;
int has_addr;
- if (err_msg != NULL)
+ if (NULL != err_msg)
{
GNUNET_assert (NULL == peer);
- pitr = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ builder->pitr = NULL;
+ GNUNET_free_non_null (builder->data);
+ GNUNET_free (builder);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Error in communication with PEERINFO service: %s\n"),
err_msg);
return;
}
- if (peer == NULL)
+ if (NULL == peer)
{
- pitr = NULL;
- finish_response (results);
+ builder->pitr = NULL;
+ finish_response ();
return;
}
- if (hello == NULL)
+ if (NULL == hello)
return;
has_addr = GNUNET_NO;
GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_has_addr, &has_addr);
1, GNUNET_NO);
return;
}
- old = results->size;
+ old = builder->size;
s = GNUNET_HELLO_size (hello);
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received %u bytes of `%s' from peer `%s' for hostlist.\n",
(unsigned int) s, "HELLO", GNUNET_i2s (peer));
-#endif
if ((old + s >= GNUNET_MAX_MALLOC_CHECKED) ||
(old + s >= MAX_BYTES_PER_HOSTLISTS))
{
s, GNUNET_NO);
return; /* too large, skip! */
}
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Adding peer `%s' to hostlist (%u bytes)\n", GNUNET_i2s (peer),
(unsigned int) s);
-#endif
- GNUNET_array_grow (results->data, results->size, old + s);
- memcpy (&results->data[old], hello, s);
+ GNUNET_array_grow (builder->data, builder->size, old + s);
+ memcpy (&builder->data[old], hello, s);
}
{
if (NULL == response)
{
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for hostlist, but I am not yet ready; rejecting!\n");
-#endif
return MHD_NO;
}
return MHD_YES; /* accept all */
if (NULL == *con_cls)
{
(*con_cls) = &dummy;
-#if DEBUG_HOSTLIST_SERVER
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Sending 100 CONTINUE reply\n"));
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending 100 CONTINUE reply\n");
return MHD_YES; /* send 100 continue */
}
- if (*upload_data_size != 0)
+ if (0 != *upload_data_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Refusing `%s' request with %llu bytes of upload data\n"),
GNUNET_YES);
return MHD_NO; /* do not support upload data */
}
- if (response == NULL)
+ if (NULL == response)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_
adv_transmit_ready (void *cls, size_t size, void *buf)
{
static uint64_t hostlist_adv_count;
-
size_t transmission_size;
size_t uri_size; /* Including \0 termination! */
struct GNUNET_MessageHeader header;
char *cbuf;
- if (buf == NULL)
+ if (NULL == buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmission failed, buffer invalid!\n");
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param atsi performance data
*/
static void
-connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
{
size_t size;
if (!advertising)
return;
- if (hostlist_uri == NULL)
+ if (NULL == hostlist_uri)
return;
size = strlen (hostlist_uri) + 1;
if (size + sizeof (struct GNUNET_MessageHeader) >=
/* nothing to do */
}
+
/**
* PEERINFO calls this function to let us know about a possible peer
* that we might want to connect to.
process_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
- struct HostSet *results;
-
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peerinfo is notifying us to rebuild our hostlist\n");
-#endif
- if (err_msg != NULL)
+ if (NULL != err_msg)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Error in communication with PEERINFO service: %s\n"),
+ err_msg);
+ if (NULL != builder)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Error in communication with PEERINFO service\n"));
- /* return; */
+ /* restart re-build already in progress ... */
+ GNUNET_PEERINFO_iterate_cancel (builder->pitr);
+ GNUNET_free_non_null (builder->data);
+ builder->size = 0;
+ builder->data = NULL;
+ }
+ else
+ {
+ builder = GNUNET_new (struct HostSet);
}
- results = GNUNET_malloc (sizeof (struct HostSet));
- GNUNET_assert (peerinfo != NULL);
- pitr =
- GNUNET_PEERINFO_iterate (peerinfo, NULL, GNUNET_TIME_UNIT_MINUTES,
- &host_processor, results);
+ GNUNET_assert (NULL != peerinfo);
+ builder->pitr =
+ GNUNET_PEERINFO_iterate (peerinfo, GNUNET_NO, NULL, GNUNET_TIME_UNIT_MINUTES,
+ &host_processor, NULL);
}
+
/**
* Function that queries MHD's select sets and
* starts the task waiting for them.
*/
-static GNUNET_SCHEDULER_TaskIdentifier prepare_daemon (struct MHD_Daemon
- *daemon_handle);
+static GNUNET_SCHEDULER_TaskIdentifier
+prepare_daemon (struct MHD_Daemon *daemon_handle);
/**
hostlist_task_v6 = prepare_daemon (daemon_handle);
}
+#define UNSIGNED_MHD_LONG_LONG unsigned MHD_LONG_LONG
/**
* Function that queries MHD's select sets and
fd_set es;
struct GNUNET_NETWORK_FDSet *wrs;
struct GNUNET_NETWORK_FDSet *wws;
- struct GNUNET_NETWORK_FDSet *wes;
int max;
- unsigned long long timeout;
+ UNSIGNED_MHD_LONG_LONG timeout;
int haveto;
struct GNUNET_TIME_Relative tv;
FD_ZERO (&ws);
FD_ZERO (&es);
wrs = GNUNET_NETWORK_fdset_create ();
- wes = GNUNET_NETWORK_fdset_create ();
wws = GNUNET_NETWORK_fdset_create ();
max = -1;
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 = (uint64_t) timeout;
+ tv.rel_value_us = (uint64_t) timeout * 1000LL;
else
tv = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
- GNUNET_NETWORK_fdset_copy_native (wes, &es, max + 1);
ret =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
- GNUNET_SCHEDULER_NO_TASK, tv, wrs, wws,
+ tv, wrs, wws,
&run_daemon, daemon_handle);
GNUNET_NETWORK_fdset_destroy (wrs);
GNUNET_NETWORK_fdset_destroy (wws);
- GNUNET_NETWORK_fdset_destroy (wes);
return ret;
}
-
/**
* Start server offering our hostlist.
*
{
unsigned long long port;
char *hostname;
+ char *ip;
size_t size;
+ struct in_addr i4;
+ struct in6_addr i6;
+ struct sockaddr_in v4;
+ struct sockaddr_in6 v6;
+ const struct sockaddr *sa;
advertising = advertise;
if (!advertising)
cfg = c;
stats = st;
peerinfo = GNUNET_PEERINFO_connect (cfg);
- if (peerinfo == NULL)
+ if (NULL == peerinfo)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not access PEERINFO service. Exiting.\n"));
GNUNET_CONFIGURATION_get_value_number (cfg, "HOSTLIST", "HTTPPORT",
&port))
return GNUNET_SYSERR;
- if ((port == 0) || (port > UINT16_MAX))
+ if ((0 == port) || (port > UINT16_MAX))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Invalid port number %llu. Exiting.\n"), port);
}
GNUNET_free (hostname);
}
- daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6
-#if DEBUG_HOSTLIST_SERVER
- | MHD_USE_DEBUG
+
+ if (GNUNET_CONFIGURATION_have_value (cfg, "HOSTLIST", "BINDTOIP"))
+ {
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "HOSTLIST",
+ "BINDTOIP", &ip));
+ }
+ else
+ ip = NULL;
+ if (NULL != ip)
+ {
+ if (1 == inet_pton (AF_INET, ip, &i4))
+ {
+ memset (&v4, 0, sizeof (v4));
+ v4.sin_family = AF_INET;
+ v4.sin_addr = i4;
+ v4.sin_port = htons (port);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ v4.sin_len = sizeof (v4);
#endif
- , (unsigned short) port,
+ sa = (const struct sockaddr *) &v4;
+ }
+ else if (1 == inet_pton (AF_INET6, ip, &i6))
+ {
+ memset (&v6, 0, sizeof (v6));
+ v6.sin6_family = AF_INET6;
+ v6.sin6_addr = i6;
+ v6.sin6_port = htons (port);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ v6.sin6_len = sizeof (v6);
+#endif
+ sa = (const struct sockaddr *) &v6;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("`%s' is not a valid IP address! Ignoring BINDTOIP.\n"),
+ ip);
+ sa = NULL;
+ }
+ GNUNET_free (ip);
+ }
+ else
+ sa = NULL;
+
+ daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6 | MHD_USE_DEBUG,
+ (uint16_t) port,
&accept_policy_callback, NULL,
&access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
MHD_OPTION_CONNECTION_TIMEOUT,
(unsigned int) 16,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
- (size_t) (16 * 1024), MHD_OPTION_END);
- daemon_handle_v4 = MHD_start_daemon (MHD_NO_FLAG
-#if DEBUG_HOSTLIST_SERVER
- | MHD_USE_DEBUG
-#endif
- , (unsigned short) port,
+ (size_t) (16 * 1024),
+ MHD_OPTION_SOCK_ADDR,
+ sa,
+ MHD_OPTION_END);
+ daemon_handle_v4 = MHD_start_daemon (MHD_NO_FLAG | MHD_USE_DEBUG,
+ (uint16_t) port,
&accept_policy_callback, NULL,
&access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
MHD_OPTION_CONNECTION_TIMEOUT,
(unsigned int) 16,
MHD_OPTION_CONNECTION_MEMORY_LIMIT,
- (size_t) (16 * 1024), MHD_OPTION_END);
+ (size_t) (16 * 1024),
+ MHD_OPTION_SOCK_ADDR,
+ sa,
+ MHD_OPTION_END);
- if ((daemon_handle_v6 == NULL) && (daemon_handle_v4 == NULL))
+ if ((NULL == daemon_handle_v6) && (NULL == daemon_handle_v4))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not start hostlist HTTP server on port %u\n"),
}
core = co;
-
*server_ch = &connect_handler;
*server_dh = &disconnect_handler;
-
if (daemon_handle_v4 != NULL)
hostlist_task_v4 = prepare_daemon (daemon_handle_v4);
if (daemon_handle_v6 != NULL)
hostlist_task_v6 = prepare_daemon (daemon_handle_v6);
- notify = GNUNET_PEERINFO_notify (cfg, process_notify, NULL);
+ notify = GNUNET_PEERINFO_notify (cfg, GNUNET_NO, &process_notify, NULL);
return GNUNET_OK;
}
+
/**
* Stop server offering our hostlist.
*/
void
GNUNET_HOSTLIST_server_stop ()
{
-#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist server shutdown\n");
-#endif
- if (NULL != notify)
- {
- GNUNET_PEERINFO_notify_cancel (notify);
- notify = NULL;
- }
if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v6)
{
GNUNET_SCHEDULER_cancel (hostlist_task_v6);
GNUNET_SCHEDULER_cancel (hostlist_task_v4);
hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK;
}
- if (pitr != NULL)
- {
- GNUNET_PEERINFO_iterate_cancel (pitr);
- pitr = NULL;
- }
if (NULL != daemon_handle_v4)
{
MHD_stop_daemon (daemon_handle_v4);
MHD_stop_daemon (daemon_handle_v6);
daemon_handle_v6 = NULL;
}
- if (response != NULL)
+ if (NULL != response)
{
MHD_destroy_response (response);
response = NULL;
}
- if (peerinfo != NULL)
+ if (NULL != notify)
+ {
+ GNUNET_PEERINFO_notify_cancel (notify);
+ notify = NULL;
+ }
+ if (NULL != builder)
+ {
+ GNUNET_PEERINFO_iterate_cancel (builder->pitr);
+ builder->pitr = NULL;
+ GNUNET_free_non_null (builder->data);
+ GNUNET_free (builder);
+ }
+ if (NULL != peerinfo)
{
GNUNET_PEERINFO_disconnect (peerinfo);
peerinfo = NULL;
projects / oweals / gnunet.git / blobdiff