X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftopology%2Fgnunet-daemon-topology.c;h=55ee36fd2fe1b9e06091466c7bd7195c618893cd;hb=563b71afee70ac213a8bb28ce0697fcbae06aac3;hp=bacd7832426faf862375aa6f9eee7dc07f8efd89;hpb=d5f446a9fef43b33d6fe04a97958ff91a8d91056;p=oweals%2Fgnunet.git diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index bacd78324..55ee36fd2 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -86,13 +86,13 @@ struct Peer * Our handle for the request to transmit HELLOs to this peer; NULL * if no such request is pending. */ - struct GNUNET_CORE_TransmitHandle *hello_req; + 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; + struct GNUNET_CORE_PeerRequestHandle *connect_req; /** * Pointer to the HELLO message of this peer; can be NULL. @@ -231,7 +231,7 @@ static int autoconnect; /** - * 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. * @@ -240,19 +240,15 @@ static int autoconnect; * @return GNUNET_OK if the connection is allowed */ static int -blacklist_check (void *cls, - const struct GNUNET_PeerIdentity *pid) +blacklist_check (void *cls, const struct GNUNET_PeerIdentity *pid) { struct Peer *pos; pos = GNUNET_CONTAINER_multihashmap_get (peers, &pid->hashPubKey); - if ( (pos != NULL) && - (pos->is_friend == GNUNET_YES) ) + 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; } @@ -265,10 +261,10 @@ static void whitelist_peers () { if (blacklist != NULL) - { - GNUNET_TRANSPORT_blacklist_cancel (blacklist); - blacklist = NULL; - } + { + GNUNET_TRANSPORT_blacklist_cancel (blacklist); + blacklist = NULL; + } } @@ -279,8 +275,7 @@ whitelist_peers () * @param success was the request transmitted */ static void -connect_completed_callback (void *cls, - int success) +connect_completed_callback (void *cls, int success) { struct Peer *pos = cls; @@ -290,35 +285,34 @@ connect_completed_callback (void *cls, /** * 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; - } + 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 + "Determined that `%s' is not allowed to connect (not enough connected friends)\n", + GNUNET_i2s (&peer->pid)); +#endif return GNUNET_SYSERR; } @@ -332,25 +326,21 @@ is_connection_allowed (struct Peer *peer) * @return GNUNET_YES (always: continue to iterate) */ static int -free_peer (void *cls, - const GNUNET_HashCode *pid, - void *value) +free_peer (void *cls, const GNUNET_HashCode * pid, void *value) { struct Peer *pos = value; - GNUNET_break (GNUNET_OK == - GNUNET_CONTAINER_multihashmap_remove (peers, - pid, - pos)); + 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); + 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->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (pos->greylist_clean_task); - GNUNET_free_non_null (pos->hello); + GNUNET_free_non_null (pos->hello); if (pos->filter != NULL) GNUNET_CONTAINER_bloomfilter_free (pos->filter); GNUNET_free (pos); @@ -366,8 +356,7 @@ free_peer (void *cls, * @param tc scheduler context */ static void -remove_from_greylist (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +remove_from_greylist (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); /** @@ -379,9 +368,9 @@ static void attempt_connect (struct Peer *pos) { struct GNUNET_TIME_Relative rem; - - if ( (connection_count >= target_connection_count) && - (friend_count >= minimum_friend_count) ) + + if ((connection_count >= target_connection_count) && + (friend_count >= minimum_friend_count)) return; if (GNUNET_YES == pos->is_connected) return; @@ -398,30 +387,23 @@ attempt_connect (struct Peer *pos) if (pos->connect_attempts > 30) pos->connect_attempts = 30; rem = GNUNET_TIME_relative_multiply (rem, 1 << (++pos->connect_attempts)); - rem = GNUNET_TIME_relative_max (rem, - GREYLIST_AFTER_ATTEMPT_MIN); - rem = GNUNET_TIME_relative_min (rem, - GREYLIST_AFTER_ATTEMPT_MAX); + rem = GNUNET_TIME_relative_max (rem, GREYLIST_AFTER_ATTEMPT_MIN); + rem = GNUNET_TIME_relative_min (rem, GREYLIST_AFTER_ATTEMPT_MAX); 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); + 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)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to connect to `%s'\n", + GNUNET_i2s (&pos->pid)); #endif 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 core"), + 1, GNUNET_NO); + pos->connect_req = + GNUNET_CORE_peer_request_connect (handle, &pos->pid, + &connect_completed_callback, pos); } @@ -433,8 +415,7 @@ attempt_connect (struct Peer *pos) * @param tc scheduler context */ static void -remove_from_greylist (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +remove_from_greylist (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct Peer *pos = cls; struct GNUNET_TIME_Relative rem; @@ -442,23 +423,20 @@ remove_from_greylist (void *cls, pos->greylist_clean_task = GNUNET_SCHEDULER_NO_TASK; rem = GNUNET_TIME_absolute_get_remaining (pos->greylisted_until); if (rem.rel_value == 0) - { - attempt_connect (pos); - } + { + attempt_connect (pos); + } else - { - 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) ) - { - free_peer (NULL, &pos->pid.hashPubKey, pos); - return; - } + { + 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)) + { + free_peer (NULL, &pos->pid.hashPubKey, pos); + return; + } } @@ -471,27 +449,23 @@ remove_from_greylist (void *cls, * @return the new entry */ static struct Peer * -make_peer (const struct - GNUNET_PeerIdentity * peer, - const struct GNUNET_HELLO_Message *hello, - int is_friend) +make_peer (const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello, int is_friend) { struct Peer *ret; - + ret = GNUNET_malloc (sizeof (struct Peer)); ret->pid = *peer; ret->is_friend = is_friend; if (hello != NULL) - { - ret->hello = GNUNET_malloc (GNUNET_HELLO_size (hello)); - memcpy (ret->hello, hello, - GNUNET_HELLO_size (hello)); - } + { + ret->hello = GNUNET_malloc (GNUNET_HELLO_size (hello)); + memcpy (ret->hello, hello, GNUNET_HELLO_size (hello)); + } GNUNET_break (GNUNET_OK == - GNUNET_CONTAINER_multihashmap_put (peers, - &peer->hashPubKey, - ret, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, + ret, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); return ret; } @@ -505,14 +479,16 @@ static void setup_filter (struct Peer *peer) { /* 2^{-5} chance of not sending a HELLO to a peer is - acceptably small (if the filter is 50% full); - 64 bytes of memory are small compared to the rest - of the data structure and would only really become - "useless" once a HELLO has been passed on to ~100 - other peers, which is likely more than enough in - any case; hence 64, 5 as bloomfilter parameters. */ - peer->filter = GNUNET_CONTAINER_bloomfilter_load (NULL, 64, 5); - peer->filter_expiration = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_REPEAT_FREQUENCY); + * acceptably small (if the filter is 50% full); + * 64 bytes of memory are small compared to the rest + * of the data structure and would only really become + * "useless" once a HELLO has been passed on to ~100 + * other peers, which is likely more than enough in + * any case; hence 64, 5 as bloomfilter parameters. */ + peer->filter = GNUNET_CONTAINER_bloomfilter_init (NULL, 64, 5); + peer->filter_expiration = + GNUNET_TIME_relative_to_absolute + (HELLO_ADVERTISEMENT_MIN_REPEAT_FREQUENCY); /* never send a peer its own HELLO */ GNUNET_CONTAINER_bloomfilter_add (peer->filter, &peer->pid.hashPubKey); } @@ -527,15 +503,14 @@ setup_filter (struct Peer *peer) * @return number of bytes written to buf */ static size_t -hello_advertising_ready (void *cls, - size_t size, - void *buf); +hello_advertising_ready (void *cls, size_t size, void *buf); /** * Closure for 'find_advertisable_hello'. */ -struct FindAdvHelloContext { +struct FindAdvHelloContext +{ /** * Peer we want to advertise to. @@ -561,13 +536,11 @@ struct FindAdvHelloContext { * * @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 GNUNET_HashCode * pid, void *value) { struct FindAdvHelloContext *fah = cls; struct Peer *pos = value; @@ -580,20 +553,19 @@ find_advertisable_hello (void *cls, return GNUNET_YES; rst_time = GNUNET_TIME_absolute_get_remaining (pos->filter_expiration); if (0 == rst_time.rel_value) - { - /* time to discard... */ - GNUNET_CONTAINER_bloomfilter_free (pos->filter); - setup_filter (pos); - } - fah->next_adv = GNUNET_TIME_relative_min (rst_time, - fah->next_adv); + { + /* time to discard... */ + GNUNET_CONTAINER_bloomfilter_free (pos->filter); + setup_filter (pos); + } + fah->next_adv = GNUNET_TIME_relative_min (rst_time, fah->next_adv); hs = GNUNET_HELLO_size (pos->hello); if (hs > fah->max_size) return GNUNET_YES; if (GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (pos->filter, - &fah->peer->pid.hashPubKey)) - fah->result = pos; + &fah->peer->pid.hashPubKey)) + fah->result = pos; return GNUNET_YES; } @@ -606,47 +578,40 @@ find_advertisable_hello (void *cls, * @param tc task context */ static void -schedule_next_hello (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +schedule_next_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct Peer *pl = cls; struct FindAdvHelloContext fah; size_t next_want; struct GNUNET_TIME_Relative delay; - + pl->hello_delay_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_assert (GNUNET_YES == pl->is_connected); if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; /* we're out of here */ + return; /* we're out of here */ if (pl->hello_req != NULL) - return; /* did not finish sending the previous one */ + return; /* did not finish sending the previous one */ /* find applicable HELLOs */ fah.peer = pl; fah.result = NULL; 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); + GNUNET_CONTAINER_multihashmap_iterate (peers, &find_advertisable_hello, &fah); + pl->hello_delay_task = + GNUNET_SCHEDULER_add_delayed (fah.next_adv, &schedule_next_hello, pl); if (fah.result == NULL) - return; + return; next_want = GNUNET_HELLO_size (fah.result->hello); delay = GNUNET_TIME_absolute_get_remaining (pl->next_hello_allowed); 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); - } + { + /* 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); + } } @@ -661,30 +626,27 @@ schedule_next_hello (void *cls, * @return GNUNET_YES (always) */ static int -reschedule_hellos (void *cls, - const GNUNET_HashCode *pid, - void *value) +reschedule_hellos (void *cls, const GNUNET_HashCode * pid, void *value) { struct Peer *peer = value; struct Peer *skip = cls; if (skip == peer) return GNUNET_YES; - if (! peer->is_connected) + if (!peer->is_connected) return GNUNET_YES; if (peer->hello_req != NULL) - { - GNUNET_CORE_notify_transmit_ready_cancel (peer->hello_req); - peer->hello_req = NULL; - } + { + GNUNET_CORE_notify_transmit_ready_cancel (peer->hello_req); + peer->hello_req = NULL; + } if (peer->hello_delay_task != GNUNET_SCHEDULER_NO_TASK) - { - 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); + { + 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); return GNUNET_YES; } @@ -696,51 +658,45 @@ reschedule_hellos (void *cls, * @param peer peer identity this notification is about * @param atsi performance data */ -static void -connect_notify (void *cls, - const struct - GNUNET_PeerIdentity * peer, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +static void +connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { 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)); + "Core told us that we are connecting to `%s'\n", + GNUNET_i2s (peer)); #endif - if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity))) + if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))) return; connection_count++; - GNUNET_STATISTICS_set (stats, - gettext_noop ("# peers connected"), - connection_count, - GNUNET_NO); + GNUNET_STATISTICS_set (stats, gettext_noop ("# peers connected"), + connection_count, GNUNET_NO); pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); - if (pos == NULL) - { - pos = make_peer (peer, NULL, GNUNET_NO); - GNUNET_break (GNUNET_OK == is_connection_allowed (pos)); - } + if (pos == NULL) + { + pos = make_peer (peer, NULL, GNUNET_NO); + GNUNET_break (GNUNET_OK == is_connection_allowed (pos)); + } else - { - GNUNET_assert (GNUNET_NO == pos->is_connected); - pos->greylisted_until.abs_value = 0; /* remove greylisting */ - } + { + GNUNET_assert (GNUNET_NO == pos->is_connected); + pos->greylisted_until.abs_value = 0; /* remove greylisting */ + } pos->is_connected = GNUNET_YES; - pos->connect_attempts = 0; /* re-set back-off factor */ + pos->connect_attempts = 0; /* re-set back-off factor */ if (pos->is_friend) - { - if ( (friend_count == minimum_friend_count - 1) && - (GNUNET_YES != friends_only) ) - whitelist_peers (); - friend_count++; - GNUNET_STATISTICS_set (stats, - gettext_noop ("# friends connected"), - friend_count, - GNUNET_NO); - } + { + if ((friend_count == minimum_friend_count - 1) && + (GNUNET_YES != friends_only)) + whitelist_peers (); + friend_count++; + GNUNET_STATISTICS_set (stats, gettext_noop ("# friends connected"), + friend_count, GNUNET_NO); + } reschedule_hellos (NULL, &peer->hashPubKey, pos); } @@ -754,9 +710,7 @@ connect_notify (void *cls, * @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 GNUNET_HashCode * pid, void *value) { struct Peer *pos = value; @@ -773,14 +727,11 @@ try_add_peers (void *cls, * @param tc scheduler context */ static void -add_peer_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +add_peer_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { add_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_CONTAINER_multihashmap_iterate (peers, - &try_add_peers, - NULL); + GNUNET_CONTAINER_multihashmap_iterate (peers, &try_add_peers, NULL); } /** @@ -789,54 +740,55 @@ add_peer_task (void *cls, * @param cls closure * @param peer peer identity this notification is about */ -static void -disconnect_notify (void *cls, - const struct - GNUNET_PeerIdentity * peer) +static void +disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { struct Peer *pos; - if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity))) + 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); + "Core told us that we disconnected from `%s'\n", + GNUNET_i2s (peer)); +#endif + pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); if (pos == NULL) - { - GNUNET_break (0); - return; - } + { + GNUNET_break (0); + return; + } if (pos->is_connected != GNUNET_YES) - { - GNUNET_break (0); - return; - } + { + GNUNET_break (0); + return; + } pos->is_connected = GNUNET_NO; connection_count--; - GNUNET_STATISTICS_set (stats, - gettext_noop ("# peers connected"), - connection_count, - GNUNET_NO); + if (NULL != pos->hello_req) + { + GNUNET_CORE_notify_transmit_ready_cancel (pos->hello_req); + pos->hello_req = NULL; + } + if (GNUNET_SCHEDULER_NO_TASK != pos->hello_delay_task) + { + GNUNET_SCHEDULER_cancel (pos->hello_delay_task); + pos->hello_delay_task = GNUNET_SCHEDULER_NO_TASK; + } + 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"), - friend_count, - GNUNET_NO); - } - if ( ( (connection_count < target_connection_count) || - (friend_count < minimum_friend_count) ) && - (GNUNET_SCHEDULER_NO_TASK == add_task) ) + { + friend_count--; + GNUNET_STATISTICS_set (stats, gettext_noop ("# friends connected"), + friend_count, GNUNET_NO); + } + if (((connection_count < target_connection_count) || + (friend_count < minimum_friend_count)) && + (GNUNET_SCHEDULER_NO_TASK == add_task)) add_task = GNUNET_SCHEDULER_add_now (&add_peer_task, NULL); - if ( (friend_count < minimum_friend_count) && - (blacklist == NULL) ) - blacklist = GNUNET_TRANSPORT_blacklist (cfg, - &blacklist_check, NULL); + if ((friend_count < minimum_friend_count) && (blacklist == NULL)) + blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_check, NULL); } @@ -851,13 +803,12 @@ disconnect_notify (void *cls, * @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 char *tname, + struct GNUNET_TIME_Absolute expiration, const void *addr, + uint16_t addrlen) { int *flag = cls; + *flag = GNUNET_YES; return GNUNET_SYSERR; } @@ -880,62 +831,51 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello) uint16_t size; if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid)) - { - GNUNET_break (0); - return; - } - if (0 == memcmp (&pid, - &my_identity, - sizeof (struct GNUNET_PeerIdentity))) - return; /* that's me! */ + { + GNUNET_break (0); + return; + } + 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); + return; /* no point in advertising this one... */ + peer = GNUNET_CONTAINER_multihashmap_get (peers, &pid.hashPubKey); if (peer == NULL) - { - peer = make_peer (&pid, hello, GNUNET_NO); - } + { + peer = make_peer (&pid, hello, GNUNET_NO); + } else if (peer->hello != NULL) - { - dt = GNUNET_HELLO_equals (peer->hello, - hello, - GNUNET_TIME_absolute_get()); - if (dt.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value) - return; /* nothing new here */ - } + { + dt = GNUNET_HELLO_equals (peer->hello, hello, GNUNET_TIME_absolute_get ()); + 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)); +#endif if (peer->hello != NULL) - { - nh = GNUNET_HELLO_merge (peer->hello, - hello); - GNUNET_free (peer->hello); - peer->hello = nh; - } + { + nh = GNUNET_HELLO_merge (peer->hello, hello); + GNUNET_free (peer->hello); + peer->hello = nh; + } else - { - size = GNUNET_HELLO_size (hello); - peer->hello = GNUNET_malloc (size); - memcpy (peer->hello, hello, size); - } + { + size = GNUNET_HELLO_size (hello); + peer->hello = GNUNET_malloc (size); + memcpy (peer->hello, hello, size); + } if (peer->filter != NULL) GNUNET_CONTAINER_bloomfilter_free (peer->filter); setup_filter (peer); /* since we have a new HELLO to pick from, re-schedule all - HELLO requests that are not bound by the HELLO send rate! */ - GNUNET_CONTAINER_multihashmap_iterate (peers, - &reschedule_hellos, - peer); + * HELLO requests that are not bound by the HELLO send rate! */ + GNUNET_CONTAINER_multihashmap_iterate (peers, &reschedule_hellos, peer); } @@ -949,77 +889,69 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello) * @param err_msg NULL if successful, otherwise contains error message */ static void -process_peer (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Message *hello, - const char *err_msg) +process_peer (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello, const char *err_msg) { struct Peer *pos; if (err_msg != NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Error in communication with PEERINFO service: %s\n"), - err_msg); - GNUNET_PEERINFO_notify_cancel (peerinfo_notify); - peerinfo_notify = GNUNET_PEERINFO_notify (cfg, &process_peer, - NULL); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + _("Error in communication with PEERINFO service: %s\n"), + err_msg); + GNUNET_PEERINFO_notify_cancel (peerinfo_notify); + peerinfo_notify = GNUNET_PEERINFO_notify (cfg, &process_peer, NULL); + return; + } GNUNET_assert (peer != NULL); - if (0 == memcmp (&my_identity, - peer, sizeof (struct GNUNET_PeerIdentity))) - return; /* that's me! */ + if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))) + return; /* that's me! */ if (hello == NULL) + { + /* free existing HELLO, if any */ + pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); + if (NULL != pos) { - /* free existing HELLO, if any */ - pos = GNUNET_CONTAINER_multihashmap_get (peers, - &peer->hashPubKey); - if (NULL != pos) - { - GNUNET_free_non_null (pos->hello); - pos->hello = NULL; - if (pos->filter != NULL) - { - GNUNET_CONTAINER_bloomfilter_free (pos->filter); - pos->filter = NULL; - } - if ( (! pos->is_connected) && - (! pos->is_friend) && - (0 == GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).rel_value) ) - free_peer (NULL, &pos->pid.hashPubKey, pos); - } - return; + GNUNET_free_non_null (pos->hello); + pos->hello = NULL; + if (pos->filter != NULL) + { + GNUNET_CONTAINER_bloomfilter_free (pos->filter); + pos->filter = NULL; + } + if ((!pos->is_connected) && (!pos->is_friend) && + (0 == + GNUNET_TIME_absolute_get_remaining (pos-> + greylisted_until).rel_value)) + free_peer (NULL, &pos->pid.hashPubKey, pos); } + return; + } consider_for_advertising (hello); - pos = GNUNET_CONTAINER_multihashmap_get (peers, - &peer->hashPubKey); + pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); if (pos == NULL) pos = make_peer (peer, hello, GNUNET_NO); 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 - return; - } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Already connected to peer `%s'\n", + GNUNET_i2s (peer)); +#endif + 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 - return; /* peer still greylisted */ - } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Already tried peer `%s' recently\n", + GNUNET_i2s (peer)); +#endif + return; /* peer still greylisted */ + } #if DEBUG_TOPOLOGY - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Considering connecting to peer `%s'\n", - GNUNET_i2s (peer)); -#endif + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Considering connecting to peer `%s'\n", + GNUNET_i2s (peer)); +#endif attempt_connect (pos); } @@ -1034,30 +966,24 @@ process_peer (void *cls, * @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, + const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) { if (server == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to connect to core service, can not manage topology!\n")); - GNUNET_SCHEDULER_shutdown (); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ + ("Failed to connect to core service, can not manage topology!\n")); + GNUNET_SCHEDULER_shutdown (); + return; + } 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); + 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); } @@ -1077,123 +1003,118 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg) struct Peer *fl; if (GNUNET_OK != - 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"); - return; - } + 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"); + 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); + GNUNET_DISK_fn_write (fn, NULL, 0, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE); if (0 != STAT (fn, &frstat)) - { - if ((friends_only) || (minimum_friend_count > 0)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Could not read friends list `%s'\n"), fn); - GNUNET_free (fn); - return; - } + { + if ((friends_only) || (minimum_friend_count > 0)) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Could not read friends list `%s'\n"), fn); + GNUNET_free (fn); + return; + } if (frstat.st_size == 0) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Friends file `%s' is empty.\n"), - fn); - GNUNET_free (fn); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Friends file `%s' is empty.\n"), + fn); + GNUNET_free (fn); + return; + } data = GNUNET_malloc_large (frstat.st_size); if (data == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to read friends list from `%s': out of memory\n"), fn); - GNUNET_free (fn); - return; - } - if (frstat.st_size != - GNUNET_DISK_fn_read (fn, data, frstat.st_size)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to read friends list from `%s'\n"), fn); - GNUNET_free (fn); - GNUNET_free (data); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to read friends list from `%s': out of memory\n"), + fn); + GNUNET_free (fn); + return; + } + if (frstat.st_size != GNUNET_DISK_fn_read (fn, data, frstat.st_size)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to read friends list from `%s'\n"), fn); + GNUNET_free (fn); + GNUNET_free (data); + return; + } entries_found = 0; pos = 0; - while ((pos < frstat.st_size) && isspace ( (unsigned char) data[pos])) + while ((pos < frstat.st_size) && isspace ((unsigned char) data[pos])) pos++; while ((frstat.st_size >= sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) && - (pos <= frstat.st_size - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded))) + (pos <= + frstat.st_size - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded))) + { + memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); + if (!isspace + ((unsigned char) + enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1])) { - memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); - if (!isspace ( (unsigned char) enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1])) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("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]))) - pos++; - continue; - } - enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; - if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((char *) &enc, &pid.hashPubKey)) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"), - (unsigned long long) pos, - &enc); - } - else - { - if (0 != memcmp (&pid, - &my_identity, - sizeof (struct GNUNET_PeerIdentity))) - { - entries_found++; - fl = make_peer (&pid, - NULL, - GNUNET_YES); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Found friend `%s' in configuration\n"), - GNUNET_i2s (&fl->pid)); - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Found myself `%s' in friend list (useless, ignored)\n"), - GNUNET_i2s (&pid)); - } - } - pos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded); - while ((pos < frstat.st_size) && isspace ( (unsigned char) data[pos])) - pos++; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _ + ("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]))) + pos++; + continue; } - GNUNET_free (data); - GNUNET_free (fn); - GNUNET_STATISTICS_update (stats, - gettext_noop ("# friends in configuration"), - entries_found, - GNUNET_NO); - if ( (minimum_friend_count > entries_found) && - (friends_only == GNUNET_NO) ) + enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; + if (GNUNET_OK != + GNUNET_CRYPTO_hash_from_string ((char *) &enc, &pid.hashPubKey)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Fewer friends specified than required by minimum friend count. Will only connect to friends.\n")); + _ + ("Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"), + (unsigned long long) pos, &enc); } - if ( (minimum_friend_count > target_connection_count) && - (friends_only == GNUNET_NO) ) + else { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("More friendly connections required than target total number of connections.\n")); + if (0 != memcmp (&pid, &my_identity, sizeof (struct GNUNET_PeerIdentity))) + { + entries_found++; + fl = make_peer (&pid, NULL, GNUNET_YES); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _("Found friend `%s' in configuration\n"), + GNUNET_i2s (&fl->pid)); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Found myself `%s' in friend list (useless, ignored)\n"), + GNUNET_i2s (&pid)); + } } + pos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded); + while ((pos < frstat.st_size) && isspace ((unsigned char) data[pos])) + pos++; + } + GNUNET_free (data); + GNUNET_free (fn); + GNUNET_STATISTICS_update (stats, gettext_noop ("# friends in configuration"), + entries_found, GNUNET_NO); + if ((minimum_friend_count > entries_found) && (friends_only == GNUNET_NO)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _ + ("Fewer friends specified than required by minimum friend count. Will only connect to friends.\n")); + } + if ((minimum_friend_count > target_connection_count) && + (friends_only == GNUNET_NO)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _ + ("More friendly connections required than target total number of connections.\n")); + } } @@ -1210,52 +1131,41 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg) * GNUNET_SYSERR to close it (signal serious error) */ static int -handle_encrypted_hello (void *cls, - const struct GNUNET_PeerIdentity * other, - const struct GNUNET_MessageHeader * - message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +handle_encrypted_hello (void *cls, const struct GNUNET_PeerIdentity *other, + const struct GNUNET_MessageHeader *message, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { struct Peer *peer; struct GNUNET_PeerIdentity pid; #if DEBUG_TOPOLOGY - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received encrypted `%s' from peer `%s'", - "HELLO", - GNUNET_i2s (other)); -#endif + 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"), - 1, - GNUNET_NO); - peer = GNUNET_CONTAINER_multihashmap_get (peers, - &pid.hashPubKey); + 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"), + 1, GNUNET_NO); + peer = GNUNET_CONTAINER_multihashmap_get (peers, &pid.hashPubKey); if (peer == NULL) - { - if ( (GNUNET_YES == friends_only) || - (friend_count < minimum_friend_count) ) - return GNUNET_OK; - } + { + if ((GNUNET_YES == friends_only) || (friend_count < minimum_friend_count)) + return GNUNET_OK; + } else - { - if ( (GNUNET_YES != peer->is_friend) && - (GNUNET_YES == friends_only) ) - return GNUNET_OK; - if ( (GNUNET_YES != peer->is_friend) && - (friend_count < minimum_friend_count) ) - return GNUNET_OK; - } + { + if ((GNUNET_YES != peer->is_friend) && (GNUNET_YES == friends_only)) + return GNUNET_OK; + if ((GNUNET_YES != peer->is_friend) && + (friend_count < minimum_friend_count)) + return GNUNET_OK; + } if (transport != NULL) - GNUNET_TRANSPORT_offer_hello (transport, - message, NULL, NULL); + GNUNET_TRANSPORT_offer_hello (transport, message, NULL, NULL); return GNUNET_OK; } @@ -1269,46 +1179,41 @@ handle_encrypted_hello (void *cls, * @return number of bytes written to buf */ static size_t -hello_advertising_ready (void *cls, - size_t size, - void *buf) +hello_advertising_ready (void *cls, size_t size, void *buf) { struct Peer *pl = cls; struct FindAdvHelloContext fah; size_t want; pl->hello_req = NULL; + GNUNET_assert (GNUNET_YES == pl->is_connected); /* find applicable HELLOs */ fah.peer = pl; fah.result = NULL; fah.max_size = size; fah.next_adv = GNUNET_TIME_UNIT_FOREVER_REL; - GNUNET_CONTAINER_multihashmap_iterate (peers, - &find_advertisable_hello, - &fah); + GNUNET_CONTAINER_multihashmap_iterate (peers, &find_advertisable_hello, &fah); want = 0; if (fah.result != NULL) - { - want = GNUNET_HELLO_size (fah.result->hello); - GNUNET_assert (want <= size); - memcpy (buf, fah.result->hello, want); - GNUNET_CONTAINER_bloomfilter_add (fah.result->filter, - &pl->pid.hashPubKey); + { + want = GNUNET_HELLO_size (fah.result->hello); + 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_STATISTICS_update (stats, - gettext_noop ("# HELLO messages gossipped"), - 1, - GNUNET_NO); - } - pl->next_hello_allowed = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY); - pl->hello_delay_task - = GNUNET_SCHEDULER_add_now (&schedule_next_hello, - pl); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' with %u bytes", "HELLO", + (unsigned int) want); +#endif + GNUNET_STATISTICS_update (stats, + gettext_noop ("# HELLO messages gossipped"), 1, + GNUNET_NO); + } + + if (pl->hello_delay_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (pl->hello_delay_task); + pl->next_hello_allowed = + GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY); + pl->hello_delay_task = GNUNET_SCHEDULER_add_now (&schedule_next_hello, pl); return want; } @@ -1321,36 +1226,33 @@ hello_advertising_ready (void *cls, * @param tc scheduler context */ static void -cleaning_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (NULL != peerinfo_notify) - { - GNUNET_PEERINFO_notify_cancel (peerinfo_notify); - peerinfo_notify = NULL; - } + { + 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_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_iterate (peers, &free_peer, NULL); GNUNET_CONTAINER_multihashmap_destroy (peers); if (handle != NULL) - { - GNUNET_CORE_disconnect (handle); - handle = NULL; - } + { + GNUNET_CORE_disconnect (handle); + handle = NULL; + } whitelist_peers (); if (stats != NULL) - { - GNUNET_STATISTICS_destroy (stats, GNUNET_NO); - stats = NULL; - } + { + GNUNET_STATISTICS_destroy (stats, GNUNET_NO); + stats = NULL; + } } @@ -1363,89 +1265,64 @@ cleaning_task (void *cls, * @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) { - struct GNUNET_CORE_MessageHandler handlers[] = - { - { &handle_encrypted_hello, GNUNET_MESSAGE_TYPE_HELLO, 0}, - { NULL, 0, 0 } - }; + static struct GNUNET_CORE_MessageHandler handlers[] = { + {&handle_encrypted_hello, GNUNET_MESSAGE_TYPE_HELLO, 0}, + {NULL, 0, 0} + }; unsigned long long opt; 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", - "TARGET-CONNECTION-COUNT", - &opt)) + GNUNET_CONFIGURATION_get_value_number (cfg, "TOPOLOGY", + "TARGET-CONNECTION-COUNT", &opt)) opt = 16; target_connection_count = (unsigned int) opt; peers = GNUNET_CONTAINER_multihashmap_create (target_connection_count * 2); - if ( (friends_only == GNUNET_YES) || - (minimum_friend_count > 0) ) + 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, - autoconnect ? "autoconnect enabled" : "autoconnect disabled"); -#endif - if (friend_count < minimum_friend_count) - 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); + "Topology would like %u connections with at least %u friends (%s)\n", + 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); if (NULL == transport) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to connect to `%s' service.\n"), - "transport"); - GNUNET_SCHEDULER_shutdown (); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to connect to `%s' service.\n"), "transport"); + GNUNET_SCHEDULER_shutdown (); + return; + } if (NULL == handle) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to connect to `%s' service.\n"), - "core"); - GNUNET_SCHEDULER_shutdown (); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Failed to connect to `%s' service.\n"), "core"); + GNUNET_SCHEDULER_shutdown (); + return; + } } @@ -1464,13 +1341,12 @@ main (int argc, char *const *argv) }; int ret; - ret = (GNUNET_OK == - GNUNET_PROGRAM_run (argc, - argv, - "topology", - _("GNUnet topology control (maintaining P2P mesh and F2F constraints)"), - options, - &run, NULL)) ? 0 : 1; + 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; }