#include "gnunet-daemon-hostlist.h"
#include "gnunet_resolver_service.h"
-#define DEBUG_HOSTLIST_SERVER GNUNET_NO
+#define DEBUG_HOSTLIST_SERVER GNUNET_EXTRA_LOGGING
/**
* Handle to the HTTP server as provided by libmicrohttpd for IPv6.
"Creating hostlist response with %u bytes\n",
(unsigned int) results->size);
#endif
- response = MHD_create_response_from_data (results->size,
- results->data, MHD_YES, MHD_NO);
+ response =
+ MHD_create_response_from_data (results->size, results->data, MHD_YES,
+ MHD_NO);
if ((daemon_handle_v4 == NULL) && (daemon_handle_v6 == NULL))
{
MHD_destroy_response (response);
response = NULL;
}
- GNUNET_STATISTICS_set (stats,
- gettext_noop ("bytes in hostlist"),
+ GNUNET_STATISTICS_set (stats, gettext_noop ("bytes in hostlist"),
results->size, GNUNET_YES);
GNUNET_free (results);
}
* 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)
{
GNUNET_STATISTICS_update (stats,
- gettext_noop ("expired addresses encountered"),
- 1, GNUNET_YES);
+ gettext_noop ("expired addresses encountered"), 1,
+ GNUNET_YES);
return GNUNET_YES; /* ignore this address */
}
*arg = GNUNET_YES;
* hostlist response construction.
*/
static void
-host_processor (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+host_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
struct HostSet *results = cls;
}
#if DEBUG_HOSTLIST_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Adding peer `%s' to hostlist (%u bytes)\n",
- GNUNET_i2s (peer), (unsigned int) s);
+ "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);
* Hostlist access policy (very permissive, allows everything).
*/
static int
-accept_policy_callback (void *cls,
- const struct sockaddr *addr, socklen_t addrlen)
+accept_policy_callback (void *cls, const struct sockaddr *addr,
+ socklen_t addrlen)
{
if (NULL == response)
{
* Main request handler.
*/
static int
-access_handler_callback (void *cls,
- struct MHD_Connection *connection,
- const char *url,
- const char *method,
- const char *version,
- const char *upload_data,
+access_handler_callback (void *cls, struct MHD_Connection *connection,
+ const char *url, const char *method,
+ const char *version, const char *upload_data,
size_t * upload_data_size, void **con_cls)
{
static int dummy;
return MHD_NO; /* internal error, no response yet */
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received request for our hostlist\n"));
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("hostlist requests processed"),
+ GNUNET_STATISTICS_update (stats, gettext_noop ("hostlist requests processed"),
1, GNUNET_YES);
return MHD_queue_response (connection, MHD_HTTP_OK, response);
}
"Sent advertisement message: Copied %u bytes into buffer!\n",
(unsigned int) transmission_size);
hostlist_adv_count++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " # Sent advertisement message: %u\n", hostlist_adv_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " # Sent advertisement message: %u\n",
+ hostlist_adv_count);
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# hostlist advertisements send"),
- 1, GNUNET_NO);
+ gettext_noop ("# hostlist advertisements send"), 1,
+ GNUNET_NO);
return transmission_size;
}
* @param cls closure
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*/
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,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
size_t size;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked core to transmit advertisement message with a size of %u bytes to peer `%s'\n",
size, GNUNET_i2s (peer));
- if (NULL == GNUNET_CORE_notify_transmit_ready (core,
- GNUNET_YES,
- 0,
- GNUNET_ADV_TIMEOUT,
- peer,
- size,
- &adv_transmit_ready, NULL))
+ if (NULL ==
+ GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, 0,
+ GNUNET_ADV_TIMEOUT, peer, size,
+ &adv_transmit_ready, NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Advertisement message could not be queued by core\n"));
* @param err_msg NULL if successful, otherwise contains error message
*/
static void
-process_notify (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+process_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
struct HostSet *results;
}
results = GNUNET_malloc (sizeof (struct HostSet));
GNUNET_assert (peerinfo != NULL);
- pitr = GNUNET_PEERINFO_iterate (peerinfo,
- NULL,
- GNUNET_TIME_UNIT_MINUTES,
- &host_processor, results);
+ pitr =
+ GNUNET_PEERINFO_iterate (peerinfo, NULL, GNUNET_TIME_UNIT_MINUTES,
+ &host_processor, results);
}
/**
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;
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, &run_daemon, daemon_handle);
+ ret =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
+ GNUNET_SCHEDULER_NO_TASK, tv, wrs, wws,
+ &run_daemon, daemon_handle);
GNUNET_NETWORK_fdset_destroy (wrs);
GNUNET_NETWORK_fdset_destroy (wws);
GNUNET_NETWORK_fdset_destroy (wes);
{
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)
_("Could not access PEERINFO service. Exiting.\n"));
return GNUNET_SYSERR;
}
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
- "HOSTLIST",
- "HTTPPORT", &port))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg, "HOSTLIST", "HTTPPORT",
+ &port))
return GNUNET_SYSERR;
if ((port == 0) || (port > UINT16_MAX))
{
return GNUNET_SYSERR;
}
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
- "HOSTLIST",
- "EXTERNAL_DNS_NAME",
- &hostname))
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "HOSTLIST",
+ "EXTERNAL_DNS_NAME", &hostname))
hostname = GNUNET_RESOLVER_local_fqdn_get ();
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Hostlist service starts on %s:%llu\n"), hostname, port);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Hostlist service starts on %s:%llu\n"),
+ hostname, port);
if (NULL != hostname)
{
size = strlen (hostname);
}
else
{
- GNUNET_asprintf (&hostlist_uri,
- "http://%s:%u/", hostname, (unsigned int) port);
+ GNUNET_asprintf (&hostlist_uri, "http://%s:%u/", hostname,
+ (unsigned int) port);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Address to obtain hostlist: `%s'\n"), hostlist_uri);
}
GNUNET_free (hostname);
}
+
+ 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 (ip != NULL)
+ {
+ 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
+ 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;
+ }
+ }
+ else
+ sa = NULL;
+
daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6
#if DEBUG_HOSTLIST_SERVER
| MHD_USE_DEBUG
#endif
- ,
- (unsigned short) port,
- &accept_policy_callback,
- NULL,
- &access_handler_callback,
- NULL,
+ , (unsigned short) port,
+ &accept_policy_callback, NULL,
+ &access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
(unsigned int) 16,
MHD_OPTION_PER_IP_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);
daemon_handle_v4 = MHD_start_daemon (MHD_NO_FLAG
#if DEBUG_HOSTLIST_SERVER
| MHD_USE_DEBUG
#endif
- ,
- (unsigned short) port,
- &accept_policy_callback,
- NULL,
- &access_handler_callback,
- NULL,
+ , (unsigned short) port,
+ &accept_policy_callback, NULL,
+ &access_handler_callback, NULL,
MHD_OPTION_CONNECTION_LIMIT,
(unsigned int) 16,
MHD_OPTION_PER_IP_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))
{
projects / oweals / gnunet.git / blobdiff