/*
This file is part of GNUnet.
- (C) 2001, 2002, 2004, 2005, 2007, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 Christian Grothoff (and other contributing authors)
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
* @brief maintains list of known peers
*
* Code to maintain the list of currently known hosts (in memory
- * structure of data/hosts/ and data/credit/).
+ * structure of data/hosts/).
*
* @author Christian Grothoff
+ *
+ * TODO:
+ * - HostEntries are never 'free'd (add expiration, upper bound?)
*/
#include "platform.h"
#include "gnunet_crypto_lib.h"
+#include "gnunet_container_lib.h"
#include "gnunet_disk_lib.h"
#include "gnunet_hello_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_service_lib.h"
+#include "gnunet_statistics_service.h"
#include "peerinfo.h"
/**
*/
#define DATA_HOST_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-/**
- * How often do we flush trust values to disk?
- */
-#define TRUST_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
/**
* How often do we discard old entries in data/hosts/?
*/
struct HostEntry
{
- /**
- * This is a linked list.
- */
- struct HostEntry *next;
-
/**
* Identity of the peer.
*/
*/
struct GNUNET_HELLO_Message *hello;
- /**
- * Trust rating for this peer
- */
- uint32_t trust;
+};
- /**
- * Trust rating for this peer on disk.
- */
- uint32_t disk_trust;
-};
+/**
+ * The in-memory list of known hosts, mapping of
+ * host IDs to 'struct HostEntry*' values.
+ */
+static struct GNUNET_CONTAINER_MultiHashMap *hostmap;
/**
- * The in-memory list of known hosts.
+ * Clients to immediately notify about all changes.
*/
-static struct HostEntry *hosts;
+static struct GNUNET_SERVER_NotificationContext *notify_list;
/**
* Directory where the hellos are stored in (data/hosts)
static char *networkIdDirectory;
/**
- * Where do we store trust information?
+ * Handle for reporting statistics.
*/
-static char *trustDirectory;
+static struct GNUNET_STATISTICS_Handle *stats;
+
+
+/**
+ * Notify all clients in the notify list about the
+ * given host entry changing.
+ */
+static struct InfoMessage *
+make_info_message (const struct HostEntry *he)
+{
+ struct InfoMessage *im;
+ size_t hs;
+
+ hs = (he->hello == NULL) ? 0 : GNUNET_HELLO_size (he->hello);
+ im = GNUNET_malloc (sizeof (struct InfoMessage) + hs);
+ im->header.size = htons (hs + sizeof (struct InfoMessage));
+ im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+ im->peer = he->identity;
+ if (he->hello != NULL)
+ memcpy (&im[1], he->hello, hs);
+ return im;
+}
/**
discard_expired (void *cls,
const char *tname,
struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+ const void *addr, uint16_t addrlen)
{
const struct GNUNET_TIME_Absolute *now = cls;
- if (now->value > expiration.value)
- return GNUNET_NO;
+ if (now->abs_value > expiration.abs_value)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Removing expired address of transport `%s'\n"),
+ tname);
+ return GNUNET_NO;
+ }
return GNUNET_OK;
}
/**
- * Get the filename under which we would store the GNUNET_HELLO_Message
- * for the given host and protocol.
- * @return filename of the form DIRECTORY/HOSTID
+ * Broadcast information about the given entry to all
+ * clients that care.
+ *
+ * @param entry entry to broadcast about
*/
-static char *
-get_trust_filename (const struct GNUNET_PeerIdentity *id)
+static void
+notify_all (struct HostEntry *entry)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded fil;
- char *fn;
+ struct InfoMessage *msg;
- GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
- GNUNET_asprintf (&fn, "%s%s%s", trustDirectory, DIR_SEPARATOR_STR, &fil);
- return fn;
-}
-
-/**
- * Find the host entry for the given peer. Call
- * only when synchronized!
- * @return NULL if not found
- */
-static struct HostEntry *
-lookup_host_entry (const struct GNUNET_PeerIdentity *id)
-{
- struct HostEntry *pos;
-
- pos = hosts;
- while ((pos != NULL) &&
- (0 !=
- memcmp (id, &pos->identity, sizeof (struct GNUNET_PeerIdentity))))
- pos = pos->next;
- return pos;
+ msg = make_info_message (entry);
+ GNUNET_SERVER_notification_context_broadcast (notify_list,
+ &msg->header,
+ GNUNET_NO);
+ GNUNET_free (msg);
}
add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
{
struct HostEntry *entry;
- char *fn;
- uint32_t trust;
- char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE];
+ char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct GNUNET_HELLO_Message *hello;
struct GNUNET_HELLO_Message *hello_clean;
int size;
struct GNUNET_TIME_Absolute now;
+ char *fn;
- entry = lookup_host_entry (identity);
+ entry = GNUNET_CONTAINER_multihashmap_get (hostmap,
+ &identity->hashPubKey);
if (entry != NULL)
return;
+ GNUNET_STATISTICS_update (stats,
+ gettext_noop ("# peers known"),
+ 1,
+ GNUNET_NO);
entry = GNUNET_malloc (sizeof (struct HostEntry));
entry->identity = *identity;
- fn = get_trust_filename (identity);
- if ((GNUNET_DISK_file_test (fn) == GNUNET_YES) &&
- (sizeof (trust) == GNUNET_DISK_fn_read (fn, &trust, sizeof (trust))))
- entry->disk_trust = entry->trust = ntohl (trust);
- GNUNET_free (fn);
fn = get_host_filename (identity);
if (GNUNET_DISK_file_test (fn) == GNUNET_YES)
}
}
GNUNET_free (fn);
- entry->next = hosts;
- hosts = entry;
-}
-
-
-/**
- * Increase the host credit by a value.
- *
- * @param hostId is the identity of the host
- * @param value is the int value by which the
- * host credit is to be increased or decreased
- * @returns the actual change in trust (positive or negative)
- */
-static int
-change_host_trust (const struct GNUNET_PeerIdentity *hostId, int value)
-{
- struct HostEntry *host;
-
- if (value == 0)
- return 0;
- host = lookup_host_entry (hostId);
- if (host == NULL)
- {
- add_host_to_known_hosts (hostId);
- host = lookup_host_entry (hostId);
- }
- GNUNET_assert (host != NULL);
- if (value > 0)
- {
- if (host->trust + value < host->trust)
- {
- value = ((uint32_t) - 1) - host->trust;
- host->trust = (uint32_t) - 1; /* maximized */
- }
- else
- host->trust += value;
- }
- else
- {
- if (host->trust < -value)
- {
- value = -host->trust;
- host->trust = 0;
- }
- else
- host->trust += value;
- }
- return value;
+ GNUNET_CONTAINER_multihashmap_put (hostmap,
+ &identity->hashPubKey,
+ entry,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ notify_all (entry);
}
static int
-hosts_directory_scan_callback (void *cls, const char *fullname)
+hosts_directory_scan_callback (void *cls,
+ const char *fullname)
{
unsigned int *matched = cls;
struct GNUNET_PeerIdentity identity;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING |
GNUNET_ERROR_TYPE_BULK,
_("Still no peers found in `%s'!\n"), networkIdDirectory);
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- DATA_HOST_FREQ,
+ GNUNET_SCHEDULER_add_delayed (DATA_HOST_FREQ,
&cron_scan_directory_data_hosts, NULL);
}
char *fn;
struct HostEntry *host;
struct GNUNET_HELLO_Message *mrg;
+ struct GNUNET_TIME_Absolute delta;
add_host_to_known_hosts (peer);
- host = lookup_host_entry (peer);
+ host = GNUNET_CONTAINER_multihashmap_get (hostmap,
+ &peer->hashPubKey);
GNUNET_assert (host != NULL);
if (host->hello == NULL)
{
else
{
mrg = GNUNET_HELLO_merge (host->hello, hello);
+ delta = GNUNET_HELLO_equals (mrg,
+ host->hello,
+ GNUNET_TIME_absolute_get ());
+ if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
+ {
+ GNUNET_free (mrg);
+ return;
+ }
GNUNET_free (host->hello);
host->hello = mrg;
}
fn = get_host_filename (peer);
+ GNUNET_DISK_directory_create_for_file (fn);
GNUNET_DISK_fn_write (fn,
host->hello,
GNUNET_HELLO_size (host->hello),
GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
| GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
GNUNET_free (fn);
+ notify_all (host);
}
+
/**
- * Do transmit info either for only the host matching the given
- * argument or for all known hosts and change their trust values by
- * the given delta.
+ * Do transmit info about peer to given host.
*
- * @param only NULL to hit all hosts, otherwise specifies a particular target
- * @param trust_change how much should the trust be changed
- * @param client who is making the request (and will thus receive our confirmation)
+ * @param cls NULL to hit all hosts, otherwise specifies a particular target
+ * @param key hostID
+ * @param value information to transmit
+ * @return GNUNET_YES (continue to iterate)
*/
-static void
-send_to_each_host (const struct GNUNET_PeerIdentity *only,
- int trust_change, struct GNUNET_SERVER_Client *client)
+static int
+add_to_tc (void *cls,
+ const GNUNET_HashCode *key,
+ void *value)
{
- struct HostEntry *pos;
+ struct GNUNET_SERVER_TransmitContext *tc = cls;
+ struct HostEntry *pos = value;
struct InfoMessage *im;
- const struct GNUNET_MessageHeader *end;
uint16_t hs;
- char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
- struct GNUNET_SERVER_TransmitContext *tc;
+ char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
- tc = GNUNET_SERVER_transmit_context_create (client);
- pos = hosts;
- while (pos != NULL)
+ hs = 0;
+ im = (struct InfoMessage *) buf;
+ if (pos->hello != NULL)
{
- if ((only == NULL) ||
- (0 ==
- memcmp (only, &pos->identity,
- sizeof (struct GNUNET_PeerIdentity))))
- {
- change_host_trust (&pos->identity, trust_change);
- hs = 0;
- im = (struct InfoMessage *) buf;
- if (pos->hello != NULL)
- {
- hs = GNUNET_HELLO_size (pos->hello);
- GNUNET_assert (hs <
- GNUNET_SERVER_MAX_MESSAGE_SIZE -
- sizeof (struct InfoMessage));
- memcpy (&im[1], pos->hello, hs);
- }
- im->trust = htonl (pos->trust);
- im->peer = pos->identity;
- end = &im->header;
- GNUNET_SERVER_transmit_context_append (tc,
- &end[1],
- hs +
- sizeof (struct InfoMessage) -
- sizeof (struct
- GNUNET_MessageHeader),
- GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
- }
- pos = pos->next;
+ hs = GNUNET_HELLO_size (pos->hello);
+ GNUNET_assert (hs <
+ GNUNET_SERVER_MAX_MESSAGE_SIZE -
+ sizeof (struct InfoMessage));
+ memcpy (&im[1], pos->hello, hs);
}
- GNUNET_SERVER_transmit_context_append (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
- GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
-}
-
-
-/**
- * Write host-trust information to a file - flush the buffer entry!
- * Assumes synchronized access.
- */
-static void
-flush_trust (struct HostEntry *host)
-{
- char *fn;
- uint32_t trust;
-
- if (host->trust == host->disk_trust)
- return; /* unchanged */
- fn = get_trust_filename (&host->identity);
- if (host->trust == 0)
- {
- if ((0 != UNLINK (fn)) && (errno != ENOENT))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
- }
- else
- {
- trust = htonl (host->trust);
- if (sizeof(uint32_t) == GNUNET_DISK_fn_write (fn, &trust,
- sizeof(uint32_t),
- GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
- | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ))
- host->disk_trust = host->trust;
- }
- GNUNET_free (fn);
-}
-
-/**
- * Call this method periodically to scan data/hosts for new hosts.
- */
-static void
-cron_flush_trust (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct HostEntry *pos;
-
- pos = hosts;
- while (pos != NULL)
- {
- flush_trust (pos);
- pos = pos->next;
- }
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- TRUST_FLUSH_FREQ, &cron_flush_trust, NULL);
+ im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
+ im->header.size = htons (sizeof (struct InfoMessage) + hs);
+ im->reserved = htonl (0);
+ im->peer = pos->identity;
+ GNUNET_SERVER_transmit_context_append_message (tc,
+ &im->header);
+ return GNUNET_YES;
}
discard_hosts_helper (void *cls, const char *fn)
{
struct GNUNET_TIME_Absolute *now = cls;
- char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE];
+ char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct GNUNET_HELLO_Message *hello;
struct GNUNET_HELLO_Message *new_hello;
int size;
size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
- if ((size < sizeof (struct GNUNET_MessageHeader)) && (0 != UNLINK (fn)))
+ if (size < sizeof (struct GNUNET_MessageHeader))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+ if (0 != UNLINK (fn))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
+ GNUNET_ERROR_TYPE_BULK, "unlink", fn);
return GNUNET_OK;
}
hello = (const struct GNUNET_HELLO_Message *) buffer;
new_hello = GNUNET_HELLO_iterate_addresses (hello,
GNUNET_YES,
&discard_expired, now);
- if ((new_hello == NULL) && (0 != UNLINK (fn)))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
if (new_hello != NULL)
{
GNUNET_DISK_fn_write (fn,
| GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ);
GNUNET_free (new_hello);
}
+ else
+ {
+ if (0 != UNLINK (fn))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
+ GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+ }
return GNUNET_OK;
}
now = GNUNET_TIME_absolute_get ();
GNUNET_DISK_directory_scan (networkIdDirectory,
&discard_hosts_helper, &now);
-
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- DATA_HOST_CLEAN_FREQ,
+ GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ,
&cron_clean_data_hosts, NULL);
}
/**
- * Handle ADD-message.
+ * Handle HELLO-message.
*
* @param cls closure
* @param client identification of the client
* @param message the actual message
*/
static void
-handle_add (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_hello (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- const struct PeerAddMessage *pam;
- const struct GNUNET_MessageHeader *hello;
- uint16_t size;
+ const struct GNUNET_HELLO_Message *hello;
+ struct GNUNET_PeerIdentity pid;
- size = ntohs (message->size);
- if (size <
- sizeof (struct PeerAddMessage) + sizeof (struct GNUNET_MessageHeader))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- pam = (const struct PeerAddMessage *) message;
- hello = (const struct GNUNET_MessageHeader *) &pam[1];
- if (size != sizeof (struct PeerAddMessage) + ntohs (hello->size))
+ hello = (const struct GNUNET_HELLO_Message *) message;
+ if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- bind_address (&pam->peer, (const struct GNUNET_HELLO_Message *) hello);
+#if DEBUG_PEERINFO
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received for peer `%4s'\n",
+ "HELLO",
+ GNUNET_i2s (&pid));
+#endif
+ bind_address (&pid, hello);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
const struct GNUNET_MessageHeader *message)
{
const struct ListPeerMessage *lpm;
+ struct GNUNET_SERVER_TransmitContext *tc;
lpm = (const struct ListPeerMessage *) message;
- send_to_each_host (&lpm->peer, ntohl (lpm->trust_change), client);
+ GNUNET_break (0 == ntohl (lpm->reserved));
+#if DEBUG_PEERINFO
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received for peer `%4s'\n",
+ "GET",
+ GNUNET_i2s (&lpm->peer));
+#endif
+ tc = GNUNET_SERVER_transmit_context_create (client);
+ GNUNET_CONTAINER_multihashmap_get_multiple (hostmap,
+ &lpm->peer.hashPubKey,
+ &add_to_tc,
+ tc);
+ GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+ GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+ GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
}
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- const struct ListAllPeersMessage *lpm;
+ struct GNUNET_SERVER_TransmitContext *tc;
+
+#if DEBUG_PEERINFO
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received\n",
+ "GET_ALL");
+#endif
+ tc = GNUNET_SERVER_transmit_context_create (client);
+ GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+ &add_to_tc,
+ tc);
+ GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+ GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END);
+ GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+}
+
- lpm = (const struct ListAllPeersMessage *) message;
- send_to_each_host (NULL, ntohl (lpm->trust_change), client);
+static int
+do_notify_entry (void *cls,
+ const GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_SERVER_Client *client = cls;
+ struct HostEntry *he = value;
+ struct InfoMessage *msg;
+
+ msg = make_info_message (he);
+ GNUNET_SERVER_notification_context_unicast (notify_list,
+ client,
+ &msg->header,
+ GNUNET_NO);
+ GNUNET_free (msg);
+ return GNUNET_YES;
}
/**
- * List of handlers for the messages understood by this
- * service.
+ * Handle NOTIFY-message.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the actual message
*/
-static struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_add, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_ADD, 0},
- {&handle_get, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET,
- sizeof (struct ListPeerMessage)},
- {&handle_get_all, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL,
- sizeof (struct ListAllPeersMessage)},
- {NULL, NULL, 0, 0}
-};
+static void
+handle_notify (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+#if DEBUG_PEERINFO
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received\n",
+ "NOTIFY");
+#endif
+ GNUNET_SERVER_notification_context_add (notify_list,
+ client);
+ GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+ &do_notify_entry,
+ client);
+}
+
+
+static int
+free_host_entry (void *cls,
+ const GNUNET_HashCode *key,
+ void *value)
+{
+ struct HostEntry *he = value;
+ GNUNET_free_non_null (he->hello);
+ GNUNET_free (he);
+ return GNUNET_YES;
+}
+
+/**
+ * Clean up our state. Called during shutdown.
+ *
+ * @param cls unused
+ * @param tc scheduler task context, unused
+ */
+static void
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_SERVER_notification_context_destroy (notify_list);
+ notify_list = NULL;
+ GNUNET_CONTAINER_multihashmap_iterate (hostmap,
+ &free_host_entry,
+ NULL);
+ GNUNET_CONTAINER_multihashmap_destroy (hostmap);
+ if (stats != NULL)
+ {
+ GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+ stats = NULL;
+ }
+}
/**
* Process statistics requests.
*
* @param cls closure
- * @param sched scheduler to use
* @param server the initialized server
* @param cfg configuration to use
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+ {&handle_hello, NULL, GNUNET_MESSAGE_TYPE_HELLO, 0},
+ {&handle_get, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET,
+ sizeof (struct ListPeerMessage)},
+ {&handle_get_all, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL,
+ sizeof (struct GNUNET_MessageHeader)},
+ {&handle_notify, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY,
+ sizeof (struct GNUNET_MessageHeader)},
+ {NULL, NULL, 0, 0}
+ };
+
+ hostmap = GNUNET_CONTAINER_multihashmap_create (1024);
+ stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
+ notify_list = GNUNET_SERVER_notification_context_create (server, 0);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_filename (cfg,
"peerinfo",
"HOSTS",
&networkIdDirectory));
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- "peerinfo",
- "TRUST",
- &trustDirectory));
GNUNET_DISK_directory_create (networkIdDirectory);
- GNUNET_DISK_directory_create (trustDirectory);
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_scan_directory_data_hosts, NULL);
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_trust, NULL);
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_clean_data_hosts, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
}
ret = (GNUNET_OK ==
GNUNET_SERVICE_run (argc,
argv,
- "peerinfo", &run, NULL)) ? 0 : 1;
+ "peerinfo",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run, NULL)) ? 0 : 1;
GNUNET_free_non_null (networkIdDirectory);
- GNUNET_free_non_null (trustDirectory);
return ret;
}
projects / oweals / gnunet.git / blobdiff