/*
This file is part of GNUnet.
- (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010, 2012 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
* structure of data/hosts/).
*
* @author Christian Grothoff
- *
- * TODO:
- * - notify clients when addresses in HELLO expire (#1933)
*/
#include "platform.h"
* Server transmit context
*/
struct GNUNET_SERVER_TransmitContext *tc;
-
+
/**
- * Include friend only HELLOs GNUNET_YES or _NO
+ * Include friend only HELLOs #GNUNET_YES or #GNUNET_NO
*/
int friend_only;
};
+
/**
* Result of reading a file
*/
*/
struct NotificationContext
{
- /**
- * Next in DLL
- */
- struct NotificationContext *prev;
-
- /**
- * Previous in DLL
- */
- struct NotificationContext *next;
-
- /**
- * Server client
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * Interested in friend only HELLO?
- */
- int include_friend_only;
+ /**
+ * Next in DLL
+ */
+ struct NotificationContext *prev;
+
+ /**
+ * Previous in DLL
+ */
+ 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, mapping of
* host IDs to 'struct HostEntry*' values.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *hostmap;
+static struct GNUNET_CONTAINER_MultiPeerMap *hostmap;
/**
* Clients to immediately notify about all changes.
* @return generated notification message
*/
static struct InfoMessage *
-make_info_message (const struct HostEntry *he, int include_friend_only)
+make_info_message (const struct HostEntry *he,
+ int include_friend_only)
{
struct InfoMessage *im;
struct GNUNET_HELLO_Message *src;
* @param cls pointer to the current time
* @param address the address
* @param expiration expiration time for the address
- * @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 struct GNUNET_HELLO_Address *address,
+discard_expired (void *cls,
+ const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
const struct GNUNET_TIME_Absolute *now = cls;
* @param cls pointer to the counter
* @param address the address
* @param expiration expiration time for the address
- * @return GNUNET_OK (always)
+ * @return #GNUNET_OK (always)
*/
static int
-count_addresses (void *cls, const struct GNUNET_HELLO_Address *address,
+count_addresses (void *cls,
+ const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
unsigned int *cnt = cls;
static char *
get_host_filename (const struct GNUNET_PeerIdentity *id)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded fil;
char *fn;
if (NULL == networkIdDirectory)
return NULL;
- GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
- GNUNET_asprintf (&fn, "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR, &fil);
+ GNUNET_asprintf (&fn, "%s%s%s", networkIdDirectory, DIR_SEPARATOR_STR,
+ GNUNET_i2s_full (id));
return fn;
}
/**
* Try to read the HELLOs in the given filename and discard expired
- * addresses. Removes the file if one the HELLO is mal-formed. If all
+ * 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, but onlu a public and a friend only
- * HELLO should be included
+ * 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 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)
+read_host_file (const char *fn,
+ int unlink_garbage,
+ struct ReadHostFileContext *r)
{
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;
unsigned read_pos;
r->hello = NULL;
if (GNUNET_YES != GNUNET_DISK_file_test (fn))
- {
return;
- }
-
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);
+ 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) &&
+ if ( (GNUNET_YES == unlink_garbage) &&
(0 != UNLINK (fn)) &&
(ENOENT != errno) )
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ fn);
return;
}
if (0 == size_hello)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse HELLO in file `%s': %s %u \n"),
- fn, "HELLO is invalid and has size of ", size_hello);
- if ((GNUNET_YES == unlink_garbage) &&
+ _("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);
+ 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)
+ {
+ 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)
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);
+ 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" : "NO public",
+ (NULL != r->hello) ? "public" : "NON-public",
(NULL != r->friend_only_hello) ? "friend only" : "NO friend only");
}
struct ReadHostFileContext r;
char *fn;
- entry = GNUNET_CONTAINER_multihashmap_get (hostmap, &identity->hashPubKey);
+ 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_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_malloc (sizeof (struct HostEntry));
+ entry = GNUNET_new (struct HostEntry);
entry->identity = *identity;
- GNUNET_CONTAINER_multihashmap_put (hostmap, &entry->identity.hashPubKey, entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ 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 (0 == UNLINK (fullname))
GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
- _
- ("File `%s' in directory `%s' does not match naming convention. "
- "Removed.\n"), fullname, networkIdDirectory);
+ _("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);
+ "unlink",
+ fullname);
}
/**
- * Closure for 'hosts_directory_scan_callback'.
+ * 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
+ * #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;
/**
* @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)
+ * @return #GNUNET_OK (continue iteration)
*/
static int
-hosts_directory_scan_callback (void *cls, const char *fullname)
+hosts_directory_scan_callback (void *cls,
+ const char *fullname)
{
struct DirScanContext *dsc = cls;
struct GNUNET_PeerIdentity identity;
filename = strrchr (fullname, DIR_SEPARATOR);
if ((NULL == filename) || (1 > strlen (filename)))
- filename = fullname;
+ filename = fullname;
else
filename ++;
read_host_file (fullname, dsc->remove_files, &r);
if ( (NULL == r.hello) && (NULL == r.friend_only_hello))
- {
- if (GNUNET_YES == dsc->remove_files)
- remove_garbage (fullname);
return GNUNET_OK;
- }
-
if (NULL != r.friend_only_hello)
{
if (GNUNET_OK != GNUNET_HELLO_get_id (r.friend_only_hello, &id_friend))
}
id = id_public;
}
-
+
if ( (NULL != r.hello) && (NULL != r.friend_only_hello) &&
(0 != memcmp (&id_friend, &id_public, sizeof (id_friend))) )
{
remove_garbage (fullname);
return GNUNET_OK;
}
- if (GNUNET_OK == GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey))
+ if (GNUNET_OK ==
+ GNUNET_CRYPTO_eddsa_public_key_from_string (filename,
+ strlen (filename),
+ &identity.public_key))
{
if (0 != memcmp (&id, &identity, sizeof (id_friend)))
{
add_host_to_known_hosts (&id);
if (NULL != r.hello)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' public HELLO \n",
+ 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_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 = 0;
dsc.remove_files = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
- _("Scanning directory `%s'\n"), networkIdDirectory);
+ _("Scanning directory `%s'\n"),
+ networkIdDirectory);
GNUNET_DISK_directory_scan (networkIdDirectory,
&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_with_priority (DATA_HOST_FREQ,
+ _("Still no peers found in `%s'!\n"),
+ networkIdDirectory);
+ GNUNET_SCHEDULER_add_delayed_with_priority (DATA_HOST_FREQ,
GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_scan_directory_data_hosts,
NULL);
}
+/**
+ * Update the HELLO of a friend by merging the addresses.
+ *
+ * @param hello original hello
+ * @param friend_hello hello with additional addresses
+ * @return merged HELLO
+ */
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_EccPublicKey pk;
-
+ 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))
{
int pos;
char *buffer;
- host = GNUNET_CONTAINER_multihashmap_get (hostmap, &peer->hashPubKey);
+ 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));
+ 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)
if (delta.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
{
/* 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_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;
}
(*dest) = mrg;
}
- if ((NULL != (host->hello)) && (GNUNET_NO == friend_hello_type))
+ 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->hello)
- GNUNET_assert ((GNUNET_NO == GNUNET_HELLO_is_friend_only (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)));
+ GNUNET_assert ((GNUNET_YES ==
+ GNUNET_HELLO_is_friend_only (host->friend_only_hello)));
fn = get_host_filename (peer);
if ( (NULL != fn) &&
- (GNUNET_OK == GNUNET_DISK_directory_create_for_file (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);
+ GNUNET_NO,
+ &count_addresses,
+ &cnt);
if (cnt > 0)
{
store_hello = GNUNET_YES;
}
cnt = 0;
if (NULL != host->friend_only_hello)
- (void) GNUNET_HELLO_iterate_addresses (host->friend_only_hello, GNUNET_NO,
- &count_addresses, &cnt);
+ (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 ((GNUNET_NO == store_hello) && (GNUNET_NO == store_friend_hello))
+
+ if ( (GNUNET_NO == store_hello) &&
+ (GNUNET_NO == store_friend_hello) )
{
/* no valid addresses, don't put HELLO on disk; in fact,
if one exists on disk, remove it */
{
buffer = GNUNET_malloc (size);
pos = 0;
-
+
if (GNUNET_YES == store_hello)
{
- memcpy (buffer, host->hello, GNUNET_HELLO_size (host->hello));
+ memcpy (buffer, host->hello,
+ GNUNET_HELLO_size (host->hello));
pos += GNUNET_HELLO_size (host->hello);
}
if (GNUNET_YES == store_friend_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_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_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);
* @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)
+ * @return #GNUNET_YES (continue to iterate)
*/
static int
-add_to_tc (void *cls, const struct GNUNET_HashCode * key, void *value)
+add_to_tc (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct TransmitContext *tc = cls;
struct HostEntry *pos = value;
hs = 0;
im = (struct InfoMessage *) buf;
- if ((pos->hello != NULL) && (GNUNET_NO == tc->friend_only))
+ if ( (NULL != pos->hello) &&
+ (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_h2s (key));
+ 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))
+ else if ( (NULL != pos->friend_only_hello) &&
+ (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_h2s (key));
+ 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_h2s (key));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding no HELLO for peer `%s'\n",
+ GNUNET_i2s (key));
}
im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
/**
* @brief delete expired HELLO entries in directory
*
- * @param cls pointer to current time (struct GNUNET_TIME_Absolute)
+ * @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)
+ * @return #GNUNET_OK (continue iteration)
*/
static int
-discard_hosts_helper (void *cls, const char *fn)
+discard_hosts_helper (void *cls,
+ const char *fn)
{
struct GNUNET_TIME_Absolute *now = cls;
char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
unsigned int cnt;
char *writebuffer;
-
read_size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
if (read_size < sizeof (struct GNUNET_MessageHeader))
{
/* Invalid data, discard */
if (0 != UNLINK (fn))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+ GNUNET_ERROR_TYPE_BULK,
+ "unlink", fn);
return GNUNET_OK;
}
- new_hello = GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired, now);
+ 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);
+ (void) GNUNET_HELLO_iterate_addresses (hello,
+ GNUNET_NO,
+ &count_addresses, &cnt);
if ( (NULL != new_hello) && (0 < cnt) )
{
/* Store new HELLO to write it when done */
}
else if (0 != UNLINK (fn))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
+ GNUNET_ERROR_TYPE_BULK,
+ "unlink", fn);
GNUNET_free (writebuffer);
return GNUNET_OK;
* @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;
return;
now = GNUNET_TIME_absolute_get ();
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,
+ _("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);
}
* @param message the actual message
*/
static void
-handle_hello (void *cls, struct GNUNET_SERVER_Client *client,
+handle_hello (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_HELLO_Message *hello;
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));
+ 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);
* @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;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' message received for peer `%4s'\n",
- "GET", GNUNET_i2s (&lpm->peer));
+ 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_multihashmap_get_multiple (hostmap, &lpm->peer.hashPubKey,
+ 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);
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");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received\n",
+ "GET_ALL");
+ GNUNET_SERVER_disable_receive_done_warning (client);
tcx.tc = GNUNET_SERVER_transmit_context_create (client);
- GNUNET_CONTAINER_multihashmap_iterate (hostmap, &add_to_tc, &tcx);
+ 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);
* 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 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)
+ * @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_HashCode * key, void *value)
+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))
+ if ( (NULL == he->hello) &&
+ (GNUNET_NO == nc->include_friend_only) )
{
/* We have no public hello */
return GNUNET_YES;
}
-
- if ( (NULL == he->friend_only_hello) &&
+
+ 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,
* @param message the actual message
*/
static void
-handle_notify (void *cls, struct GNUNET_SERVER_Client *client,
+handle_notify (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct NotifyMessage *nm = (struct NotifyMessage *) message;
struct NotificationContext *nc;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "`%s' message received\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' message received\n",
"NOTIFY");
- nc = GNUNET_malloc (sizeof (struct NotificationContext));
+ 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_multihashmap_iterate (hostmap, &do_notify_entry, nc);
+ GNUNET_CONTAINER_multipeermap_iterate (hostmap, &do_notify_entry, nc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* @param cls unused
* @param client server client
*/
-static void
-disconnect_cb (void *cls,struct GNUNET_SERVER_Client *client)
+static void
+disconnect_cb (void *cls,
+ struct GNUNET_SERVER_Client *client)
{
struct NotificationContext *cur;
*
* @param cls NULL
* @param key key of the host entry
- * @param value the 'struct HostEntry' to free
- * @return GNUNET_YES (continue to iterate)
+ * @param value the `struct HostEntry` to free
+ * @return #GNUNET_YES (continue to iterate)
*/
static int
-free_host_entry (void *cls, const struct GNUNET_HashCode * key, void *value)
+free_host_entry (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct HostEntry *he = value;
* @param tc scheduler task context, unused
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct NotificationContext *cur;
struct NotificationContext *next;
GNUNET_CONTAINER_DLL_remove (nc_head, nc_tail, cur);
GNUNET_free (cur);
}
- GNUNET_CONTAINER_multihashmap_iterate (hostmap, &free_host_entry, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (hostmap);
+ GNUNET_CONTAINER_multipeermap_iterate (hostmap,
+ &free_host_entry,
+ NULL);
+ GNUNET_CONTAINER_multipeermap_destroy (hostmap);
if (NULL != stats)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
* @param cfg configuration to use
*/
static void
-run (void *cls, 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[] = {
int noio;
int use_included;
- hostmap = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES);
+ hostmap = GNUNET_CONTAINER_multipeermap_create (1024, GNUNET_YES);
stats = GNUNET_STATISTICS_create ("peerinfo", cfg);
notify_list = GNUNET_SERVER_notification_context_create (server, 0);
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,
+ use_included = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "peerinfo",
+ "USE_INCLUDED_HELLOS");
+ if (GNUNET_SYSERR == use_included)
+ use_included = GNUNET_NO;
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
NULL);
if (GNUNET_YES != noio)
{
GNUNET_SCHEDULER_shutdown ();
return;
}
-
+
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
&cron_scan_directory_data_hosts, NULL);
&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);
+ 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);
+ }
+ else
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ _("Skipping import of included HELLOs\n"));
}
}
GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SERVER_disconnect_notify (server, &disconnect_cb, NULL) ;
+ GNUNET_SERVER_disconnect_notify (server,
+ &disconnect_cb,
+ NULL);
}
* @return 0 ok, 1 on error
*/
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
int ret;
ret =
(GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "peerinfo", GNUNET_SERVICE_OPTION_NONE,
+ GNUNET_SERVICE_run (argc, argv,
+ "peerinfo",
+ GNUNET_SERVICE_OPTION_NONE,
&run, NULL)) ? 0 : 1;
GNUNET_free_non_null (networkIdDirectory);
return ret;
projects / oweals / gnunet.git / blobdiff