#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.
*/
*/
struct GNUNET_CORE_Handle *core;
+/**
+ * Handle to the peerinfo notify service (NULL until we've connected to it).
+ */
+struct GNUNET_PEERINFO_NotifyContext *notify;
+
/**
* Our primary task for IPv4.
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v6;
-/**
- * Task that updates our HTTP response.
- */
-static GNUNET_SCHEDULER_TaskIdentifier response_task;
-
/**
* Our canonical response.
*/
static char * hostlist_uri;
-/**
- * Task that will produce a new response object.
- */
-static void
-update_response (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
/**
* Function that assembles our response.
*/
static void
finish_response (struct HostSet *results)
{
- struct GNUNET_TIME_Relative freq;
-
if (response != NULL)
MHD_destroy_response (response);
#if DEBUG_HOSTLIST_SERVER
#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,
check_has_addr (void *cls,
const char *tname,
struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+ const void *addr,
+ uint16_t addrlen)
{
int *arg = cls;
"HELLO",
GNUNET_i2s (peer));
#endif
- if (old + s >= GNUNET_MAX_MALLOC_CHECKED)
+ 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)"),
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);
}
-/**
- * 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));
- GNUNET_assert (peerinfo != NULL);
- pitr = GNUNET_PEERINFO_iterate (peerinfo,
- NULL,
- 0,
- GNUNET_TIME_UNIT_MINUTES,
- &host_processor,
- results);
-}
-
/**
* Hostlist access policy (very permissive, allows everything).
"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_set (stats,
gettext_noop("# hostlist advertisements send"),
hostlist_adv_count,
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asked core to transmit advertisement message with a size of %u bytes\n",
- size);
+ "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,
0,
GNUNET_ADV_TIMEOUT,
/* 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 trust how much we trust the peer (not used)
+ */
+static void
+process_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
+ uint32_t trust)
+{
+ struct HostSet *results;
+#if DEBUG_HOSTLIST_SERVER
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peerinfo is notifying us to rebuild our hostlist\n");
+#endif
+ results = GNUNET_malloc(sizeof(struct HostSet));
+ GNUNET_assert (peerinfo != NULL);
+ pitr = GNUNET_PEERINFO_iterate (peerinfo,
+ NULL,
+ 0,
+ GNUNET_TIME_UNIT_MINUTES,
+ &host_processor,
+ results);
+}
/**
* Function that queries MHD's select sets and
"HTTPPORT",
&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);
- hostname = GNUNET_RESOLVER_local_hostname_get ();
+ _("Hostlist service starts on %s:%llu\n"),
+ hostname, port);
if (NULL != hostname)
{
size = strlen (hostname);
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, sched, process_notify, NULL);
+
return GNUNET_OK;
}
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);
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;
- }
if (NULL != daemon_handle_v4)
{
MHD_stop_daemon (daemon_handle_v4);
GNUNET_PEERINFO_disconnect (peerinfo);
peerinfo = NULL;
}
+ cfg = NULL;
+ sched = NULL;
+ stats = NULL;
+ core = NULL;
}
/* end of hostlist-server.c */