X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fhostlist%2Fhostlist-server.c;h=e30b3c1e08f0d14e92379af7ee822ce6bf0f382b;hb=502af2167f7c218366666ca4944bd7cc54b5b19a;hp=4ffcc27f41086ba230d2034cfbc233c5f937835c;hpb=c57ed076db3529c114dad3251a838e06b64f048a;p=oweals%2Fgnunet.git diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index 4ffcc27f4..e30b3c1e0 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c @@ -4,7 +4,7 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -20,7 +20,7 @@ /** * @file hostlist/hostlist-server.c - * @author Christian Grothoff + * @author Christian Grothoff, Matthias Wachs * @brief application to provide an integrated hostlist HTTP server */ @@ -34,11 +34,6 @@ #define DEBUG_HOSTLIST_SERVER GNUNET_NO -/** - * How often should we recalculate our response to hostlist requests? - */ -#define RESPONSE_UPDATE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) - /** * Handle to the HTTP server as provided by libmicrohttpd for IPv6. */ @@ -55,14 +50,19 @@ static struct MHD_Daemon *daemon_handle_v4; static const struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Our scheduler. + * For keeping statistics. */ -static struct GNUNET_SCHEDULER_Handle *sched; +static struct GNUNET_STATISTICS_Handle *stats; /** - * For keeping statistics. - */ -static struct GNUNET_STATISTICS_Handle *stats; + * Handle to the core service (NULL until we've connected to it). + */ +static struct GNUNET_CORE_Handle *core; + +/** + * Handle to the peerinfo notify service (NULL until we've connected to it). + */ +static struct GNUNET_PEERINFO_NotifyContext *notify; /** * Our primary task for IPv4. @@ -74,11 +74,6 @@ static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v4; */ static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v6; -/** - * Task that updates our HTTP response. - */ -static GNUNET_SCHEDULER_TaskIdentifier response_task; - /** * Our canonical response. */ @@ -89,6 +84,11 @@ static struct MHD_Response *response; */ static struct GNUNET_PEERINFO_IteratorContext *pitr; +/** + * Handle for accessing peerinfo service. + */ +static struct GNUNET_PEERINFO_Handle *peerinfo; + /** * Context for host processor. */ @@ -100,77 +100,15 @@ struct HostSet }; /** - * Task that will produce a new response object. + * Set if we are allowed to advertise our hostlist to others. */ -static void -update_response (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +static int advertising; /** - * Function that assembles our hostlist adv message. + * Buffer for the hostlist address */ -static int -create_hostlist_adv_message (struct GNUNET_HOSTLIST_ADV_Message *adv_msg) -{ - int length = 0; - int size = 0; - unsigned long long port; - - char *uri; - char hostname[HOST_NAME_MAX]; - char *protocol = "http://"; - char *port_s = GNUNET_malloc(6 * sizeof(char)); - - if (0 != gethostname (hostname, sizeof (hostname) - 1)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, - "Could not get system's hostname, unable to create advertisement message"); - return GNUNET_NO; - } - if (-1 == GNUNET_CONFIGURATION_get_value_number (cfg, - "HOSTLIST", - "HTTPPORT", - &port)) - return GNUNET_SYSERR; - - sprintf(port_s, "%llu", port); - length = strlen(hostname)+strlen(protocol)+strlen(port_s)+2; - size = (length+1) * sizeof (char); - uri = GNUNET_malloc(size); - uri = strcpy(uri, protocol); - uri = strcat(uri, hostname); - uri = strcat(uri, ":"); - uri = strcat(uri, port_s); - uri = strcat(uri, "/"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Address to obtain hostlist: %s\n", uri); - - - adv_msg = GNUNET_malloc ( sizeof(struct GNUNET_HOSTLIST_ADV_Message) + size); - if ( NULL == adv_msg) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, - "Could not allocate memory for the message"); - return GNUNET_NO; - } - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - "size ADV_Message: %u\n",sizeof(struct GNUNET_HOSTLIST_ADV_Message)); - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, - "size uri: %u\n", (length + 1) * sizeof (char)); - - - if ( ( size + sizeof( struct GNUNET_HOSTLIST_ADV_Message )) > GNUNET_SERVER_MAX_MESSAGE_SIZE) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, - "Advertisement message is bigger than GNUNET allows"); - return GNUNET_NO; - } - - adv_msg->header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT); - adv_msg->header.size = htons (sizeof (struct GNUNET_HOSTLIST_ADV_Message) + size); - memcpy(&adv_msg[1],uri,size); +static char *hostlist_uri; - return GNUNET_OK; -} /** * Function that assembles our response. @@ -178,8 +116,6 @@ create_hostlist_adv_message (struct GNUNET_HOSTLIST_ADV_Message *adv_msg) static void finish_response (struct HostSet *results) { - struct GNUNET_TIME_Relative freq; - if (response != NULL) MHD_destroy_response (response); #if DEBUG_HOSTLIST_SERVER @@ -189,28 +125,14 @@ finish_response (struct HostSet *results) #endif response = MHD_create_response_from_data (results->size, results->data, MHD_YES, MHD_NO); - if ( (daemon_handle_v4 != NULL) || - (daemon_handle_v6 != NULL) ) - { - freq = RESPONSE_UPDATE_FREQUENCY; - if (results->size == 0) - freq = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250); - /* schedule next update of the response */ - response_task = GNUNET_SCHEDULER_add_delayed (sched, - freq, - &update_response, - NULL); - } - else - { - /* already past shutdown */ - MHD_destroy_response (response); - response = NULL; - } + if ((daemon_handle_v4 == NULL) && (daemon_handle_v6 == NULL)) + { + MHD_destroy_response (response); + response = NULL; + } GNUNET_STATISTICS_set (stats, - gettext_noop("bytes in hostlist"), - results->size, - GNUNET_YES); + gettext_noop ("bytes in hostlist"), + results->size, GNUNET_YES); GNUNET_free (results); } @@ -227,20 +149,19 @@ finish_response (struct HostSet *results) */ static int check_has_addr (void *cls, - const char *tname, - struct GNUNET_TIME_Absolute expiration, - const void *addr, size_t addrlen) + const char *tname, + struct GNUNET_TIME_Absolute expiration, + const void *addr, uint16_t addrlen) { int *arg = cls; - if (GNUNET_TIME_absolute_get_remaining (expiration).value == 0) - { - GNUNET_STATISTICS_update (stats, - gettext_noop("expired addresses encountered"), - 1, - GNUNET_YES); - return GNUNET_YES; /* ignore this address */ - } + if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0) + { + GNUNET_STATISTICS_update (stats, + gettext_noop ("expired addresses encountered"), + 1, GNUNET_YES); + return GNUNET_YES; /* ignore this address */ + } *arg = GNUNET_YES; return GNUNET_SYSERR; } @@ -252,84 +173,70 @@ check_has_addr (void *cls, */ static void host_processor (void *cls, - const struct GNUNET_PeerIdentity * peer, - const struct GNUNET_HELLO_Message *hello, - uint32_t trust) + 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) + { + GNUNET_assert (NULL == peer); + pitr = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + _("Error in communication with PEERINFO service: %s\n"), + err_msg); + return; + } if (peer == NULL) - { - pitr = NULL; - finish_response (results); - return; - } + { + pitr = NULL; + finish_response (results); + return; + } + if (hello == NULL) + return; has_addr = GNUNET_NO; - GNUNET_HELLO_iterate_addresses (hello, - GNUNET_NO, - &check_has_addr, - &has_addr); + GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_has_addr, &has_addr); if (GNUNET_NO == has_addr) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "HELLO for peer `%4s' has no address, not suitable for hostlist!\n", - GNUNET_i2s (peer)); - GNUNET_STATISTICS_update (stats, - gettext_noop("HELLOs without addresses encountered (ignored)"), - 1, - GNUNET_NO); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "HELLO for peer `%4s' has no address, not suitable for hostlist!\n", + GNUNET_i2s (peer)); + GNUNET_STATISTICS_update (stats, + gettext_noop + ("HELLOs without addresses encountered (ignored)"), + 1, GNUNET_NO); + return; + } old = results->size; - s = GNUNET_HELLO_size(hello); + 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)); + "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) - { - GNUNET_STATISTICS_update (stats, - gettext_noop("bytes not included in hostlist (size limit)"), - s, - GNUNET_NO); - return; /* too large, skip! */ - } + if ((old + s >= GNUNET_MAX_MALLOC_CHECKED) || + (old + s >= MAX_BYTES_PER_HOSTLISTS)) + { + GNUNET_STATISTICS_update (stats, + gettext_noop + ("bytes not included in hostlist (size limit)"), + 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); - GNUNET_array_grow (results->data, - results->size, - old + 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); } -/** - * Task that will produce a new response object. - */ -static void -update_response (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - struct HostSet *results; - - response_task = GNUNET_SCHEDULER_NO_TASK; - results = GNUNET_malloc(sizeof(struct HostSet)); - pitr = GNUNET_PEERINFO_iterate (cfg, sched, - NULL, - 0, - GNUNET_TIME_UNIT_MINUTES, - &host_processor, - results); -} - /** * Hostlist access policy (very permissive, allows everything). @@ -339,13 +246,13 @@ accept_policy_callback (void *cls, const struct sockaddr *addr, socklen_t addrlen) { 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"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received request for hostlist, but I am not yet ready; rejecting!\n"); #endif - return MHD_NO; - } + return MHD_NO; + } return MHD_YES; /* accept all */ } @@ -360,82 +267,147 @@ access_handler_callback (void *cls, const char *method, const char *version, const char *upload_data, - size_t*upload_data_size, void **con_cls) + size_t * upload_data_size, void **con_cls) { static int dummy; - + if (0 != strcmp (method, MHD_HTTP_METHOD_GET)) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Refusing `%s' request to hostlist server\n"), - method); - GNUNET_STATISTICS_update (stats, - gettext_noop("hostlist requests refused (not HTTP GET)"), - 1, - GNUNET_YES); - return MHD_NO; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Refusing `%s' request to hostlist server\n"), method); + GNUNET_STATISTICS_update (stats, + gettext_noop + ("hostlist requests refused (not HTTP GET)"), 1, + GNUNET_YES); + return MHD_NO; + } if (NULL == *con_cls) - { - (*con_cls) = &dummy; + { + (*con_cls) = &dummy; #if DEBUG_HOSTLIST_SERVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Sending 100 CONTINUE reply\n")); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Sending 100 CONTINUE reply\n")); #endif - return MHD_YES; /* send 100 continue */ - } + return MHD_YES; /* send 100 continue */ + } if (*upload_data_size != 0) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Refusing `%s' request with %llu bytes of upload data\n"), - method, - (unsigned long long) *upload_data_size); - GNUNET_STATISTICS_update (stats, - gettext_noop("hostlist requests refused (upload data)"), - 1, - GNUNET_YES); - return MHD_NO; /* do not support upload data */ - } + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Refusing `%s' request with %llu bytes of upload data\n"), + method, (unsigned long long) *upload_data_size); + GNUNET_STATISTICS_update (stats, + gettext_noop + ("hostlist requests refused (upload data)"), 1, + GNUNET_YES); + return MHD_NO; /* do not support upload data */ + } if (response == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Could not handle hostlist request since I do not have a response yet\n")); - GNUNET_STATISTICS_update (stats, - gettext_noop("hostlist requests refused (not ready)"), - 1, - GNUNET_YES); - return MHD_NO; /* internal error, no response yet */ - } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Received request for our hostlist\n")); + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _ + ("Could not handle hostlist request since I do not have a response yet\n")); + GNUNET_STATISTICS_update (stats, + gettext_noop + ("hostlist requests refused (not ready)"), 1, + GNUNET_YES); + 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"), - 1, - GNUNET_YES); + gettext_noop ("hostlist requests processed"), + 1, GNUNET_YES); return MHD_queue_response (connection, MHD_HTTP_OK, response); } + +/** + * Handler called by core when core is ready to transmit message + * @param cls closure + * @param size size of buffer to copy message to + * @param buf buffer to copy message to + */ +static size_t +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) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmission failed, buffer invalid!\n"); + return 0; + } + uri_size = strlen (hostlist_uri) + 1; + transmission_size = sizeof (struct GNUNET_MessageHeader) + uri_size; + header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT); + header.size = htons (transmission_size); + GNUNET_assert (size >= transmission_size); + memcpy (buf, &header, sizeof (struct GNUNET_MessageHeader)); + cbuf = buf; + memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], hostlist_uri, uri_size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "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_STATISTICS_update (stats, + gettext_noop ("# hostlist advertisements send"), + 1, GNUNET_NO); + return transmission_size; +} + + /** * Method called whenever a given peer connects. * * @param cls closure * @param peer peer identity this notification is about - * @param latency reported latency of the connection with 'other' - * @param distance reported distance (DV) to 'other' + * @param atsi performance data */ static void connect_handler (void *cls, const struct - GNUNET_PeerIdentity * peer, - struct GNUNET_TIME_Relative latency, - uint32_t distance) + GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { + size_t size; + + if (!advertising) + return; + if (hostlist_uri == NULL) + return; + size = strlen (hostlist_uri) + 1; + if (size + sizeof (struct GNUNET_MessageHeader) >= + GNUNET_SERVER_MAX_MESSAGE_SIZE) + { + GNUNET_break (0); + return; + } + size += sizeof (struct GNUNET_MessageHeader); + if (NULL == core) + { + GNUNET_break (0); + return; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "A new peer connected to the server, preparing to send hostlist advertisement\n"); - /* create a new advertisement message */ - struct GNUNET_HOSTLIST_ADV_Message *adv_msg; - create_hostlist_adv_message(adv_msg); - + "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)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Advertisement message could not be queued by core\n")); + } } @@ -446,13 +418,44 @@ connect_handler (void *cls, * @param peer peer identity this notification is about */ static void -disconnect_handler (void *cls, - const struct - GNUNET_PeerIdentity * peer) +disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) { - + /* nothing to do */ } +/** + * PEERINFO calls this function to let us know about a possible peer + * that we might want to connect to. + * + * @param cls closure (not used) + * @param peer potential peer to connect to + * @param hello HELLO for this peer (or NULL) + * @param err_msg NULL if successful, otherwise contains error message + */ +static void +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) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + _("Error in communication with PEERINFO service\n")); + /* return; */ + } + results = GNUNET_malloc (sizeof (struct HostSet)); + GNUNET_assert (peerinfo != NULL); + pitr = GNUNET_PEERINFO_iterate (peerinfo, + NULL, + GNUNET_TIME_UNIT_MINUTES, + &host_processor, results); +} /** * Function that queries MHD's select sets and @@ -461,13 +464,13 @@ disconnect_handler (void *cls, static GNUNET_SCHEDULER_TaskIdentifier prepare_daemon (struct MHD_Daemon *daemon_handle); + /** * Call MHD to process pending requests and then go back * and schedule the next run. */ static void -run_daemon (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +run_daemon (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct MHD_Daemon *daemon_handle = cls; @@ -477,7 +480,7 @@ run_daemon (void *cls, hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; + return; GNUNET_assert (MHD_YES == MHD_run (daemon_handle)); if (daemon_handle == daemon_handle_v4) hostlist_task_v4 = prepare_daemon (daemon_handle); @@ -504,36 +507,26 @@ prepare_daemon (struct MHD_Daemon *daemon_handle) unsigned long long timeout; int haveto; struct GNUNET_TIME_Relative tv; - - FD_ZERO(&rs); - FD_ZERO(&ws); - FD_ZERO(&es); + + FD_ZERO (&rs); + 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)); + 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.value = (uint64_t) timeout; + tv.rel_value = (uint64_t) timeout; else tv = GNUNET_TIME_UNIT_FOREVER_REL; - GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max); - GNUNET_NETWORK_fdset_copy_native (wws, &ws, max); - GNUNET_NETWORK_fdset_copy_native (wes, &es, max); - ret = GNUNET_SCHEDULER_add_select (sched, - GNUNET_SCHEDULER_PRIORITY_HIGH, - GNUNET_SCHEDULER_NO_TASK, - tv, - wrs, - wws, - &run_daemon, - daemon_handle); + 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); GNUNET_NETWORK_fdset_destroy (wrs); GNUNET_NETWORK_fdset_destroy (wws); GNUNET_NETWORK_fdset_destroy (wes); @@ -549,63 +542,113 @@ prepare_daemon (struct MHD_Daemon *daemon_handle) */ int GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, - struct GNUNET_SCHEDULER_Handle *s, - struct GNUNET_STATISTICS_Handle *st, - GNUNET_CORE_ConnectEventHandler *server_ch, - GNUNET_CORE_DisconnectEventHandler *server_dh) + struct GNUNET_STATISTICS_Handle *st, + struct GNUNET_CORE_Handle *co, + GNUNET_CORE_ConnectEventHandler *server_ch, + GNUNET_CORE_DisconnectEventHandler *server_dh, + int advertise) { unsigned long long port; + char *hostname; + size_t size; - sched = s; + advertising = advertise; + if (!advertising) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Advertising not enabled on this hostlist server\n"); + else + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Advertising enabled on this hostlist server\n"); cfg = c; stats = st; - if (-1 == GNUNET_CONFIGURATION_get_value_number (cfg, - "HOSTLIST", - "HTTPPORT", - &port)) + peerinfo = GNUNET_PEERINFO_connect (cfg); + if (peerinfo == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Could not access PEERINFO service. Exiting.\n")); + return GNUNET_SYSERR; + } + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, + "HOSTLIST", + "HTTPPORT", &port)) + return GNUNET_SYSERR; + if ((port == 0) || (port > UINT16_MAX)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Invalid port number %llu. Exiting.\n"), port); return GNUNET_SYSERR; + } + + 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 port %llu\n"), - port); - daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6 + _("Hostlist service starts on %s:%llu\n"), hostname, port); + if (NULL != hostname) + { + size = strlen (hostname); + if (size + 15 > MAX_URL_LEN) + { + GNUNET_break (0); + } + else + { + 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); + } + daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6 #if DEBUG_HOSTLIST_SERVER - | MHD_USE_DEBUG + | MHD_USE_DEBUG #endif - , - (unsigned short) port, - &accept_policy_callback, - NULL, - &access_handler_callback, - NULL, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16, - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024), - MHD_OPTION_END); + , + (unsigned short) port, + &accept_policy_callback, + NULL, + &access_handler_callback, + NULL, + MHD_OPTION_CONNECTION_LIMIT, + (unsigned int) 16, + MHD_OPTION_PER_IP_CONNECTION_LIMIT, + (unsigned int) 1, + 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 + | MHD_USE_DEBUG #endif - , - (unsigned short) port, - &accept_policy_callback, - NULL, - &access_handler_callback, - NULL, - MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16, - MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1, - MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, - MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024), - MHD_OPTION_END); - - if ( (daemon_handle_v6 == NULL) && - (daemon_handle_v4 == NULL) ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Could not start hostlist HTTP server on port %u\n"), - (unsigned short) port); - return GNUNET_SYSERR; - } + , + (unsigned short) port, + &accept_policy_callback, + NULL, + &access_handler_callback, + NULL, + MHD_OPTION_CONNECTION_LIMIT, + (unsigned int) 16, + MHD_OPTION_PER_IP_CONNECTION_LIMIT, + (unsigned int) 1, + MHD_OPTION_CONNECTION_TIMEOUT, + (unsigned int) 16, + MHD_OPTION_CONNECTION_MEMORY_LIMIT, + (size_t) (16 * 1024), MHD_OPTION_END); + + if ((daemon_handle_v6 == NULL) && (daemon_handle_v4 == NULL)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Could not start hostlist HTTP server on port %u\n"), + (unsigned short) port); + return GNUNET_SYSERR; + } + + core = co; *server_ch = &connect_handler; *server_dh = &disconnect_handler; @@ -614,9 +657,9 @@ GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, hostlist_task_v4 = prepare_daemon (daemon_handle_v4); if (daemon_handle_v6 != NULL) hostlist_task_v6 = prepare_daemon (daemon_handle_v6); - response_task = GNUNET_SCHEDULER_add_now (sched, - &update_response, - NULL); + + notify = GNUNET_PEERINFO_notify (cfg, process_notify, NULL); + return GNUNET_OK; } @@ -627,44 +670,51 @@ void GNUNET_HOSTLIST_server_stop () { #if DEBUG_HOSTLIST_SERVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Hostlist server shutdown\n"); + 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 (sched, hostlist_task_v6); - hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (hostlist_task_v6); + hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK; + } if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v4) - { - GNUNET_SCHEDULER_cancel (sched, hostlist_task_v4); - hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (hostlist_task_v4); + hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK; + } if (pitr != NULL) - { - GNUNET_PEERINFO_iterate_cancel (pitr); - pitr = NULL; - } - if (GNUNET_SCHEDULER_NO_TASK != response_task) - { - GNUNET_SCHEDULER_cancel (sched, response_task); - response_task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_PEERINFO_iterate_cancel (pitr); + pitr = NULL; + } if (NULL != daemon_handle_v4) - { - MHD_stop_daemon (daemon_handle_v4); - daemon_handle_v4 = NULL; - } + { + MHD_stop_daemon (daemon_handle_v4); + daemon_handle_v4 = NULL; + } if (NULL != daemon_handle_v6) - { - MHD_stop_daemon (daemon_handle_v6); - daemon_handle_v6 = NULL; - } + { + MHD_stop_daemon (daemon_handle_v6); + daemon_handle_v6 = NULL; + } if (response != NULL) - { - MHD_destroy_response (response); - response = NULL; - } + { + MHD_destroy_response (response); + response = NULL; + } + if (peerinfo != NULL) + { + GNUNET_PEERINFO_disconnect (peerinfo); + peerinfo = NULL; + } + cfg = NULL; + stats = NULL; + core = NULL; } /* end of hostlist-server.c */