X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpeerinfo%2Fgnunet-service-peerinfo.c;h=c93072de30895f36ebdf1be9a9a75050d8c7669f;hb=c1fe0ed0ba3d599f5b593ad863b69f73e7fd4625;hp=a839da0497d00fb58a7799166887a5a35354633b;hpb=537903a8dc4c3ecf2dfa382af0289ddf890adfc7;p=oweals%2Fgnunet.git diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index a839da049..c93072de3 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c @@ -1,10 +1,10 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 Christian Grothoff (and other contributing authors) + (C) 2001-2014 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 @@ -23,20 +23,15 @@ * @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_disk_lib.h" +#include "gnunet_util_lib.h" #include "gnunet_hello_lib.h" #include "gnunet_protocols.h" -#include "gnunet_service_lib.h" #include "gnunet_statistics_service.h" #include "peerinfo.h" @@ -45,16 +40,12 @@ */ #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/? */ #define DATA_HOST_CLEAN_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60) + /** * In-memory cache of known hosts. */ @@ -62,37 +53,88 @@ struct HostEntry { /** - * This is a linked list. + * Identity of the peer. */ - struct HostEntry *next; + struct GNUNET_PeerIdentity identity; /** - * Identity of the peer. + * Hello for the peer (can be NULL) */ - struct GNUNET_PeerIdentity identity; + struct GNUNET_HELLO_Message *hello; + /** + * Friend only hello for the peer (can be NULL) + */ + struct GNUNET_HELLO_Message *friend_only_hello; + +}; + +/** + * Transmit context for GET requests + */ +struct TransmitContext +{ + /** + * Server transmit context + */ + struct GNUNET_SERVER_TransmitContext *tc; + + /** + * Include friend only HELLOs #GNUNET_YES or #GNUNET_NO + */ + int friend_only; +}; + + +/** + * Result of reading a file + */ +struct ReadHostFileContext +{ /** * Hello for the peer (can be NULL) */ struct GNUNET_HELLO_Message *hello; /** - * Trust rating for this peer + * Friend only hello for the peer (can be NULL) + */ + struct GNUNET_HELLO_Message *friend_only_hello; +}; + + +/** + * Client notification context + */ +struct NotificationContext +{ + /** + * Next in DLL */ - uint32_t trust; + struct NotificationContext *prev; /** - * Trust rating for this peer on disk. + * Previous in DLL */ - uint32_t disk_trust; + struct NotificationContext *next; + /** + * Server client + */ + struct GNUNET_SERVER_Client *client; + + /** + * Interested in friend only HELLO? + */ + int include_friend_only; }; /** - * The in-memory list of known hosts. + * The in-memory list of known hosts, mapping of + * host IDs to 'struct HostEntry*' values. */ -static struct HostEntry *hosts; +static struct GNUNET_CONTAINER_MultiPeerMap *hostmap; /** * Clients to immediately notify about all changes. @@ -100,39 +142,54 @@ static struct HostEntry *hosts; static struct GNUNET_SERVER_NotificationContext *notify_list; /** - * Directory where the hellos are stored in (data/hosts) + * Directory where the hellos are stored in (peerinfo/) */ static char *networkIdDirectory; /** - * Where do we store trust information? + * Handle for reporting statistics. */ -static char *trustDirectory; +static struct GNUNET_STATISTICS_Handle *stats; /** - * Handle for reporting statistics. + * DLL of notification contexts: head */ -static struct GNUNET_STATISTICS_Handle *stats; +static struct NotificationContext *nc_head; + +/** + * DLL of notification contexts: tail + */ +static struct NotificationContext *nc_tail; /** * Notify all clients in the notify list about the * given host entry changing. + * + * @param he entry of the host for which we generate a notification + * @param include_friend_only create public of friend-only message + * @return generated notification message */ static struct InfoMessage * -make_info_message (const struct HostEntry *he) +make_info_message (const struct HostEntry *he, + int include_friend_only) { struct InfoMessage *im; + struct GNUNET_HELLO_Message *src; size_t hs; - hs = (he->hello == NULL) ? 0 : GNUNET_HELLO_size (he->hello); + if (GNUNET_YES == include_friend_only) + src = he->friend_only_hello; + else + src = he->hello; + + hs = (NULL == src) ? 0 : GNUNET_HELLO_size (src); 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->trust = htonl (he->trust); im->peer = he->identity; - if (he->hello != NULL) - memcpy (&im[1], he->hello, hs); + if (NULL != src) + memcpy (&im[1], src, hs); return im; } @@ -141,86 +198,70 @@ make_info_message (const struct HostEntry *he) * Address iterator that causes expired entries to be discarded. * * @param cls pointer to the current time - * @param tname name of the transport + * @param address the address * @param expiration expiration time for the address - * @param addr the address - * @param addrlen length of addr in bytes - * @return GNUNET_NO if expiration smaller than the current time + * @return #GNUNET_NO if expiration smaller than the current time */ static int discard_expired (void *cls, - const char *tname, - struct GNUNET_TIME_Absolute expiration, - const void *addr, uint16_t addrlen) + const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) { const struct GNUNET_TIME_Absolute *now = cls; - if (now->value > expiration.value) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Removing expired address of transport `%s'\n"), - tname); - return GNUNET_NO; - } + + if (now->abs_value_us > expiration.abs_value_us) + { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _("Removing expired address of transport `%s'\n"), + address->transport_name); + 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 + * Address iterator that counts the remaining addresses. + * + * @param cls pointer to the counter + * @param address the address + * @param expiration expiration time for the address + * @return #GNUNET_OK (always) */ -static char * -get_host_filename (const struct GNUNET_PeerIdentity *id) +static int +count_addresses (void *cls, + const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) { - struct GNUNET_CRYPTO_HashAsciiEncoded fil; - char *fn; + unsigned int *cnt = cls; - GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil); - GNUNET_asprintf (&fn, - "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR, &fil); - return fn; + (*cnt)++; + return GNUNET_OK; } /** * Get the filename under which we would store the GNUNET_HELLO_Message * for the given host and protocol. + * + * @param id peer for which we need the filename for the HELLO * @return filename of the form DIRECTORY/HOSTID */ static char * -get_trust_filename (const struct GNUNET_PeerIdentity *id) +get_host_filename (const struct GNUNET_PeerIdentity *id) { - struct GNUNET_CRYPTO_HashAsciiEncoded fil; char *fn; - GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil); - GNUNET_asprintf (&fn, "%s%s%s", trustDirectory, DIR_SEPARATOR_STR, &fil); + if (NULL == networkIdDirectory) + return NULL; + GNUNET_asprintf (&fn, "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR, + GNUNET_i2s_full (id)); 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; -} - - -/** - * Broadcast information about the given entry to all + * Broadcast information about the given entry to all * clients that care. * * @param entry entry to broadcast about @@ -228,132 +269,230 @@ lookup_host_entry (const struct GNUNET_PeerIdentity *id) static void notify_all (struct HostEntry *entry) { - struct InfoMessage *msg; + struct InfoMessage *msg_pub; + struct InfoMessage *msg_friend; + struct NotificationContext *cur; - msg = make_info_message (entry); - GNUNET_SERVER_notification_context_broadcast (notify_list, - &msg->header, - GNUNET_NO); - GNUNET_free (msg); + msg_pub = make_info_message (entry, GNUNET_NO); + msg_friend = make_info_message (entry, GNUNET_YES); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Notifying all clients about peer `%s'\n", + GNUNET_i2s(&entry->identity)); + for (cur = nc_head; NULL != cur; cur = cur->next) + { + if (GNUNET_NO == cur->include_friend_only) + { + GNUNET_SERVER_notification_context_unicast (notify_list, + cur->client, + &msg_pub->header, + GNUNET_NO); + } + if (GNUNET_YES == cur->include_friend_only) + { + GNUNET_SERVER_notification_context_unicast (notify_list, + cur->client, + &msg_friend->header, + GNUNET_NO); + } + } + GNUNET_free (msg_pub); + GNUNET_free (msg_friend); } /** - * Add a host to the list. + * Bind a host address (hello) to a hostId. * - * @param identity the identity of the host + * @param peer the peer for which this is a hello + * @param hello the verified (!) hello message */ static void -add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity) +update_hello (const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello); + + +/** + * Try to read the HELLOs in the given filename and discard expired + * addresses. Removes the file if one the HELLO is malformed. If all + * addresses are expired, the HELLO is also removed (but the HELLO + * with the public key is still returned if it was found and valid). + * The file can contain multiple HELLO messages. + * + * @param fn name of the file + * @param unlink_garbage if #GNUNET_YES, try to remove useless files + * @param r ReadHostFileContext to store the resutl + */ +static void +read_host_file (const char *fn, + int unlink_garbage, + struct ReadHostFileContext *r) { - struct HostEntry *entry; - char *fn; - uint32_t trust; - char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; + char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN; + unsigned int size_total; + struct GNUNET_TIME_Absolute now; + unsigned int left; const struct GNUNET_HELLO_Message *hello; struct GNUNET_HELLO_Message *hello_clean; - int size; - struct GNUNET_TIME_Absolute now; + unsigned read_pos; + int size_hello; + + r->friend_only_hello = NULL; + r->hello = NULL; - entry = lookup_host_entry (identity); - if (entry != NULL) + if (GNUNET_YES != GNUNET_DISK_file_test (fn)) 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) + size_total = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Read %u bytes from `%s'\n", + size_total, + fn); + if (size_total < sizeof (struct GNUNET_MessageHeader)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to parse HELLO in file `%s': %s\n"), + fn, "Fail has invalid size"); + if ( (GNUNET_YES == unlink_garbage) && + (0 != UNLINK (fn)) && + (ENOENT != errno) ) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", + fn); + return; + } + + read_pos = 0; + while (read_pos < size_total) + { + hello = (const struct GNUNET_HELLO_Message *) &buffer[read_pos]; + size_hello = GNUNET_HELLO_size (hello); + if (0 == size_hello) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to parse HELLO in file `%s'\n"), + fn); + if ((GNUNET_YES == unlink_garbage) && + (0 != UNLINK (fn)) && + (ENOENT != errno) ) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", + fn); + return; + } + + now = GNUNET_TIME_absolute_get (); + hello_clean = GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, + &discard_expired, &now); + if (NULL == hello_clean) { - size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer)); - hello = (const struct GNUNET_HELLO_Message *) buffer; - if ( (size < sizeof (struct GNUNET_MessageHeader)) || - (size != ntohs((((const struct GNUNET_MessageHeader*) hello)->size))) || - (size != GNUNET_HELLO_size (hello)) ) - { - GNUNET_break (0); - if (0 != UNLINK (fn)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "unlink", - fn); - } + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to parse HELLO in file `%s'\n"), + fn); + if ((GNUNET_YES == unlink_garbage) && + (0 != UNLINK (fn)) && + (ENOENT != errno) ) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", + fn); + return; + } + left = 0; + (void) GNUNET_HELLO_iterate_addresses (hello_clean, GNUNET_NO, + &count_addresses, &left); + + if (0 == left) + { + GNUNET_free (hello_clean); + break; + } + + if (GNUNET_NO == GNUNET_HELLO_is_friend_only (hello_clean)) + { + if (NULL == r->hello) + r->hello = hello_clean; else - { - now = GNUNET_TIME_absolute_get (); - hello_clean = GNUNET_HELLO_iterate_addresses (hello, - GNUNET_YES, - &discard_expired, &now); - entry->hello = hello_clean; - } + { + GNUNET_break (0); + GNUNET_free (r->hello); + r->hello = hello_clean; + } } - GNUNET_free (fn); - entry->next = hosts; - hosts = entry; - notify_all (entry); + else + { + if (NULL == r->friend_only_hello) + r->friend_only_hello = hello_clean; + else + { + GNUNET_break (0); + GNUNET_free (r->friend_only_hello); + r->friend_only_hello = hello_clean; + } + } + read_pos += size_hello; + } + + if (0 == left) + { + /* no addresses left, remove from disk */ + if ( (GNUNET_YES == unlink_garbage) && + (0 != UNLINK (fn)) ) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", + fn); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Found `%s' and `%s' HELLO message in file\n", + (NULL != r->hello) ? "public" : "NON-public", + (NULL != r->friend_only_hello) ? "friend only" : "NO friend only"); } /** - * Increase the host credit by a value. + * Add a host to the list and notify clients about this event * - * @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) + * @param identity the identity of the host + * @return the HostEntry */ -static int -change_host_trust (const struct GNUNET_PeerIdentity *hostId, int value) +static struct HostEntry * +add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity) { - struct HostEntry *host; - unsigned int old_trust; + struct HostEntry *entry; + struct ReadHostFileContext r; + char *fn; - 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); - old_trust = host->trust; - if (value > 0) + entry = GNUNET_CONTAINER_multipeermap_get (hostmap, identity); + if (NULL == entry) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding new peer `%s'\n", GNUNET_i2s (identity)); + GNUNET_STATISTICS_update (stats, gettext_noop ("# peers known"), 1, + GNUNET_NO); + entry = GNUNET_new (struct HostEntry); + entry->identity = *identity; + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (hostmap, &entry->identity, entry, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + notify_all (entry); + fn = get_host_filename (identity); + if (NULL != fn) { - if (host->trust + value < host->trust) - { - value = UINT32_MAX - host->trust; - host->trust = UINT32_MAX; - } - else - host->trust += value; + read_host_file (fn, GNUNET_YES, &r); + if (NULL != r.hello) + update_hello (identity, r.hello); + if (NULL != r.friend_only_hello) + update_hello (identity, r.friend_only_hello); + GNUNET_free_non_null (r.hello); + GNUNET_free_non_null (r.friend_only_hello); + GNUNET_free (fn); } - else - { - if (host->trust < -value) - { - value = -host->trust; - host->trust = 0; - } - else - host->trust += value; - } - if (host->trust != old_trust) - notify_all (host); - return value; + } + return entry; } /** * Remove a file that should not be there. LOG * success or failure. + * + * @param fullname name of the file to remove */ static void remove_garbage (const char *fullname) @@ -364,68 +503,192 @@ remove_garbage (const char *fullname) ("File `%s' in directory `%s' does not match naming convention. " "Removed.\n"), fullname, networkIdDirectory); else - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR | - GNUNET_ERROR_TYPE_BULK, "unlink", fullname); + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "unlink", fullname); } +/** + * Closure for 'hosts_directory_scan_callback'. + */ +struct DirScanContext +{ + /** + * #GNUNET_YES if we should remove files that are broken, + * #GNUNET_NO if the directory we are iterating over should + * be treated as read-only by us. + */ + int remove_files; + + /** + * Counter for the number of (valid) entries found, incremented + * by one for each match. + */ + unsigned int matched; +}; + + +/** + * Function that is called on each HELLO file in a particular directory. + * Try to parse the file and add the HELLO to our list. + * + * @param cls pointer to 'unsigned int' to increment for each file, or NULL + * if the file is from a read-only, read-once resource directory + * @param fullname name of the file to parse + * @return #GNUNET_OK (continue iteration) + */ static int hosts_directory_scan_callback (void *cls, const char *fullname) { - unsigned int *matched = cls; + struct DirScanContext *dsc = cls; struct GNUNET_PeerIdentity identity; + struct ReadHostFileContext r; const char *filename; + struct GNUNET_PeerIdentity id_public; + struct GNUNET_PeerIdentity id_friend; + struct GNUNET_PeerIdentity id; - if (GNUNET_DISK_file_test (fullname) != GNUNET_YES) + if (GNUNET_YES != GNUNET_DISK_file_test (fullname)) return GNUNET_OK; /* ignore non-files */ - if (strlen (fullname) < sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) - { - remove_garbage (fullname); - return GNUNET_OK; - } - filename = - &fullname[strlen (fullname) - - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1]; - if (filename[-1] != DIR_SEPARATOR) - { + + filename = strrchr (fullname, DIR_SEPARATOR); + if ((NULL == filename) || (1 > strlen (filename))) + filename = fullname; + else + filename ++; + + read_host_file (fullname, dsc->remove_files, &r); + if ( (NULL == r.hello) && (NULL == r.friend_only_hello)) + return GNUNET_OK; + if (NULL != r.friend_only_hello) + { + if (GNUNET_OK != GNUNET_HELLO_get_id (r.friend_only_hello, &id_friend)) + if (GNUNET_YES == dsc->remove_files) + { + remove_garbage (fullname); + return GNUNET_OK; + } + id = id_friend; + } + if (NULL != r.hello) + { + if (GNUNET_OK != GNUNET_HELLO_get_id (r.hello, &id_public)) + if (GNUNET_YES == dsc->remove_files) + { + remove_garbage (fullname); + return GNUNET_OK; + } + id = id_public; + } + + if ( (NULL != r.hello) && (NULL != r.friend_only_hello) && + (0 != memcmp (&id_friend, &id_public, sizeof (id_friend))) ) + { + /* HELLOs are not for the same peer */ + GNUNET_break (0); + if (GNUNET_YES == dsc->remove_files) remove_garbage (fullname); - return GNUNET_OK; - } - if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (filename, - &identity.hashPubKey)) + return GNUNET_OK; + } + if (GNUNET_OK == GNUNET_CRYPTO_eddsa_public_key_from_string (filename, + strlen (filename), + &identity.public_key)) + { + if (0 != memcmp (&id, &identity, sizeof (id_friend))) { - remove_garbage (fullname); + /* HELLOs are not for the same peer */ + GNUNET_break (0); + if (GNUNET_YES == dsc->remove_files) + remove_garbage (fullname); return GNUNET_OK; } - (*matched)++; - add_host_to_known_hosts (&identity); + } + + /* ok, found something valid, remember HELLO */ + add_host_to_known_hosts (&id); + if (NULL != r.hello) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' public HELLO \n", + GNUNET_i2s (&id)); + update_hello (&id, r.hello); + GNUNET_free (r.hello); + } + if (NULL != r.friend_only_hello) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' friend only HELLO \n", + GNUNET_i2s (&id)); + update_hello (&id, r.friend_only_hello); + GNUNET_free (r.friend_only_hello); + } + dsc->matched++; return GNUNET_OK; } /** * Call this method periodically to scan data/hosts for new hosts. + * + * @param cls unused + * @param tc scheduler context, aborted if reason is shutdown */ static void cron_scan_directory_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { static unsigned int retries; - unsigned int count; + struct DirScanContext dsc; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) return; - count = 0; - GNUNET_DISK_directory_create (networkIdDirectory); + if (GNUNET_SYSERR == GNUNET_DISK_directory_create (networkIdDirectory)) + { + GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ, + GNUNET_SCHEDULER_PRIORITY_IDLE, + &cron_scan_directory_data_hosts, NULL); + return; + } + dsc.matched = 0; + dsc.remove_files = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, + _("Scanning directory `%s'\n"), networkIdDirectory); GNUNET_DISK_directory_scan (networkIdDirectory, - &hosts_directory_scan_callback, &count); - if ((0 == count) && (0 == (++retries & 31))) - GNUNET_log (GNUNET_ERROR_TYPE_WARNING | - GNUNET_ERROR_TYPE_BULK, + &hosts_directory_scan_callback, &dsc); + if ((0 == dsc.matched) && (0 == (++retries & 31))) + 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, - &cron_scan_directory_data_hosts, NULL); + GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ, + GNUNET_SCHEDULER_PRIORITY_IDLE, + &cron_scan_directory_data_hosts, + NULL); +} + + +static struct GNUNET_HELLO_Message * +update_friend_hello (const struct GNUNET_HELLO_Message *hello, + const struct GNUNET_HELLO_Message *friend_hello) +{ + struct GNUNET_HELLO_Message * res; + struct GNUNET_HELLO_Message * tmp; + struct GNUNET_CRYPTO_EddsaPublicKey pk; + + if (NULL != friend_hello) + { + res = GNUNET_HELLO_merge (hello, friend_hello); + GNUNET_assert (GNUNET_YES == GNUNET_HELLO_is_friend_only (res)); + return res; + } + + if (GNUNET_OK != + GNUNET_HELLO_get_key (hello, &pk)) + { + GNUNET_break (0); + return NULL; + } + tmp = GNUNET_HELLO_create (&pk, NULL, NULL, GNUNET_YES); + res = GNUNET_HELLO_merge (hello, tmp); + GNUNET_free (tmp); + GNUNET_assert (GNUNET_YES == GNUNET_HELLO_is_friend_only (res)); + return res; } @@ -436,224 +699,302 @@ cron_scan_directory_data_hosts (void *cls, * @param hello the verified (!) hello message */ static void -bind_address (const struct GNUNET_PeerIdentity *peer, +update_hello (const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Message *hello) { char *fn; struct HostEntry *host; struct GNUNET_HELLO_Message *mrg; + struct GNUNET_HELLO_Message **dest; struct GNUNET_TIME_Absolute delta; - - add_host_to_known_hosts (peer); - host = lookup_host_entry (peer); - GNUNET_assert (host != NULL); - if (host->hello == NULL) - { - host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello)); - memcpy (host->hello, hello, GNUNET_HELLO_size (hello)); - } + unsigned int cnt; + unsigned int size; + int friend_hello_type; + int store_hello; + int store_friend_hello; + int pos; + char *buffer; + + host = GNUNET_CONTAINER_multipeermap_get (hostmap, peer); + GNUNET_assert (NULL != host); + + friend_hello_type = GNUNET_HELLO_is_friend_only (hello); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating %s HELLO for `%s'\n", + (GNUNET_YES == friend_hello_type) ? "friend-only" : "public", + GNUNET_i2s (peer)); + + dest = NULL; + if (GNUNET_YES == friend_hello_type) + { + dest = &host->friend_only_hello; + } + else + { + dest = &host->hello; + } + + if (NULL == (*dest)) + { + (*dest) = GNUNET_malloc (GNUNET_HELLO_size (hello)); + memcpy ((*dest), hello, GNUNET_HELLO_size (hello)); + } else + { + mrg = GNUNET_HELLO_merge ((*dest), hello); + delta = GNUNET_HELLO_equals (mrg, (*dest), GNUNET_TIME_absolute_get ()); + if (delta.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us) { - mrg = GNUNET_HELLO_merge (host->hello, hello); - delta = GNUNET_HELLO_equals (mrg, - host->hello, - GNUNET_TIME_absolute_get ()); - if (delta.value == GNUNET_TIME_UNIT_FOREVER_ABS.value) - { - GNUNET_free (mrg); - return; - } - GNUNET_free (host->hello); - host->hello = mrg; + /* no differences, just ignore the update */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No change in %s HELLO for `%s'\n", + (GNUNET_YES == friend_hello_type) ? "friend-only" : "public", + GNUNET_i2s (peer)); + GNUNET_free (mrg); + return; } - 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. - * - * @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) - */ -static void -send_to_each_host (const struct GNUNET_PeerIdentity *only, - int trust_change, struct GNUNET_SERVER_Client *client) -{ - struct HostEntry *pos; - struct InfoMessage *im; - uint16_t hs; - char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; - struct GNUNET_SERVER_TransmitContext *tc; - int match; + GNUNET_free ((*dest)); + (*dest) = mrg; + } + + if ((NULL != (host->hello)) && (GNUNET_NO == friend_hello_type)) + { + /* Update friend only hello */ + mrg = update_friend_hello (host->hello, host->friend_only_hello); + if (NULL != host->friend_only_hello) + GNUNET_free (host->friend_only_hello); + host->friend_only_hello = mrg; + } + + if (NULL != host->hello) + GNUNET_assert ((GNUNET_NO == GNUNET_HELLO_is_friend_only (host->hello))); + if (NULL != host->friend_only_hello) + GNUNET_assert ((GNUNET_YES == GNUNET_HELLO_is_friend_only(host->friend_only_hello))); - tc = GNUNET_SERVER_transmit_context_create (client); - match = GNUNET_NO; - pos = hosts; - while (pos != NULL) + fn = get_host_filename (peer); + if ( (NULL != fn) && + (GNUNET_OK == GNUNET_DISK_directory_create_for_file (fn)) ) + { + store_hello = GNUNET_NO; + size = 0; + cnt = 0; + if (NULL != host->hello) + (void) GNUNET_HELLO_iterate_addresses (host->hello, + GNUNET_NO, &count_addresses, &cnt); + if (cnt > 0) { - 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); - match = GNUNET_YES; - } - im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO); - im->header.size = htons (sizeof (struct InfoMessage) + hs); - im->trust = htonl (pos->trust); - im->peer = pos->identity; - GNUNET_SERVER_transmit_context_append_message (tc, - &im->header); - } - pos = pos->next; + store_hello = GNUNET_YES; + size += GNUNET_HELLO_size (host->hello); + } + cnt = 0; + if (NULL != host->friend_only_hello) + (void) GNUNET_HELLO_iterate_addresses (host->friend_only_hello, GNUNET_NO, + &count_addresses, &cnt); + store_friend_hello = GNUNET_NO; + if (0 < cnt) + { + store_friend_hello = GNUNET_YES; + size += GNUNET_HELLO_size (host->friend_only_hello); } - if ( (only != NULL) && - (match == GNUNET_NO) ) - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "No `%s' message was found for peer `%4s'\n", - "HELLO", - GNUNET_i2s (only)); - 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); -} - - -/** - * 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 ((GNUNET_NO == store_hello) && (GNUNET_NO == store_friend_hello)) { - if ((0 != UNLINK (fn)) && (errno != ENOENT)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING | - GNUNET_ERROR_TYPE_BULK, "unlink", fn); + /* no valid addresses, don't put HELLO on disk; in fact, + if one exists on disk, remove it */ + (void) UNLINK (fn); } - else + 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; + buffer = GNUNET_malloc (size); + pos = 0; + + if (GNUNET_YES == store_hello) + { + memcpy (buffer, host->hello, GNUNET_HELLO_size (host->hello)); + pos += GNUNET_HELLO_size (host->hello); + } + if (GNUNET_YES == store_friend_hello) + { + memcpy (&buffer[pos], host->friend_only_hello, GNUNET_HELLO_size (host->friend_only_hello)); + pos += GNUNET_HELLO_size (host->friend_only_hello); + } + GNUNET_assert (pos == size); + + if (GNUNET_SYSERR == GNUNET_DISK_fn_write (fn, buffer, size, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn); + else + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stored %s %s HELLO in %s with total size %u\n", + (GNUNET_YES == store_friend_hello) ? "friend-only": "", + (GNUNET_YES == store_hello) ? "public": "", + fn, size); + GNUNET_free (buffer); } - GNUNET_free (fn); + } + GNUNET_free_non_null (fn); + notify_all (host); } + /** - * Call this method periodically to scan data/hosts for new hosts. + * Do transmit info about peer to given host. + * + * @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 -cron_flush_trust (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +static int +add_to_tc (void *cls, const struct GNUNET_PeerIdentity *key, void *value) { - struct HostEntry *pos; + struct TransmitContext *tc = cls; + struct HostEntry *pos = value; + struct InfoMessage *im; + uint16_t hs; + char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN; + + hs = 0; + im = (struct InfoMessage *) buf; + + if ((pos->hello != NULL) && (GNUNET_NO == tc->friend_only)) + { + /* Copy public HELLO */ + hs = GNUNET_HELLO_size (pos->hello); + GNUNET_assert (hs < GNUNET_SERVER_MAX_MESSAGE_SIZE - + sizeof (struct InfoMessage)); + memcpy (&im[1], pos->hello, hs); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending public HELLO with size %u for peer `%4s'\n", + hs, GNUNET_i2s (key)); + } + else if ((pos->friend_only_hello != NULL) && (GNUNET_YES == tc->friend_only)) + { + /* Copy friend only HELLO */ + hs = GNUNET_HELLO_size (pos->friend_only_hello); + GNUNET_assert (hs < GNUNET_SERVER_MAX_MESSAGE_SIZE - + sizeof (struct InfoMessage)); + memcpy (&im[1], pos->friend_only_hello, hs); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending friend-only HELLO with size %u for peer `%4s'\n", + hs, GNUNET_i2s (key)); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding no HELLO for peer `%s'\n", + GNUNET_i2s (key)); + } - 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->tc, &im->header); + return GNUNET_YES; } /** - * @brief delete expired HELLO entries in data/hosts/ + * @brief delete expired HELLO entries in directory + * + * @param cls pointer to current time (struct GNUNET_TIME_Absolute) + * @param fn filename to test to see if the HELLO expired + * @return #GNUNET_OK (continue iteration) */ static int discard_hosts_helper (void *cls, const char *fn) { struct GNUNET_TIME_Absolute *now = cls; - char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1]; + char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN; 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)) + int read_size; + unsigned int cur_hello_size; + unsigned int new_hello_size; + int read_pos; + int write_pos; + unsigned int cnt; + char *writebuffer; + + + read_size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer)); + if (read_size < sizeof (struct GNUNET_MessageHeader)) + { + if (0 != UNLINK (fn)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING | + GNUNET_ERROR_TYPE_BULK, "unlink", fn); + return GNUNET_OK; + } + + writebuffer = GNUNET_malloc (read_size); + read_pos = 0; + write_pos = 0; + while (read_pos < read_size) + { + /* Check each HELLO */ + hello = (const struct GNUNET_HELLO_Message *) &buffer[read_pos]; + cur_hello_size = GNUNET_HELLO_size (hello); + if (0 == cur_hello_size) { + /* Invalid data, discard */ 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) + new_hello = GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired, now); + cnt = 0; + if (NULL != new_hello) + (void) GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &count_addresses, &cnt); + if ( (NULL != new_hello) && (0 < cnt) ) { - GNUNET_DISK_fn_write (fn, - new_hello, - GNUNET_HELLO_size (new_hello), - GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE - | 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); + /* Store new HELLO to write it when done */ + new_hello_size = GNUNET_HELLO_size (new_hello); + memcpy (&writebuffer[write_pos], new_hello, new_hello_size); + write_pos += new_hello_size; } + read_pos += cur_hello_size; + GNUNET_free_non_null (new_hello); + } + + if (0 < write_pos) + { + GNUNET_DISK_fn_write (fn, writebuffer,write_pos, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ); + } + else if (0 != UNLINK (fn)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING | + GNUNET_ERROR_TYPE_BULK, "unlink", fn); + + GNUNET_free (writebuffer); return GNUNET_OK; } /** - * Call this method periodically to scan data/hosts for new hosts. + * Call this method periodically to scan peerinfo/ for ancient + * HELLOs to expire. + * + * @param cls unused + * @param tc scheduler context, aborted if reason is shutdown */ static void -cron_clean_data_hosts (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_TIME_Absolute now; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) return; now = GNUNET_TIME_absolute_get (); - GNUNET_DISK_directory_scan (networkIdDirectory, - &discard_hosts_helper, &now); - - GNUNET_SCHEDULER_add_delayed (tc->sched, - DATA_HOST_CLEAN_FREQ, - &cron_clean_data_hosts, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, + _("Cleaning up directory `%s'\n"), networkIdDirectory); + GNUNET_DISK_directory_scan (networkIdDirectory, &discard_hosts_helper, &now); + GNUNET_SCHEDULER_add_delayed (DATA_HOST_CLEAN_FREQ, &cron_clean_data_hosts, + NULL); } @@ -665,27 +1006,23 @@ cron_clean_data_hosts (void *cls, * @param message the actual message */ static void -handle_hello (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 GNUNET_HELLO_Message *hello; struct GNUNET_PeerIdentity pid; 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; - } -#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); + if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid)) + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n", + "HELLO", GNUNET_i2s (&pid)); + add_host_to_known_hosts (&pid); + update_hello (&pid, hello); GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -698,20 +1035,22 @@ handle_hello (void *cls, * @param message the actual message */ static void -handle_get (void *cls, - struct GNUNET_SERVER_Client *client, +handle_get (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { const struct ListPeerMessage *lpm; + struct TransmitContext tcx; lpm = (const struct ListPeerMessage *) message; -#if DEBUG_PEERINFO - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s' message received for peer `%4s'\n", - "GET", - GNUNET_i2s (&lpm->peer)); -#endif - send_to_each_host (&lpm->peer, ntohl (lpm->trust_change), client); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n", + "GET", GNUNET_i2s (&lpm->peer)); + tcx.friend_only = ntohl (lpm->include_friend_only); + tcx.tc = GNUNET_SERVER_transmit_context_create (client); + GNUNET_CONTAINER_multipeermap_get_multiple (hostmap, &lpm->peer, + &add_to_tc, &tcx); + GNUNET_SERVER_transmit_context_append_data (tcx.tc, NULL, 0, + GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END); + GNUNET_SERVER_transmit_context_run (tcx.tc, GNUNET_TIME_UNIT_FOREVER_REL); } @@ -723,19 +1062,60 @@ handle_get (void *cls, * @param message the actual message */ static void -handle_get_all (void *cls, - struct GNUNET_SERVER_Client *client, +handle_get_all (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - const struct ListAllPeersMessage *lpm; + const struct ListAllPeersMessage *lapm; + struct TransmitContext tcx; + + lapm = (const struct ListAllPeersMessage *) message; + tcx.friend_only = ntohl (lapm->include_friend_only); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received\n", "GET_ALL"); + tcx.tc = GNUNET_SERVER_transmit_context_create (client); + GNUNET_CONTAINER_multipeermap_iterate (hostmap, &add_to_tc, &tcx); + GNUNET_SERVER_transmit_context_append_data (tcx.tc, NULL, 0, + GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END); + GNUNET_SERVER_transmit_context_run (tcx.tc, GNUNET_TIME_UNIT_FOREVER_REL); +} - lpm = (const struct ListAllPeersMessage *) message; -#if DEBUG_PEERINFO - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s' message received\n", - "GET_ALL"); -#endif - send_to_each_host (NULL, ntohl (lpm->trust_change), client); + + +/** + * Pass the given client the information we have in the respective + * host entry; the client is already in the notification context. + * + * @param cls the `struct GNUNET_SERVER_Client` to notify + * @param key key for the value (unused) + * @param value the `struct HostEntry` to notify the client about + * @return #GNUNET_YES (always, continue to iterate) + */ +static int +do_notify_entry (void *cls, const struct GNUNET_PeerIdentity *key, void *value) +{ + struct NotificationContext *nc = cls; + struct HostEntry *he = value; + struct InfoMessage *msg; + + if ((NULL == he->hello) && (GNUNET_NO == nc->include_friend_only)) + { + /* We have no public hello */ + return GNUNET_YES; + } + + if ( (NULL == he->friend_only_hello) && + (GNUNET_YES == nc->include_friend_only) ) + { + /* We have no friend hello */ + return GNUNET_YES; + } + + msg = make_info_message (he, nc->include_friend_only); + GNUNET_SERVER_notification_context_unicast (notify_list, + nc->client, + &msg->header, + GNUNET_NO); + GNUNET_free (msg); + return GNUNET_YES; } @@ -747,31 +1127,67 @@ handle_get_all (void *cls, * @param message the actual message */ static void -handle_notify (void *cls, - struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +handle_notify (void *cls, struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) { - struct InfoMessage *msg; - struct HostEntry *pos; + struct NotifyMessage *nm = (struct NotifyMessage *) message; + struct NotificationContext *nc; -#if DEBUG_PEERINFO GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received\n", "NOTIFY"); -#endif - GNUNET_SERVER_notification_context_add (notify_list, - client); - pos = hosts; - while (NULL != pos) - { - msg = make_info_message (pos); - GNUNET_SERVER_notification_context_unicast (notify_list, - client, - &msg->header, - GNUNET_NO); - GNUNET_free (msg); - pos = pos->next; - } + nc = GNUNET_new (struct NotificationContext); + nc->client = client; + nc->include_friend_only = ntohl (nm->include_friend_only); + + GNUNET_CONTAINER_DLL_insert (nc_head, nc_tail, nc); + GNUNET_SERVER_client_mark_monitor (client); + GNUNET_SERVER_notification_context_add (notify_list, client); + GNUNET_CONTAINER_multipeermap_iterate (hostmap, &do_notify_entry, nc); + GNUNET_SERVER_receive_done (client, GNUNET_OK); +} + + +/** + * Client disconnect callback + * + * @param cls unused + * @param client server client + */ +static void +disconnect_cb (void *cls,struct GNUNET_SERVER_Client *client) +{ + struct NotificationContext *cur; + + for (cur = nc_head; NULL != cur; cur = cur->next) + if (cur->client == client) + break; + if (NULL == cur) + return; + GNUNET_CONTAINER_DLL_remove (nc_head, nc_tail, cur); + GNUNET_free (cur); +} + + +/** + * Release memory taken by a host entry. + * + * @param cls NULL + * @param key key of the host entry + * @param value the `struct HostEntry` to free + * @return #GNUNET_YES (continue to iterate) + */ +static int +free_host_entry (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct HostEntry *he = value; + + GNUNET_free_non_null (he->hello); + GNUNET_free_non_null (he->friend_only_hello); + GNUNET_free (he); + return GNUNET_YES; } @@ -783,30 +1199,39 @@ handle_notify (void *cls, */ static void shutdown_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) + const struct GNUNET_SCHEDULER_TaskContext *tc) { + struct NotificationContext *cur; + struct NotificationContext *next; + GNUNET_SERVER_notification_context_destroy (notify_list); notify_list = NULL; - if (stats != NULL) - { - GNUNET_STATISTICS_destroy (stats, GNUNET_NO); - stats = NULL; - } + + for (cur = nc_head; NULL != cur; cur = next) + { + next = cur->next; + GNUNET_CONTAINER_DLL_remove (nc_head, nc_tail, cur); + GNUNET_free (cur); + } + GNUNET_CONTAINER_multipeermap_iterate (hostmap, &free_host_entry, NULL); + GNUNET_CONTAINER_multipeermap_destroy (hostmap); + if (NULL != stats) + { + GNUNET_STATISTICS_destroy (stats, GNUNET_NO); + stats = NULL; + } } /** - * Process statistics requests. + * Start up peerinfo service. * * @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, +run (void *cls, struct GNUNET_SERVER_Handle *server, const struct GNUNET_CONFIGURATION_Handle *cfg) { static const struct GNUNET_SERVER_MessageHandler handlers[] = { @@ -816,41 +1241,67 @@ run (void *cls, {&handle_get_all, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL, sizeof (struct ListAllPeersMessage)}, {&handle_notify, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY, - sizeof (struct GNUNET_MessageHeader)}, + sizeof (struct NotifyMessage)}, {NULL, NULL, 0, 0} }; - stats = GNUNET_STATISTICS_create (sched, "peerinfo", cfg); + char *peerdir; + char *ip; + struct DirScanContext dsc; + int noio; + int use_included; + + hostmap = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES); + 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, - &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, - &cron_clean_data_hosts, NULL); - GNUNET_SCHEDULER_add_delayed (sched, - GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, NULL); + noio = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "NO_IO"); + use_included = GNUNET_CONFIGURATION_get_value_yesno (cfg, "peerinfo", "USE_INCLUDED_HELLOS"); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, + NULL); + if (GNUNET_YES != noio) + { + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_filename (cfg, "peerinfo", + "HOSTS", + &networkIdDirectory)); + if (GNUNET_OK != + GNUNET_DISK_directory_create (networkIdDirectory)) + { + GNUNET_SCHEDULER_shutdown (); + return; + } + + GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, + &cron_scan_directory_data_hosts, NULL); + + GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, + &cron_clean_data_hosts, NULL); + if (GNUNET_YES == use_included) + { + ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); + GNUNET_asprintf (&peerdir, + "%shellos", + ip); + GNUNET_free (ip); + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _("Importing HELLOs from `%s'\n"), + peerdir); + dsc.matched = 0; + dsc.remove_files = GNUNET_NO; + + GNUNET_DISK_directory_scan (peerdir, + &hosts_directory_scan_callback, &dsc); + + GNUNET_free (peerdir); + } + } GNUNET_SERVER_add_handlers (server, handlers); + GNUNET_SERVER_disconnect_notify (server, &disconnect_cb, NULL) ; } /** - * The main function for the statistics service. + * The main function for the peerinfo service. * * @param argc number of arguments from the command line * @param argv command line arguments @@ -861,14 +1312,11 @@ main (int argc, char *const *argv) { int ret; - ret = (GNUNET_OK == - GNUNET_SERVICE_run (argc, - argv, - "peerinfo", - GNUNET_SERVICE_OPTION_NONE, - &run, NULL)) ? 0 : 1; + ret = + (GNUNET_OK == + GNUNET_SERVICE_run (argc, argv, "peerinfo", GNUNET_SERVICE_OPTION_NONE, + &run, NULL)) ? 0 : 1; GNUNET_free_non_null (networkIdDirectory); - GNUNET_free_non_null (trustDirectory); return ret; }