* @brief code for maintaining the mesh topology
* @author Christian Grothoff
*/
-
-#include <stdlib.h>
#include "platform.h"
#include "gnunet_constants.h"
#include "gnunet_core_service.h"
#include "gnunet_util_lib.h"
-#define DEBUG_TOPOLOGY GNUNET_YES
+/**
+ * Minimum required delay between calls to GNUNET_TRANSPORT_try_connect.
+ */
+#define MAX_CONNECT_FREQUENCY_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
/**
* For how long do we blacklist a peer after a failed connection
- * attempt?
+ * attempt? This is the baseline factor which is then multiplied by
+ * two to the power of the number of failed attempts.
*/
-#define GREYLIST_AFTER_ATTEMPT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+#define GREYLIST_AFTER_ATTEMPT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
/**
* For how long do we blacklist a friend after a failed connection
- * attempt?
+ * attempt? This is the baseline factor which is then multiplied by
+ * two to the power of the number of failed attempts.
*/
-#define GREYLIST_AFTER_ATTEMPT_FRIEND GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+#define GREYLIST_AFTER_ATTEMPT_FRIEND GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
/**
- * For how long do we blacklist anyone under any cirumstances after a failed connection
- * attempt?
+ * For how long do we blacklist anyone under any cirumstances at least after a failed connection
+ * attempt? This is the absolute minimum, regardless of what the calculation based on
+ * exponential backoff returns.
*/
-#define GREYLIST_AFTER_ATTEMPT_MIN GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define GREYLIST_AFTER_ATTEMPT_MIN GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
- * For how long do we blacklist anyone under any cirumstances after a failed connection
- * attempt?
+ * For how long do we blacklist anyone under any cirumstances at most after a failed connection
+ * attempt? This is the absolute maximum, regardless of what the calculation based on
+ * exponential back-off returns.
*/
#define GREYLIST_AFTER_ATTEMPT_MAX GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
/**
- * How often do we at most advertise any HELLO to a peer?
+ * At what frequency do we sent HELLOs to a peer?
*/
-#define HELLO_ADVERTISEMENT_MIN_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
+#define HELLO_ADVERTISEMENT_MIN_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
/**
- * How often do we at most advertise the same HELLO to the same peer?
+ * After what time period do we expire the HELLO Bloom filter?
*/
#define HELLO_ADVERTISEMENT_MIN_REPEAT_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
*/
struct GNUNET_CORE_TransmitHandle *hello_req;
- /**
- * Our handle for the request to connect to this peer; NULL if no
- * such request is pending.
- */
- struct GNUNET_CORE_PeerRequestHandle *connect_req;
-
/**
* Pointer to the HELLO message of this peer; can be NULL.
*/
*/
GNUNET_SCHEDULER_TaskIdentifier hello_delay_task;
+ /**
+ * Task for issuing GNUNET_TRANSPORT_try_connect for this peer.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier attempt_connect_task;
+
/**
* ID of task we use to clear peers from the greylist.
*/
*/
static struct GNUNET_TRANSPORT_Blacklist *blacklist;
+/**
+ * When can we next ask transport to create a connection?
+ */
+static struct GNUNET_TIME_Absolute next_connect_attempt;
+
/**
* Task scheduled to try to add peers.
*/
/**
- * Function that decides if a connection is acceptable or not.
+ * Function that decides if a connection is acceptable or not.
* If we have a blacklist, only friends are allowed, so the check
* is rather simple.
*
pos = GNUNET_CONTAINER_multihashmap_get (peers, &pid->hashPubKey);
if ((pos != NULL) && (pos->is_friend == GNUNET_YES))
return GNUNET_OK;
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# peers blacklisted"), 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (stats, gettext_noop ("# peers blacklisted"), 1,
+ GNUNET_NO);
return GNUNET_SYSERR;
}
}
-/**
- * Function called by core when our request to connect was transmitted.
- *
- * @param cls the 'struct Peer' for which we issued the connect request
- * @param success was the request transmitted
- */
-static void
-connect_completed_callback (void *cls, int success)
-{
- struct Peer *pos = cls;
-
- pos->connect_req = NULL;
-}
-
-
/**
* Check if an additional connection from the given peer is allowed.
- *
+ *
* @param peer connection to check
* @return GNUNET_OK if the connection is allowed
*/
static int
is_connection_allowed (struct Peer *peer)
{
- if (0 == memcmp (&my_identity,
- &peer->pid, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 ==
+ memcmp (&my_identity, &peer->pid, sizeof (struct GNUNET_PeerIdentity)))
return GNUNET_SYSERR; /* disallow connections to self */
if (peer->is_friend)
return GNUNET_OK;
if (GNUNET_YES == friends_only)
{
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Determined that `%s' is not allowed to connect (not a friend)\n",
GNUNET_i2s (&peer->pid));
-#endif
return GNUNET_SYSERR;
}
if (friend_count >= minimum_friend_count)
return GNUNET_OK;
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Determined that `%s' is not allowed to connect (not enough connected friends)\n",
GNUNET_i2s (&peer->pid));
-#endif
return GNUNET_SYSERR;
}
* @return GNUNET_YES (always: continue to iterate)
*/
static int
-free_peer (void *cls, const GNUNET_HashCode * pid, void *value)
+free_peer (void *cls, const struct GNUNET_HashCode * pid, void *value)
{
struct Peer *pos = value;
+ GNUNET_break (GNUNET_NO == pos->is_connected);
GNUNET_break (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_remove (peers, pid, pos));
if (pos->hello_req != NULL)
GNUNET_CORE_notify_transmit_ready_cancel (pos->hello_req);
- if (pos->connect_req != NULL)
- GNUNET_CORE_peer_request_connect_cancel (pos->connect_req);
if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
+ if (pos->attempt_connect_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (pos->attempt_connect_task);
if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);
GNUNET_free_non_null (pos->hello);
pos->greylisted_until = GNUNET_TIME_relative_to_absolute (rem);
if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);
- pos->greylist_clean_task
- = GNUNET_SCHEDULER_add_delayed (rem, &remove_from_greylist, pos);
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking to connect to `%s'\n", GNUNET_i2s (&pos->pid));
-#endif
+ pos->greylist_clean_task =
+ GNUNET_SCHEDULER_add_delayed (rem, &remove_from_greylist, pos);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to connect to `%s'\n",
+ GNUNET_i2s (&pos->pid));
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# connect requests issued to core"),
- 1, GNUNET_NO);
- pos->connect_req = GNUNET_CORE_peer_request_connect (handle,
- &pos->pid,
- &connect_completed_callback,
- pos);
+ gettext_noop
+ ("# connect requests issued to transport"), 1,
+ GNUNET_NO);
+ GNUNET_TRANSPORT_try_connect (transport, &pos->pid);
+}
+
+
+/**
+ * Try to connect to the specified peer.
+ *
+ * @param cls peer to connect to
+ * @param tc scheduler context
+ */
+static void
+do_attempt_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Peer *pos = cls;
+ struct GNUNET_TIME_Relative delay;
+
+ pos->attempt_connect_task = GNUNET_SCHEDULER_NO_TASK;
+ if (GNUNET_YES == pos->is_connected)
+ return;
+ delay = GNUNET_TIME_absolute_get_remaining (next_connect_attempt);
+ if (delay.rel_value > 0)
+ {
+ pos->attempt_connect_task = GNUNET_SCHEDULER_add_delayed (delay,
+ &do_attempt_connect,
+ pos);
+ return;
+ }
+ next_connect_attempt = GNUNET_TIME_relative_to_absolute (MAX_CONNECT_FREQUENCY_DELAY);
+ attempt_connect (pos);
+}
+
+
+/**
+ * Schedule a task to try to connect to the specified peer.
+ *
+ * @param pos peer to connect to
+ */
+static void
+schedule_attempt_connect (struct Peer *pos)
+{
+ if (GNUNET_SCHEDULER_NO_TASK != pos->attempt_connect_task)
+ return;
+ pos->attempt_connect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (next_connect_attempt),
+ &do_attempt_connect,
+ pos);
}
rem = GNUNET_TIME_absolute_get_remaining (pos->greylisted_until);
if (rem.rel_value == 0)
{
- attempt_connect (pos);
+ schedule_attempt_connect (pos);
}
else
{
- pos->greylist_clean_task
- = GNUNET_SCHEDULER_add_delayed (rem, &remove_from_greylist, pos);
+ pos->greylist_clean_task =
+ GNUNET_SCHEDULER_add_delayed (rem, &remove_from_greylist, pos);
}
- if ((GNUNET_NO == pos->is_friend) &&
- (GNUNET_NO == pos->is_connected) && (NULL == pos->hello))
+ if ((GNUNET_NO == pos->is_friend) && (GNUNET_NO == pos->is_connected) &&
+ (NULL == pos->hello))
{
free_peer (NULL, &pos->pid.hashPubKey, pos);
return;
* @return the new entry
*/
static struct Peer *
-make_peer (const struct
- GNUNET_PeerIdentity *peer,
+make_peer (const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, int is_friend)
{
struct Peer *ret;
memcpy (ret->hello, hello, GNUNET_HELLO_size (hello));
}
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (peers,
- &peer->hashPubKey,
+ GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey,
ret,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return ret;
* @param buf where the callee should write the message
* @return number of bytes written to buf
*/
-static size_t hello_advertising_ready (void *cls, size_t size, void *buf);
+static size_t
+hello_advertising_ready (void *cls, size_t size, void *buf);
/**
*
* @param cls closure
* @param pid identity of a peer
- * @param value 'struct Peer*' for the peer we are considering
+ * @param value 'struct Peer*' for the peer we are considering
* @return GNUNET_YES (continue iteration)
*/
static int
-find_advertisable_hello (void *cls, const GNUNET_HashCode * pid, void *value)
+find_advertisable_hello (void *cls, const struct GNUNET_HashCode * pid, void *value)
{
struct FindAdvHelloContext *fah = cls;
struct Peer *pos = value;
fah.max_size = GNUNET_SERVER_MAX_MESSAGE_SIZE - 1;
fah.next_adv = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_CONTAINER_multihashmap_iterate (peers, &find_advertisable_hello, &fah);
- pl->hello_delay_task
- = GNUNET_SCHEDULER_add_delayed (fah.next_adv, &schedule_next_hello, pl);
+ pl->hello_delay_task =
+ GNUNET_SCHEDULER_add_delayed (fah.next_adv, &schedule_next_hello, pl);
if (fah.result == NULL)
return;
next_want = GNUNET_HELLO_size (fah.result->hello);
if (delay.rel_value == 0)
{
/* now! */
- pl->hello_req = GNUNET_CORE_notify_transmit_ready (handle,
- GNUNET_YES,
- 0,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &pl->pid,
- next_want,
- &hello_advertising_ready,
- pl);
+ pl->hello_req =
+ GNUNET_CORE_notify_transmit_ready (handle, GNUNET_YES, 0,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+ &pl->pid, next_want,
+ &hello_advertising_ready, pl);
}
}
* @return GNUNET_YES (always)
*/
static int
-reschedule_hellos (void *cls, const GNUNET_HashCode * pid, void *value)
+reschedule_hellos (void *cls, const struct GNUNET_HashCode * pid, void *value)
{
struct Peer *peer = value;
struct Peer *skip = cls;
GNUNET_SCHEDULER_cancel (peer->hello_delay_task);
peer->hello_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
- peer->hello_delay_task
- = GNUNET_SCHEDULER_add_now (&schedule_next_hello, peer);
+ peer->hello_delay_task =
+ GNUNET_SCHEDULER_add_now (&schedule_next_hello, peer);
return GNUNET_YES;
}
* @param cls closure
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*/
static void
-connect_notify (void *cls,
- const struct
- GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct Peer *pos;
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core told us that we are connecting to `%s'\n",
GNUNET_i2s (peer));
-#endif
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
connection_count++;
- GNUNET_STATISTICS_set (stats,
- gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (stats, gettext_noop ("# peers connected"),
connection_count, GNUNET_NO);
pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
- if (pos == NULL)
+ if (NULL == pos)
{
pos = make_peer (peer, NULL, GNUNET_NO);
GNUNET_break (GNUNET_OK == is_connection_allowed (pos));
(GNUNET_YES != friends_only))
whitelist_peers ();
friend_count++;
- GNUNET_STATISTICS_set (stats,
- gettext_noop ("# friends connected"),
+ GNUNET_STATISTICS_set (stats, gettext_noop ("# friends connected"),
friend_count, GNUNET_NO);
}
reschedule_hellos (NULL, &peer->hashPubKey, pos);
* @return GNUNET_YES (continue to iterate)
*/
static int
-try_add_peers (void *cls, const GNUNET_HashCode * pid, void *value)
+try_add_peers (void *cls, const struct GNUNET_HashCode * pid, void *value)
{
struct Peer *pos = value;
- attempt_connect (pos);
+ schedule_attempt_connect (pos);
return GNUNET_YES;
}
GNUNET_CONTAINER_multihashmap_iterate (peers, &try_add_peers, NULL);
}
+
/**
* Method called whenever a peer disconnects.
*
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core told us that we disconnected from `%s'\n",
GNUNET_i2s (peer));
-#endif
pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
- if (pos == NULL)
+ if (NULL == pos)
{
GNUNET_break (0);
return;
GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
pos->hello_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_STATISTICS_set (stats,
- gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (stats, gettext_noop ("# peers connected"),
connection_count, GNUNET_NO);
if (pos->is_friend)
{
friend_count--;
- GNUNET_STATISTICS_set (stats,
- gettext_noop ("# friends connected"),
+ GNUNET_STATISTICS_set (stats, gettext_noop ("# friends connected"),
friend_count, GNUNET_NO);
}
if (((connection_count < target_connection_count) ||
* Iterator called on each address.
*
* @param cls flag that we will set if we see any addresses
- * @param tname name of the transport
+ * @param address the address of the peer
* @param expiration when will the given address expire
- * @param addr the address of the peer
- * @param addrlen number of bytes in addr
* @return GNUNET_SYSERR always, to terminate iteration
*/
static int
-address_iterator (void *cls,
- const char *tname,
- struct GNUNET_TIME_Absolute expiration,
- const void *addr, uint16_t addrlen)
+address_iterator (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute expiration)
{
int *flag = cls;
if (0 == memcmp (&pid, &my_identity, sizeof (struct GNUNET_PeerIdentity)))
return; /* that's me! */
have_address = GNUNET_NO;
- GNUNET_HELLO_iterate_addresses (hello,
- GNUNET_NO, &address_iterator, &have_address);
+ GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &address_iterator,
+ &have_address);
if (GNUNET_NO == have_address)
return; /* no point in advertising this one... */
peer = GNUNET_CONTAINER_multihashmap_get (peers, &pid.hashPubKey);
- if (peer == NULL)
+ if (NULL == peer)
{
peer = make_peer (&pid, hello, GNUNET_NO);
}
if (dt.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
return; /* nothing new here */
}
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found `%s' from peer `%s' for advertising\n",
- "HELLO", GNUNET_i2s (&pid));
-#endif
+ "Found `%s' from peer `%s' for advertising\n", "HELLO",
+ GNUNET_i2s (&pid));
if (peer->hello != NULL)
{
nh = GNUNET_HELLO_merge (peer->hello, hello);
* @param err_msg NULL if successful, otherwise contains error message
*/
static void
-process_peer (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+process_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
struct Peer *pos;
GNUNET_CONTAINER_bloomfilter_free (pos->filter);
pos->filter = NULL;
}
- if ((!pos->is_connected) &&
- (!pos->is_friend) &&
+ if ((GNUNET_NO == pos->is_connected) && (GNUNET_NO == pos->is_friend) &&
(0 ==
GNUNET_TIME_absolute_get_remaining (pos->
greylisted_until).rel_value))
GNUNET_assert (NULL != pos);
if (GNUNET_YES == pos->is_connected)
{
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Already connected to peer `%s'\n", GNUNET_i2s (peer));
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Already connected to peer `%s'\n",
+ GNUNET_i2s (peer));
return;
}
if (GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).rel_value > 0)
{
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Already tried peer `%s' recently\n", GNUNET_i2s (peer));
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Already tried peer `%s' recently\n",
+ GNUNET_i2s (peer));
return; /* peer still greylisted */
}
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Considering connecting to peer `%s'\n", GNUNET_i2s (peer));
-#endif
- attempt_connect (pos);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Considering connecting to peer `%s'\n",
+ GNUNET_i2s (peer));
+ schedule_attempt_connect (pos);
}
* @param cls closure
* @param server handle to the server, NULL if we failed
* @param my_id ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
*/
static void
-core_init (void *cls,
- struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_id,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+core_init (void *cls, struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_id)
{
if (server == NULL)
{
}
handle = server;
my_identity = *my_id;
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "I am peer `%s'\n", GNUNET_i2s (my_id));
-#endif
peerinfo_notify = GNUNET_PEERINFO_notify (cfg, &process_peer, NULL);
}
char *data;
size_t pos;
struct GNUNET_PeerIdentity pid;
- struct stat frstat;
+ uint64_t fsize;
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
unsigned int entries_found;
struct Peer *fl;
GNUNET_CONFIGURATION_get_value_filename (cfg, "TOPOLOGY", "FRIENDS", &fn))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Option `%s' in section `%s' not specified!\n"),
- "FRIENDS", "TOPOLOGY");
+ _("Option `%s' in section `%s' not specified!\n"), "FRIENDS",
+ "TOPOLOGY");
return;
}
if (GNUNET_OK != GNUNET_DISK_file_test (fn))
GNUNET_DISK_fn_write (fn, NULL, 0,
- GNUNET_DISK_PERM_USER_READ
- | GNUNET_DISK_PERM_USER_WRITE);
- if (0 != STAT (fn, &frstat))
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE);
+ if (GNUNET_OK != GNUNET_DISK_file_size (fn,
+ &fsize, GNUNET_NO, GNUNET_YES))
{
if ((friends_only) || (minimum_friend_count > 0))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
GNUNET_free (fn);
return;
}
- if (frstat.st_size == 0)
+ if (fsize == 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Friends file `%s' is empty.\n"), fn);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Friends file `%s' is empty.\n"),
+ fn);
GNUNET_free (fn);
return;
}
- data = GNUNET_malloc_large (frstat.st_size);
+ data = GNUNET_malloc_large (fsize);
if (data == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
GNUNET_free (fn);
return;
}
- if (frstat.st_size != GNUNET_DISK_fn_read (fn, data, frstat.st_size))
+ if (fsize != GNUNET_DISK_fn_read (fn, data, fsize))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to read friends list from `%s'\n"), fn);
}
entries_found = 0;
pos = 0;
- while ((pos < frstat.st_size) && isspace ((unsigned char) data[pos]))
+ while ((pos < fsize) && isspace ((unsigned char) data[pos]))
pos++;
- while ((frstat.st_size >= sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) &&
+ while ((fsize >= sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) &&
(pos <=
- frstat.st_size - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)))
+ fsize - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)))
{
memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded));
if (!isspace
("Syntax error in topology specification at offset %llu, skipping bytes.\n"),
(unsigned long long) pos);
pos++;
- while ((pos < frstat.st_size) && (!isspace ((unsigned char) data[pos])))
+ while ((pos < fsize) && (!isspace ((unsigned char) data[pos])))
pos++;
continue;
}
}
}
pos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded);
- while ((pos < frstat.st_size) && isspace ((unsigned char) data[pos]))
+ while ((pos < fsize) && isspace ((unsigned char) data[pos]))
pos++;
}
GNUNET_free (data);
GNUNET_free (fn);
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# friends in configuration"),
+ GNUNET_STATISTICS_update (stats, gettext_noop ("# friends in configuration"),
entries_found, GNUNET_NO);
if ((minimum_friend_count > entries_found) && (friends_only == GNUNET_NO))
{
* for loopback messages where we are both sender and receiver)
* @param message the actual HELLO message
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_encrypted_hello (void *cls,
- const struct GNUNET_PeerIdentity *other,
+handle_encrypted_hello (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct Peer *peer;
struct GNUNET_PeerIdentity pid;
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received encrypted `%s' from peer `%s'",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received encrypted `%s' from peer `%s'",
"HELLO", GNUNET_i2s (other));
-#endif
if (GNUNET_OK !=
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) message, &pid))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- GNUNET_STATISTICS_update (stats,
- gettext_noop ("# HELLO messages received"),
+ GNUNET_STATISTICS_update (stats, gettext_noop ("# HELLO messages received"),
1, GNUNET_NO);
peer = GNUNET_CONTAINER_multihashmap_get (peers, &pid.hashPubKey);
- if (peer == NULL)
+ if (NULL == peer)
{
if ((GNUNET_YES == friends_only) || (friend_count < minimum_friend_count))
return GNUNET_OK;
GNUNET_assert (want <= size);
memcpy (buf, fah.result->hello, want);
GNUNET_CONTAINER_bloomfilter_add (fah.result->filter, &pl->pid.hashPubKey);
-#if DEBUG_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' with %u bytes", "HELLO", (unsigned int) want);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' with %u bytes", "HELLO",
+ (unsigned int) want);
GNUNET_STATISTICS_update (stats,
- gettext_noop ("# HELLO messages gossipped"),
- 1, GNUNET_NO);
+ gettext_noop ("# HELLO messages gossipped"), 1,
+ GNUNET_NO);
}
if (pl->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_PEERINFO_notify_cancel (peerinfo_notify);
peerinfo_notify = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != add_task)
- {
- GNUNET_SCHEDULER_cancel (add_task);
- add_task = GNUNET_SCHEDULER_NO_TASK;
- }
GNUNET_TRANSPORT_disconnect (transport);
transport = NULL;
- GNUNET_CONTAINER_multihashmap_iterate (peers, &free_peer, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (peers);
if (handle != NULL)
{
GNUNET_CORE_disconnect (handle);
handle = NULL;
}
whitelist_peers ();
+ if (GNUNET_SCHEDULER_NO_TASK != add_task)
+ {
+ GNUNET_SCHEDULER_cancel (add_task);
+ add_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_CONTAINER_multihashmap_iterate (peers, &free_peer, NULL);
+ GNUNET_CONTAINER_multihashmap_destroy (peers);
+ peers = NULL;
if (stats != NULL)
{
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
* @param c configuration
*/
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
static struct GNUNET_CORE_MessageHandler handlers[] = {
{&handle_encrypted_hello, GNUNET_MESSAGE_TYPE_HELLO, 0},
cfg = c;
stats = GNUNET_STATISTICS_create ("topology", cfg);
- autoconnect = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "TOPOLOGY",
- "AUTOCONNECT");
- friends_only = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "TOPOLOGY",
- "FRIENDS-ONLY");
+ autoconnect =
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "AUTOCONNECT");
+ friends_only =
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "FRIENDS-ONLY");
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
- "TOPOLOGY",
- "MINIMUM-FRIENDS", &opt))
+ GNUNET_CONFIGURATION_get_value_number (cfg, "TOPOLOGY", "MINIMUM-FRIENDS",
+ &opt))
opt = 0;
minimum_friend_count = (unsigned int) opt;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
- "TOPOLOGY",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "TOPOLOGY",
"TARGET-CONNECTION-COUNT", &opt))
opt = 16;
target_connection_count = (unsigned int) opt;
if ((friends_only == GNUNET_YES) || (minimum_friend_count > 0))
read_friends_file (cfg);
-#if DEBUG_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Topology would like %u connections with at least %u friends (%s)\n",
- target_connection_count,
- minimum_friend_count,
+ target_connection_count, minimum_friend_count,
autoconnect ? "autoconnect enabled" : "autoconnect disabled");
-#endif
if ((friend_count < minimum_friend_count) && (blacklist == NULL))
blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_check, NULL);
transport = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, NULL, NULL);
- handle = GNUNET_CORE_connect (cfg,
- 1,
- NULL,
- &core_init,
- &connect_notify,
- &disconnect_notify,
- NULL,
- NULL, GNUNET_NO, NULL, GNUNET_NO, handlers);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &cleaning_task, NULL);
+ handle =
+ GNUNET_CORE_connect (cfg, NULL, &core_init, &connect_notify,
+ &disconnect_notify, NULL, GNUNET_NO, NULL, GNUNET_NO,
+ handlers);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
+ NULL);
if (NULL == transport)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
};
int ret;
- ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-daemon-topology",
- _
- ("GNUnet topology control (maintaining P2P mesh and F2F constraints)"),
- options, &run, NULL)) ? 0 : 1;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
+ ret =
+ (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-topology",
+ _
+ ("GNUnet topology control (maintaining P2P mesh and F2F constraints)"),
+ options, &run, NULL)) ? 0 : 1;
return ret;
}
projects / oweals / gnunet.git / blobdiff