X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2Fgnunet-service-dv.c;h=84bdc11c23020c69c34710f043ee0140921206ff;hb=37defe2dbd9ea4e5a37710404e8046acbdf4a18e;hp=63f49f53a4948806e521e84dd650f119a1e76463;hpb=07cee5298f5fba8009efd9a5b3137730dd01597c;p=oweals%2Fgnunet.git diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 63f49f53a..84bdc11c2 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -26,15 +26,6 @@ * * @author Christian Grothoff * @author Nathan Evans - * - * TODO: - * - routing tables are not exchanged with direct neighbors - * - distance updates are not properly communicate to US by core, - * and conversely we don't give distance updates properly to the plugin yet - * - even local flow control (send ACK only after core took our message) is - * not implemented, but should be (easy fix) - * - we send 'ACK' even if a message was dropped due to no route (may - * be harmless, but should at least be documented) */ #include "platform.h" #include "gnunet_util_lib.h" @@ -43,8 +34,11 @@ #include "gnunet_hello_lib.h" #include "gnunet_peerinfo_service.h" #include "gnunet_statistics_service.h" -#include "gnunet_consensus_service.h" +#include "gnunet_set_service.h" +#include "gnunet_ats_service.h" #include "dv.h" +#include + /** * How often do we establish the consensu? @@ -56,6 +50,11 @@ */ #define MAX_QUEUE_SIZE 16 +/** + * Maximum number of messages we queue towards the clients/plugin. + */ +#define MAX_QUEUE_SIZE_PLUGIN 1024 + /** * The default fisheye depth, from how many hops away will * we keep peers? @@ -84,7 +83,7 @@ struct Target struct GNUNET_PeerIdentity peer; /** - * How many hops (1-3) is this peer away? + * How many hops (1-3) is this peer away? in network byte order */ uint32_t distance GNUNET_PACKED; @@ -93,7 +92,7 @@ struct Target /** * Message exchanged between DV services (via core), requesting a - * message to be routed. + * message to be routed. */ struct RouteMessage { @@ -169,7 +168,15 @@ struct DirectNeighbor * Identity of the peer. */ struct GNUNET_PeerIdentity peer; - + + /** + * Session ID we use whenever we create a set union with + * this neighbor; constructed from the XOR of our peer + * IDs and then salted with "DV-SALT" to avoid conflicts + * with other applications. + */ + struct GNUNET_HashCode real_session_id; + /** * Head of linked list of messages to send to this peer. */ @@ -190,8 +197,8 @@ struct DirectNeighbor * Keys are peer identities, values are 'struct Target' entries. * Note that the distances in the targets are from the point-of-view * of the peer, not from us! - */ - struct GNUNET_CONTAINER_MultiHashMap *neighbor_table; + */ + struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table; /** * Updated routing table of the neighbor, under construction, @@ -199,20 +206,31 @@ struct DirectNeighbor * Keys are peer identities, values are 'struct Target' entries. * Note that the distances in the targets are from the point-of-view * of the peer, not from us! - */ - struct GNUNET_CONTAINER_MultiHashMap *neighbor_table_consensus; + */ + struct GNUNET_CONTAINER_MultiPeerMap *neighbor_table_consensus; + + /** + * Our current (exposed) routing table as a set. + */ + struct GNUNET_SET_Handle *my_set; + + /** + * Handle for our current active set union operation. + */ + struct GNUNET_SET_OperationHandle *set_op; /** - * Active consensus, if we are currently synchronizing the - * routing tables. + * Handle used if we are listening for this peer, waiting for the + * other peer to initiate construction of the set union. NULL if + * we ar the initiating peer. */ - struct GNUNET_CONSENSUS_Handle *consensus; + struct GNUNET_SET_ListenHandle *listen_handle; /** * ID of the task we use to (periodically) update our consensus - * with this peer. + * with this peer. Used if we are the initiating peer. */ - GNUNET_SCHEDULER_TaskIdentifier consensus_task; + GNUNET_SCHEDULER_TaskIdentifier initiate_task; /** * At what offset are we, with respect to inserting our own routes @@ -231,6 +249,31 @@ struct DirectNeighbor */ unsigned int pm_queue_size; + /** + * Elements in consensus + */ + unsigned int consensus_elements; + + /** + * Direct one hop route + */ + struct Route *direct_route; + + /** + * Flag set within 'check_target_removed' to trigger full global route refresh. + */ + int target_removed; + + /** + * Our distance to this peer, 0 for unknown. + */ + uint32_t distance; + + /** + * Is this neighbor connected at the core level? + */ + int connected; + }; @@ -284,16 +327,18 @@ struct ConsensusSet /** - * Hashmap of all of our direct neighbors (no DV routing). + * Peermap of all of our neighbors; processing these usually requires + * first checking to see if the peer is core-connected and if the + * distance is 1, in which case they are direct neighbors. */ -static struct GNUNET_CONTAINER_MultiHashMap *direct_neighbors; +static struct GNUNET_CONTAINER_MultiPeerMap *direct_neighbors; /** - * Hashmap with all routes that we currently support; contains + * Hashmap with all routes that we currently support; contains * routing information for all peers from distance 2 * up to distance DEFAULT_FISHEYE_DEPTH. */ -static struct GNUNET_CONTAINER_MultiHashMap *all_routes; +static struct GNUNET_CONTAINER_MultiPeerMap *all_routes; /** * Array of consensus sets we expose to the outside world. Sets @@ -317,149 +362,93 @@ static struct GNUNET_PeerIdentity my_identity; static const struct GNUNET_CONFIGURATION_Handle *cfg; /** - * The client, the DV plugin connected to us. Hopefully - * this client will never change, although if the plugin dies - * and returns for some reason it may happen. - */ -static struct GNUNET_SERVER_Client *client_handle; - -/** - * Transmit handle to the plugin. + * The client, the DV plugin connected to us (or an event monitor). + * Hopefully this client will never change, although if the plugin + * dies and returns for some reason it may happen. */ -static struct GNUNET_SERVER_TransmitHandle *plugin_transmit_handle; +static struct GNUNET_SERVER_NotificationContext *nc; /** - * Head of DLL for client messages - */ -static struct PendingMessage *plugin_pending_head; - -/** - * Tail of DLL for client messages + * Handle for the statistics service. */ -static struct PendingMessage *plugin_pending_tail; +static struct GNUNET_STATISTICS_Handle *stats; /** - * Handle for the statistics service. + * Handle to ATS service. */ -struct GNUNET_STATISTICS_Handle *stats; +static struct GNUNET_ATS_PerformanceHandle *ats; /** - * Get distance information from 'atsi'. + * Start creating a new DV set union by initiating the connection. * - * @param atsi performance data - * @param atsi_count number of entries in atsi - * @return connected transport distance + * @param cls the 'struct DirectNeighbor' of the peer we're building + * a routing consensus with + * @param tc scheduler context */ -static uint32_t -get_atsi_distance (const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) -{ - unsigned int i; - - for (i = 0; i < atsi_count; i++) - if (ntohl (atsi[i].type) == GNUNET_ATS_QUALITY_NET_DISTANCE) - return ntohl (atsi->value); - /* FIXME: we do not have distance data? Assume direct neighbor. */ - return DIRECT_NEIGHBOR_COST; -} +static void +initiate_set_union (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc); /** - * Function called to notify a client about the socket - * begin ready to queue more data. "buf" will be - * NULL and "size" zero if the socket was closed for - * writing in the meantime. + * Start creating a new DV set union construction, our neighbour has + * asked for it (callback for listening peer). * - * @param cls closure - * @param size number of bytes available in buf - * @param buf where the callee should write the message - * @return number of bytes written to buf + * @param cls the 'struct DirectNeighbor' of the peer we're building + * a routing consensus with + * @param other_peer the other peer + * @param context_msg message with application specific information from + * the other peer + * @param request request from the other peer, use GNUNET_SET_accept + * to accept it, otherwise the request will be refused + * Note that we don't use a return value here, as it is also + * necessary to specify the set we want to do the operation with, + * whith sometimes can be derived from the context message. + * Also necessary to specify the timeout. */ -static size_t -transmit_to_plugin (void *cls, size_t size, void *buf) -{ - char *cbuf = buf; - struct PendingMessage *reply; - size_t off; - size_t msize; - - plugin_transmit_handle = NULL; - if (NULL == buf) - { - /* client disconnected */ - return 0; - } - off = 0; - while ( (NULL != (reply = plugin_pending_head)) && - (size >= off + (msize = ntohs (reply->msg->size)))) - { - GNUNET_CONTAINER_DLL_remove (plugin_pending_head, plugin_pending_tail, - reply); - memcpy (&cbuf[off], reply->msg, msize); - GNUNET_free (reply); - off += msize; - } - if (NULL != plugin_pending_head) - plugin_transmit_handle = - GNUNET_SERVER_notify_transmit_ready (client_handle, - msize, - GNUNET_TIME_UNIT_FOREVER_REL, - &transmit_to_plugin, NULL); - return off; -} +static void +listen_set_union (void *cls, + const struct GNUNET_PeerIdentity *other_peer, + const struct GNUNET_MessageHeader *context_msg, + struct GNUNET_SET_Request *request); /** * Forward a message from another peer to the plugin. * * @param message the message to send to the plugin - * @param distant_neighbor the original sender of the message - * @param distnace distance to the original sender of the message + * @param origin the original sender of the message + * @param distance distance to the original sender of the message */ static void -send_data_to_plugin (const struct GNUNET_MessageHeader *message, - const struct GNUNET_PeerIdentity *distant_neighbor, +send_data_to_plugin (const struct GNUNET_MessageHeader *message, + const struct GNUNET_PeerIdentity *origin, uint32_t distance) { struct GNUNET_DV_ReceivedMessage *received_msg; - struct PendingMessage *pending_message; size_t size; - if (NULL == client_handle) - { - GNUNET_STATISTICS_update (stats, - "# messages discarded (no plugin)", - 1, GNUNET_NO); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Refusing to queue messages, DV plugin not active.\n")); - return; - } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delivering message from peer `%s'\n", - GNUNET_i2s (distant_neighbor)); - size = sizeof (struct GNUNET_DV_ReceivedMessage) + + GNUNET_i2s (origin)); + size = sizeof (struct GNUNET_DV_ReceivedMessage) + ntohs (message->size); if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE) - { + { GNUNET_break (0); /* too big */ return; } - pending_message = GNUNET_malloc (sizeof (struct PendingMessage) + size); - received_msg = (struct GNUNET_DV_ReceivedMessage *) &pending_message[1]; + received_msg = GNUNET_malloc (size); received_msg->header.size = htons (size); received_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DV_RECV); received_msg->distance = htonl (distance); - received_msg->sender = *distant_neighbor; + received_msg->sender = *origin; memcpy (&received_msg[1], message, ntohs (message->size)); - GNUNET_CONTAINER_DLL_insert_tail (plugin_pending_head, - plugin_pending_tail, - pending_message); - if (NULL == plugin_transmit_handle) - plugin_transmit_handle = - GNUNET_SERVER_notify_transmit_ready (client_handle, size, - GNUNET_TIME_UNIT_FOREVER_REL, - &transmit_to_plugin, NULL); + GNUNET_SERVER_notification_context_broadcast (nc, + &received_msg->header, + GNUNET_YES); + GNUNET_free (received_msg); } @@ -467,47 +456,27 @@ send_data_to_plugin (const struct GNUNET_MessageHeader *message, * Forward a control message to the plugin. * * @param message the message to send to the plugin - * @param distant_neighbor the original sender of the message - * @param distnace distance to the original sender of the message */ static void send_control_to_plugin (const struct GNUNET_MessageHeader *message) { - struct PendingMessage *pending_message; - size_t size; - - if (NULL == client_handle) - { - GNUNET_STATISTICS_update (stats, - "# control messages discarded (no plugin)", - 1, GNUNET_NO); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Refusing to queue messages, DV plugin not active.\n")); - return; - } - size = ntohs (message->size); - pending_message = GNUNET_malloc (sizeof (struct PendingMessage) + size); - memcpy (&pending_message[1], message, size); - GNUNET_CONTAINER_DLL_insert_tail (plugin_pending_head, - plugin_pending_tail, - pending_message); - if (NULL == plugin_transmit_handle) - plugin_transmit_handle = - GNUNET_SERVER_notify_transmit_ready (client_handle, size, - GNUNET_TIME_UNIT_FOREVER_REL, - &transmit_to_plugin, NULL); + GNUNET_SERVER_notification_context_broadcast (nc, + message, + GNUNET_NO); } /** - * Give an ACK message to the plugin, we transmitted a message for it. + * Give an (N)ACK message to the plugin, we transmitted a message for it. * * @param target peer that received the message * @param uid plugin-chosen UID for the message + * @param nack GNUNET_NO to send ACK, GNUNET_YES to send NACK */ static void -send_ack_to_plugin (const struct GNUNET_PeerIdentity *target, - uint32_t uid) +send_ack_to_plugin (const struct GNUNET_PeerIdentity *target, + uint32_t uid, + int nack) { struct GNUNET_DV_AckMessage ack_msg; @@ -515,13 +484,38 @@ send_ack_to_plugin (const struct GNUNET_PeerIdentity *target, "Delivering ACK for message to peer `%s'\n", GNUNET_i2s (target)); ack_msg.header.size = htons (sizeof (ack_msg)); - ack_msg.header.type = htons (GNUNET_MESSAGE_TYPE_DV_SEND_ACK); + ack_msg.header.type = htons ((GNUNET_YES == nack) + ? GNUNET_MESSAGE_TYPE_DV_SEND_NACK + : GNUNET_MESSAGE_TYPE_DV_SEND_ACK); ack_msg.uid = htonl (uid); ack_msg.target = *target; send_control_to_plugin (&ack_msg.header); } +/** + * Send a DISTANCE_CHANGED message to the plugin. + * + * @param peer peer with a changed distance + * @param distance new distance to the peer + */ +static void +send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer, + uint32_t distance) +{ + struct GNUNET_DV_DistanceUpdateMessage du_msg; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Delivering DISTANCE_CHANGED for message about peer `%s'\n", + GNUNET_i2s (peer)); + du_msg.header.size = htons (sizeof (du_msg)); + du_msg.header.type = htons (GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED); + du_msg.distance = htonl (distance); + du_msg.peer = *peer; + send_control_to_plugin (&du_msg.header); +} + + /** * Give a CONNECT message to the plugin. * @@ -529,13 +523,11 @@ send_ack_to_plugin (const struct GNUNET_PeerIdentity *target, * @param distance distance to the target */ static void -send_connect_to_plugin (const struct GNUNET_PeerIdentity *target, +send_connect_to_plugin (const struct GNUNET_PeerIdentity *target, uint32_t distance) { struct GNUNET_DV_ConnectMessage cm; - if (NULL == client_handle) - return; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delivering CONNECT about peer `%s'\n", GNUNET_i2s (target)); @@ -557,8 +549,6 @@ send_disconnect_to_plugin (const struct GNUNET_PeerIdentity *target) { struct GNUNET_DV_DisconnectMessage dm; - if (NULL == client_handle) - return; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delivering DISCONNECT about peer `%s'\n", GNUNET_i2s (target)); @@ -605,8 +595,10 @@ core_transmit_notify (void *cls, size_t size, void *buf) dn->pm_tail, pending); memcpy (&cbuf[off], pending->msg, msize); - send_ack_to_plugin (&pending->ultimate_target, - pending->uid); + if (0 != pending->uid) + send_ack_to_plugin (&pending->ultimate_target, + pending->uid, + GNUNET_NO); GNUNET_free (pending); off += msize; } @@ -617,7 +609,7 @@ core_transmit_notify (void *cls, size_t size, void *buf) 0 /* priority */, GNUNET_TIME_UNIT_FOREVER_REL, &dn->peer, - msize, + msize, &core_transmit_notify, dn); return off; } @@ -627,6 +619,8 @@ core_transmit_notify (void *cls, size_t size, void *buf) * Forward the given payload to the given target. * * @param target where to send the message + * @param uid unique ID for the message + * @param ultimate_target ultimate recipient for the message * @param distance expected (remaining) distance to the target * @param sender original sender of the message * @param payload payload of the message @@ -634,7 +628,9 @@ core_transmit_notify (void *cls, size_t size, void *buf) static void forward_payload (struct DirectNeighbor *target, uint32_t distance, + uint32_t uid, const struct GNUNET_PeerIdentity *sender, + const struct GNUNET_PeerIdentity *ultimate_target, const struct GNUNET_MessageHeader *payload) { struct PendingMessage *pm; @@ -645,7 +641,10 @@ forward_payload (struct DirectNeighbor *target, (0 != memcmp (sender, &my_identity, sizeof (struct GNUNET_PeerIdentity))) ) + { + GNUNET_break (0 == uid); return; + } msize = sizeof (struct RouteMessage) + ntohs (payload->size); if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) { @@ -653,6 +652,8 @@ forward_payload (struct DirectNeighbor *target, return; } pm = GNUNET_malloc (sizeof (struct PendingMessage) + msize); + pm->ultimate_target = *ultimate_target; + pm->uid = uid; pm->msg = (const struct GNUNET_MessageHeader *) &pm[1]; rm = (struct RouteMessage *) &pm[1]; rm->header.size = htons ((uint16_t) msize); @@ -671,7 +672,7 @@ forward_payload (struct DirectNeighbor *target, 0 /* priority */, GNUNET_TIME_UNIT_FOREVER_REL, &target->peer, - msize, + msize, &core_transmit_notify, target); } @@ -693,9 +694,11 @@ get_consensus_slot (uint32_t distance) while ( (i < cs->array_length) && (NULL != cs->targets[i]) ) i++; if (i == cs->array_length) + { GNUNET_array_grow (cs->targets, cs->array_length, cs->array_length * 2 + 2); + } return i; } @@ -715,7 +718,7 @@ allocate_route (struct Route *route, i = get_consensus_slot (distance); route->set_offset = i; consensi[distance].targets[i] = route; - route->target.distance = distance; + route->target.distance = htonl (distance); } @@ -727,7 +730,7 @@ allocate_route (struct Route *route, static void release_route (struct Route *route) { - consensi[route->target.distance].targets[route->set_offset] = NULL; + consensi[ntohl (route->target.distance)].targets[route->set_offset] = NULL; route->set_offset = UINT_MAX; /* indicate invalid slot */ } @@ -747,21 +750,170 @@ move_route (struct Route *route, release_route (route); i = get_consensus_slot (new_distance); route->set_offset = i; - consensi[new_distance].targets[i] = route; - route->target.distance = new_distance; + consensi[new_distance].targets[i] = route; + route->target.distance = htonl (new_distance); } /** - * Start creating a new consensus from scratch. + * Initialize this neighbors 'my_set' and when done give + * it to the pending set operation for execution. * - * @param cls the 'struct DirectNeighbor' of the peer we're building - * a routing consensus with - * @param tc scheduler context - */ + * Add a single element to the set per call: + * + * If we reached the last element of a consensus element: increase distance + * + * + * @param cls the neighbor for which we are building the set + */ +static void +build_set (void *cls) +{ + struct DirectNeighbor *neighbor = cls; + struct GNUNET_SET_Element element; + struct Target *target; + target = NULL; + while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) && + (consensi[neighbor->consensus_insertion_distance].array_length == neighbor->consensus_insertion_offset) ) + { + /* If we reached the last element of a consensus array element: increase distance and start with next array */ + neighbor->consensus_insertion_offset = 0; + neighbor->consensus_insertion_distance++; + /* skip over NULL entries */ + while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) && + (consensi[neighbor->consensus_insertion_distance].array_length > neighbor->consensus_insertion_offset) && + (NULL == consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]) ) + neighbor->consensus_insertion_offset++; + } + if (DEFAULT_FISHEYE_DEPTH - 1 == neighbor->consensus_insertion_distance) + { + /* we have added all elements to the set, run the operation */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished building my SET for peer `%s' with %u elements, committing\n", + GNUNET_i2s(&neighbor->peer), + neighbor->consensus_elements); + GNUNET_SET_commit (neighbor->set_op, + neighbor->my_set); + GNUNET_SET_destroy (neighbor->my_set); + neighbor->my_set = NULL; + return; + } + + target = &consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]->target; + element.size = sizeof (struct Target); + element.type = htons (0); /* do we need this? */ + element.data = target; + + /* Find next non-NULL entry */ + neighbor->consensus_insertion_offset++; + /* skip over NULL entries */ + while ( (DEFAULT_FISHEYE_DEPTH - 1 > neighbor->consensus_insertion_distance) && + (consensi[neighbor->consensus_insertion_distance].array_length > neighbor->consensus_insertion_offset) && + (NULL == consensi[neighbor->consensus_insertion_distance].targets[neighbor->consensus_insertion_offset]) ) + { + neighbor->consensus_insertion_offset++; + } + + if ( (0 != memcmp(&target->peer, &my_identity, sizeof (my_identity))) && + (0 != memcmp(&target->peer, &neighbor->peer, sizeof (neighbor->peer))) ) + { + /* Add target if it is not the neighbor or this peer */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding peer `%s' with distance %u to SET\n", + GNUNET_i2s (&target->peer), + ntohl (target->distance)); + GNUNET_SET_add_element (neighbor->my_set, + &element, + &build_set, neighbor); + neighbor->consensus_elements++; + } + else + build_set(neighbor); +} + + +/** + * A peer is now connected to us at distance 1. Initiate DV exchange. + * + * @param neighbor entry for the neighbor at distance 1 + */ static void -start_consensus (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +handle_direct_connect (struct DirectNeighbor *neighbor) +{ + struct Route *route; + struct GNUNET_HashCode h1; + struct GNUNET_HashCode h2; + struct GNUNET_HashCode session_id; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Direct connection to %s established, routing table exchange begins.\n", + GNUNET_i2s (&neighbor->peer)); + GNUNET_STATISTICS_update (stats, + "# peers connected (1-hop)", + 1, GNUNET_NO); + route = GNUNET_CONTAINER_multipeermap_get (all_routes, + &neighbor->peer); + if (NULL != route) + { + send_disconnect_to_plugin (&neighbor->peer); + release_route (route); + GNUNET_free (route); + } + + neighbor->direct_route = GNUNET_new (struct Route); + neighbor->direct_route->next_hop = neighbor; + neighbor->direct_route->target.peer= neighbor->peer; + neighbor->direct_route->target.distance = DIRECT_NEIGHBOR_COST; + allocate_route (neighbor->direct_route, DIRECT_NEIGHBOR_COST); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding direct route to %s\n", + GNUNET_i2s (&neighbor->direct_route->target.peer)); + + + /* construct session ID seed as XOR of both peer's identities */ + GNUNET_CRYPTO_hash (&my_identity, sizeof (my_identity), &h1); + GNUNET_CRYPTO_hash (&neighbor->peer, sizeof (struct GNUNET_PeerIdentity), &h2); + GNUNET_CRYPTO_hash_xor (&h1, + &h2, + &session_id); + /* make sure session ID is unique across applications by salting it with 'DV' */ + GNUNET_CRYPTO_hkdf (&neighbor->real_session_id, sizeof (struct GNUNET_HashCode), + GCRY_MD_SHA512, GCRY_MD_SHA256, + "DV-SALT", 2, + &session_id, sizeof (session_id), + NULL, 0); + if (0 < memcmp (&neighbor->peer, + &my_identity, + sizeof (struct GNUNET_PeerIdentity))) + { + if (NULL != neighbor->listen_handle) + { + GNUNET_break (0); + } + else + neighbor->initiate_task = GNUNET_SCHEDULER_add_now (&initiate_set_union, + neighbor); + } + else + { + if (NULL != neighbor->listen_handle) + { + GNUNET_break (0); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting SET listen operation with peer `%s'\n", + GNUNET_i2s(&neighbor->peer)); + neighbor->listen_handle = GNUNET_SET_listen (cfg, + GNUNET_SET_OPERATION_UNION, + &neighbor->real_session_id, + &listen_set_union, + neighbor); + } + } +} /** @@ -769,161 +921,693 @@ start_consensus (void *cls, * * @param cls closure * @param peer peer identity this notification is about - * @param atsi performance data - * @param atsi_count number of entries in atsi */ static void -handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) +handle_core_connect (void *cls, + const struct GNUNET_PeerIdentity *peer) { struct DirectNeighbor *neighbor; - struct Route *route; - uint32_t distance; - + /* Check for connect to self message */ if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))) return; - distance = get_atsi_distance (atsi, atsi_count); - neighbor = GNUNET_CONTAINER_multihashmap_get (direct_neighbors, - &peer->hashPubKey); + /* check if entry exists */ + neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, + peer); if (NULL != neighbor) { - GNUNET_break (0); + GNUNET_break (GNUNET_YES != neighbor->connected); + neighbor->connected = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Core connected to %s (distance %u)\n", + GNUNET_i2s (peer), + (unsigned int) neighbor->distance); + if (DIRECT_NEIGHBOR_COST != neighbor->distance) + return; + handle_direct_connect (neighbor); return; } - if (DIRECT_NEIGHBOR_COST != distance) - return; /* is a DV-neighbor */ - neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Core connected to %s (distance unknown)\n", + GNUNET_i2s (peer)); + neighbor = GNUNET_new (struct DirectNeighbor); neighbor->peer = *peer; GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (direct_neighbors, - &peer->hashPubKey, + GNUNET_CONTAINER_multipeermap_put (direct_neighbors, + peer, neighbor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); - route = GNUNET_CONTAINER_multihashmap_get (all_routes, - &peer->hashPubKey); - if (NULL != route) - { - send_disconnect_to_plugin (peer); - release_route (route); - GNUNET_free (route); - } - route->next_hop = neighbor; - neighbor->consensus_task = GNUNET_SCHEDULER_add_now (&start_consensus, - neighbor); + neighbor->connected = GNUNET_YES; + neighbor->distance = 0; /* unknown */ } /** - * We inserted the last element into the consensus, get ready to - * insert the next element into the consensus or conclude if - * we're done. + * Called for each 'target' in a neighbor table to free the associated memory. * - * @param cls the 'struct DirectNeighbor' of the peer we're building - * a routing consensus with - * @param success GNUNET_OK if the last element was added successfully, - * GNUNET_SYSERR if we failed + * @param cls NULL + * @param key key of the value + * @param value value to free + * @return GNUNET_OK to continue to iterate */ -static void -insert_next_element (void *cls, - int success) +static int +free_targets (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { - struct DirectNeighbor *neighbor = cls; - struct GNUNET_CONSENSUS_Element element; - - // FIXME: initialize element... - GNUNET_CONSENSUS_insert (neighbor->consensus, - &element, - &insert_next_element, - neighbor); + GNUNET_free (value); + return GNUNET_OK; } /** - * We have learned a new route from the other peer. Add it to the - * route set we're building. + * Multipeerhmap iterator for checking if a given route is + * (now) useful to this peer. * - * @param cls the 'struct DirectNeighbor' we're building the consensus with - * @param element the new element we have learned - * @return GNUNET_OK if the valid is well-formed and should be added to the consensus, - * GNUNET_SYSERR if the element should be ignored and not be propagated + * @param cls the direct neighbor for the given route + * @param key key value stored under + * @param value a 'struct Target' that may or may not be useful; not that + * the distance in 'target' does not include the first hop yet + * @return GNUNET_YES to continue iteration, GNUNET_NO to stop */ static int -learn_route_cb (void *cls, - const struct GNUNET_CONSENSUS_Element *element) +check_possible_route (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { - GNUNET_break (0); // FIXME - return GNUNET_SYSERR; + struct DirectNeighbor *neighbor = cls; + struct Target *target = value; + struct Route *route; + + route = GNUNET_CONTAINER_multipeermap_get (all_routes, + key); + if (NULL != route) + { + if (ntohl (route->target.distance) > ntohl (target->distance) + 1) + { + /* this 'target' is cheaper than the existing route; switch to alternative route! */ + move_route (route, ntohl (target->distance) + 1); + route->next_hop = neighbor; + send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1); + } + return GNUNET_YES; /* got a route to this target already */ + } + route = GNUNET_new (struct Route); + route->next_hop = neighbor; + route->target.distance = htonl (ntohl (target->distance) + 1); + route->target.peer = target->peer; + allocate_route (route, ntohl (route->target.distance)); + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_put (all_routes, + &route->target.peer, + route, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + send_connect_to_plugin (&route->target.peer, ntohl (target->distance)); + return GNUNET_YES; } /** - * Start creating a new consensus from scratch. + * Multipeermap iterator for finding routes that were previously + * "hidden" due to a better route (called after a disconnect event). * - * @param cls the 'struct DirectNeighbor' of the peer we're building - * a routing consensus with - * @param tc scheduler context - */ -static void -start_consensus (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) + * @param cls NULL + * @param key peer identity of the given direct neighbor + * @param value a 'struct DirectNeighbor' to check for additional routes + * @return GNUNET_YES to continue iteration + */ +static int +refresh_routes (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { - struct DirectNeighbor *neighbor = cls; - struct GNUNET_HashCode session_id; + struct DirectNeighbor *neighbor = value; - neighbor->consensus_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_assert (NULL == neighbor->consensus); - GNUNET_CRYPTO_hash_xor (&session_id, &my_identity.hashPubKey, &neighbor->peer.hashPubKey); // ARG order? - neighbor->consensus = GNUNET_CONSENSUS_create (cfg, - 1, - &neighbor->peer, - &session_id, - &learn_route_cb, - neighbor); - if (NULL == neighbor->consensus) - { - neighbor->consensus_task = GNUNET_SCHEDULER_add_delayed (GNUNET_DV_CONSENSUS_FREQUENCY, - &start_consensus, - neighbor); - return; - } - insert_next_element (neighbor, GNUNET_OK); + if ( (GNUNET_YES != neighbor->connected) || + (DIRECT_NEIGHBOR_COST != neighbor->distance) ) + return GNUNET_YES; + if (NULL != neighbor->neighbor_table) + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table, + &check_possible_route, + neighbor); + return GNUNET_YES; } /** - * Core handler for DV data messages. Whatever this message - * contains all we really have to do is rip it out of its - * DV layering and give it to our pal the DV plugin to report - * in with. + * Get distance information from 'atsi'. * - * @param cls closure - * @param peer peer which sent the message (immediate sender) - * @param message the message - * @param atsi transport ATS information (latency, distance, etc.) + * @param atsi performance data * @param atsi_count number of entries in atsi - * @return GNUNET_OK on success, GNUNET_SYSERR if the other peer violated the protocol + * @return connected transport distance */ -static int -handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) +static uint32_t +get_atsi_distance (const struct GNUNET_ATS_Information *atsi, + uint32_t atsi_count) { - const struct RouteMessage *rm; - const struct GNUNET_MessageHeader *payload; - struct Route *route; + uint32_t i; - if (ntohs (message->size) < sizeof (struct RouteMessage) + sizeof (struct GNUNET_MessageHeader)) - { - GNUNET_break_op (0); - return GNUNET_SYSERR; - } - rm = (const struct RouteMessage *) message; - payload = (const struct GNUNET_MessageHeader *) &rm[1]; - if (ntohs (message->size) != sizeof (struct RouteMessage) + ntohs (payload->size)) - { + for (i = 0; i < atsi_count; i++) + if (ntohl (atsi[i].type) == GNUNET_ATS_QUALITY_NET_DISTANCE) + return (0 == ntohl (atsi->value)) ? DIRECT_NEIGHBOR_COST : ntohl (atsi->value); // FIXME: 0 check should not be required once ATS is fixed! + /* If we do not have explicit distance data, assume direct neighbor. */ + return DIRECT_NEIGHBOR_COST; +} + + +/** + * Multipeermap iterator for freeing routes that go via a particular + * neighbor that disconnected and is thus no longer available. + * + * @param cls the direct neighbor that is now unavailable + * @param key key value stored under + * @param value a 'struct Route' that may or may not go via neighbor + * + * @return GNUNET_YES to continue iteration, GNUNET_NO to stop + */ +static int +cull_routes (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct DirectNeighbor *neighbor = cls; + struct Route *route = value; + + if (route->next_hop != neighbor) + return GNUNET_YES; /* not affected */ + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (all_routes, key, value)); + release_route (route); + send_disconnect_to_plugin (&route->target.peer); + GNUNET_free (route); + return GNUNET_YES; +} + + +/** + * Handle the case that a direct connection to a peer is + * disrupted. Remove all routes via that peer and + * stop the consensus with it. + * + * @param neighbor peer that was disconnected (or at least is no + * longer at distance 1) + */ +static void +handle_direct_disconnect (struct DirectNeighbor *neighbor) +{ + GNUNET_CONTAINER_multipeermap_iterate (all_routes, + &cull_routes, + neighbor); + if (NULL != neighbor->cth) + { + GNUNET_CORE_notify_transmit_ready_cancel (neighbor->cth); + neighbor->cth = NULL; + } + + if (NULL != neighbor->direct_route) + { + release_route (neighbor->direct_route); + GNUNET_free (neighbor->direct_route); + neighbor->direct_route = NULL; + } + + if (NULL != neighbor->neighbor_table_consensus) + { + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus, + &free_targets, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table_consensus); + neighbor->neighbor_table_consensus = NULL; + } + if (NULL != neighbor->neighbor_table) + { + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table, + &free_targets, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table); + neighbor->neighbor_table = NULL; + } + if (NULL != neighbor->set_op) + { + GNUNET_SET_operation_cancel (neighbor->set_op); + neighbor->set_op = NULL; + } + if (NULL != neighbor->my_set) + { + GNUNET_SET_destroy (neighbor->my_set); + neighbor->my_set = NULL; + } + if (NULL != neighbor->listen_handle) + { + GNUNET_SET_listen_cancel (neighbor->listen_handle); + neighbor->listen_handle = NULL; + } + if (GNUNET_SCHEDULER_NO_TASK != neighbor->initiate_task) + { + GNUNET_SCHEDULER_cancel (neighbor->initiate_task); + neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; + } +} + + +/** + * Function that is called with QoS information about an address; used + * to update our current distance to another peer. + * + * @param cls closure + * @param address the address + * @param active is this address in active use + * @param bandwidth_out assigned outbound bandwidth for the connection + * @param bandwidth_in assigned inbound bandwidth for the connection + * @param ats performance data for the address (as far as known) + * @param ats_count number of performance records in 'ats' + */ +static void +handle_ats_update (void *cls, + const struct GNUNET_HELLO_Address *address, + int active, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, + const struct GNUNET_ATS_Information *ats, + uint32_t ats_count) +{ + struct DirectNeighbor *neighbor; + uint32_t distance; + + if (GNUNET_NO == active) + return; + distance = get_atsi_distance (ats, ats_count); + /* + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ATS says distance to %s is %u\n", + GNUNET_i2s (&address->peer), + (unsigned int) distance);*/ + /* check if entry exists */ + neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, + &address->peer); + if (NULL != neighbor) + { + if ( (DIRECT_NEIGHBOR_COST == neighbor->distance) && + (DIRECT_NEIGHBOR_COST == distance) ) + return; /* no change */ + if (DIRECT_NEIGHBOR_COST == neighbor->distance) + { + neighbor->distance = distance; + GNUNET_STATISTICS_update (stats, + "# peers connected (1-hop)", + -1, GNUNET_NO); + handle_direct_disconnect (neighbor); + GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, + &refresh_routes, + NULL); + return; + } + neighbor->distance = distance; + if (DIRECT_NEIGHBOR_COST != neighbor->distance) + return; + if (GNUNET_YES != neighbor->connected) + return; + handle_direct_connect (neighbor); + return; + } + neighbor = GNUNET_new (struct DirectNeighbor); + neighbor->peer = address->peer; + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_put (direct_neighbors, + &address->peer, + neighbor, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + neighbor->connected = GNUNET_NO; /* not yet */ + neighbor->distance = distance; +} + + +/** + * Check if a target was removed from the set of the other peer; if so, + * if we also used it for our route, we need to remove it from our + * 'all_routes' set (and later check if an alternative path now exists). + * + * @param cls the 'struct DirectNeighbor' + * @param key peer identity for the target + * @param value a 'struct Target' previously reachable via the given neighbor + */ +static int +check_target_removed (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct DirectNeighbor *neighbor = cls; + struct Target *new_target; + struct Route *current_route; + + new_target = GNUNET_CONTAINER_multipeermap_get (neighbor->neighbor_table_consensus, + key); + if (NULL == new_target) + { + /* target was revoked, check if it was used */ + current_route = GNUNET_CONTAINER_multipeermap_get (all_routes, + key); + if ( (NULL == current_route) || + (current_route->next_hop != neighbor) ) + { + /* didn't matter, wasn't used */ + return GNUNET_OK; + } + /* remove existing route */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Lost route to %s\n", + GNUNET_i2s (¤t_route->target.peer)); + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (all_routes, key, current_route)); + send_disconnect_to_plugin (¤t_route->target.peer); + GNUNET_free (current_route); + neighbor->target_removed = GNUNET_YES; + return GNUNET_OK; + } + return GNUNET_OK; +} + + +/** + * Check if a target was added to the set of the other peer; if it + * was added or impoves the existing route, do the needed updates. + * + * @param cls the 'struct DirectNeighbor' + * @param key peer identity for the target + * @param value a 'struct Target' now reachable via the given neighbor + */ +static int +check_target_added (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct DirectNeighbor *neighbor = cls; + struct Target *target = value; + struct Route *current_route; + + /* target was revoked, check if it was used */ + current_route = GNUNET_CONTAINER_multipeermap_get (all_routes, + key); + if (NULL != current_route) + { + /* route exists */ + if (current_route->next_hop == neighbor) + { + /* we had the same route before, no change */ + if (ntohl (target->distance) + 1 != ntohl (current_route->target.distance)) + { + current_route->target.distance = htonl (ntohl (target->distance) + 1); + send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1); + } + return GNUNET_OK; + } + if (ntohl (current_route->target.distance) >= ntohl (target->distance) + 1) + { + /* alternative, shorter route exists, ignore */ + return GNUNET_OK; + } + /* new route is better than the existing one, take over! */ + /* NOTE: minor security issue: malicious peers may advertise + very short routes to take over longer paths; as we don't + check that the shorter routes actually work, a malicious + direct neighbor can use this to DoS our long routes */ + current_route->next_hop = neighbor; + current_route->target.distance = htonl (ntohl (target->distance) + 1); + send_distance_change_to_plugin (&target->peer, ntohl (target->distance) + 1); + return GNUNET_OK; + } + /* new route */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Discovered new route to %s using %u hops\n", + GNUNET_i2s (&target->peer), + (unsigned int) (ntohl (target->distance) + 1)); + current_route = GNUNET_new (struct Route); + current_route->next_hop = neighbor; + current_route->target.peer = target->peer; + current_route->target.distance = htonl (ntohl (target->distance) + 1); + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_put (all_routes, + ¤t_route->target.peer, + current_route, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + send_connect_to_plugin (¤t_route->target.peer, + ntohl (current_route->target.distance)); + return GNUNET_OK; +} + + +/** + * Callback for set operation results. Called for each element + * in the result set. + * We have learned a new route from the other peer. Add it to the + * route set we're building. + * + * @param cls the 'struct DirectNeighbor' we're building the consensus with + * @param element a result element, only valid if status is GNUNET_SET_STATUS_OK + * @param status see enum GNUNET_SET_Status + */ +static void +handle_set_union_result (void *cls, + const struct GNUNET_SET_Element *element, + enum GNUNET_SET_Status status) +{ + struct DirectNeighbor *neighbor = cls; + struct Target *target; + char *status_str; + + switch (status) { + case GNUNET_SET_STATUS_OK: + status_str = "GNUNET_SET_STATUS_OK"; + break; + case GNUNET_SET_STATUS_TIMEOUT: + status_str = "GNUNET_SET_STATUS_TIMEOUT"; + break; + case GNUNET_SET_STATUS_FAILURE: + status_str = "GNUNET_SET_STATUS_FAILURE"; + break; + case GNUNET_SET_STATUS_HALF_DONE: + status_str = "GNUNET_SET_STATUS_HALF_DONE"; + break; + case GNUNET_SET_STATUS_DONE: + status_str = "GNUNET_SET_STATUS_DONE"; + break; + default: + status_str = "UNDEFINED"; + break; + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got SET union result: %s\n", + status_str); + switch (status) + { + case GNUNET_SET_STATUS_OK: + if (sizeof (struct Target) != element->size) + { + GNUNET_break_op (0); + return; + } + target = GNUNET_new (struct Target); + memcpy (target, element->data, sizeof (struct Target)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received information about peer `%s' with distance %u\n", + GNUNET_i2s (&target->peer), ntohl(target->distance)); + if (NULL == neighbor->neighbor_table_consensus) + neighbor->neighbor_table_consensus = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO); + if (GNUNET_YES != + GNUNET_CONTAINER_multipeermap_put (neighbor->neighbor_table_consensus, + &target->peer, + target, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) + { + GNUNET_break_op (0); + GNUNET_free (target); + } + break; + case GNUNET_SET_STATUS_TIMEOUT: + case GNUNET_SET_STATUS_FAILURE: + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Failed to establish DV union, will try again later\n"); + neighbor->set_op = NULL; + if (NULL != neighbor->neighbor_table_consensus) + { + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus, + &free_targets, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table_consensus); + neighbor->neighbor_table_consensus = NULL; + } + if (0 < memcmp (&neighbor->peer, + &my_identity, + sizeof (struct GNUNET_PeerIdentity))) + neighbor->initiate_task = GNUNET_SCHEDULER_add_delayed (GNUNET_DV_CONSENSUS_FREQUENCY, + &initiate_set_union, + neighbor); + break; + case GNUNET_SET_STATUS_HALF_DONE: + break; + case GNUNET_SET_STATUS_DONE: + /* we got all of our updates; integrate routing table! */ + neighbor->target_removed = GNUNET_NO; + if (NULL == neighbor->neighbor_table_consensus) + neighbor->neighbor_table_consensus = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO); + if (NULL != neighbor->neighbor_table) + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table, + &check_target_removed, + neighbor); + if (GNUNET_YES == neighbor->target_removed) + { + /* check if we got an alternative for the removed routes */ + GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, + &refresh_routes, + NULL); + } + /* add targets that appeared (and check for improved routes) */ + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table_consensus, + &check_target_added, + neighbor); + if (NULL != neighbor->neighbor_table) + { + GNUNET_CONTAINER_multipeermap_iterate (neighbor->neighbor_table, + &free_targets, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (neighbor->neighbor_table); + neighbor->neighbor_table = NULL; + } + neighbor->neighbor_table = neighbor->neighbor_table_consensus; + neighbor->neighbor_table_consensus = NULL; + + /* operation done, schedule next run! */ + neighbor->set_op = NULL; + if (0 < memcmp (&neighbor->peer, + &my_identity, + sizeof (struct GNUNET_PeerIdentity))) + neighbor->initiate_task = GNUNET_SCHEDULER_add_delayed (GNUNET_DV_CONSENSUS_FREQUENCY, + &initiate_set_union, + neighbor); + break; + default: + GNUNET_break (0); + return; + } +} + + +/** + * Start creating a new DV set union construction, our neighbour has + * asked for it (callback for listening peer). + * + * @param cls the 'struct DirectNeighbor' of the peer we're building + * a routing consensus with + * @param other_peer the other peer + * @param context_msg message with application specific information from + * the other peer + * @param request request from the other peer, use GNUNET_SET_accept + * to accept it, otherwise the request will be refused + * Note that we don't use a return value here, as it is also + * necessary to specify the set we want to do the operation with, + * whith sometimes can be derived from the context message. + * Also necessary to specify the timeout. + */ +static void +listen_set_union (void *cls, + const struct GNUNET_PeerIdentity *other_peer, + const struct GNUNET_MessageHeader *context_msg, + struct GNUNET_SET_Request *request) +{ + struct DirectNeighbor *neighbor = cls; + + if (NULL == request) + return; /* why??? */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting to create consensus with %s\n", + GNUNET_i2s (&neighbor->peer)); + if (NULL != neighbor->set_op) + { + GNUNET_SET_operation_cancel (neighbor->set_op); + neighbor->set_op = NULL; + } + if (NULL != neighbor->my_set) + { + GNUNET_SET_destroy (neighbor->my_set); + neighbor->my_set = NULL; + } + neighbor->my_set = GNUNET_SET_create (cfg, + GNUNET_SET_OPERATION_UNION); + neighbor->set_op = GNUNET_SET_accept (request, + GNUNET_SET_RESULT_ADDED, + &handle_set_union_result, + neighbor); + neighbor->consensus_insertion_offset = 0; + neighbor->consensus_insertion_distance = 0; + neighbor->consensus_elements = 0; + build_set (neighbor); +} + + +/** + * Start creating a new DV set union by initiating the connection. + * + * @param cls the 'struct DirectNeighbor' of the peer we're building + * a routing consensus with + * @param tc scheduler context + */ +static void +initiate_set_union (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct DirectNeighbor *neighbor = cls; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Initiating SET union with peer `%s'\n", + GNUNET_i2s (&neighbor->peer)); + neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; + neighbor->my_set = GNUNET_SET_create (cfg, + GNUNET_SET_OPERATION_UNION); + neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer, + &neighbor->real_session_id, + NULL, + 0 /* FIXME: salt */, + GNUNET_SET_RESULT_ADDED, + &handle_set_union_result, + neighbor); + neighbor->consensus_insertion_offset = 0; + neighbor->consensus_insertion_distance = 0; + neighbor->consensus_elements = 0; + build_set (neighbor); +} + + +/** + * Core handler for DV data messages. Whatever this message + * contains all we really have to do is rip it out of its + * DV layering and give it to our pal the DV plugin to report + * in with. + * + * @param cls closure + * @param peer peer which sent the message (immediate sender) + * @param message the message + * @return GNUNET_OK on success, GNUNET_SYSERR if the other peer violated the protocol + */ +static int +handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_MessageHeader *message) +{ + const struct RouteMessage *rm; + const struct GNUNET_MessageHeader *payload; + struct Route *route; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Handling DV message\n"); + if (ntohs (message->size) < sizeof (struct RouteMessage) + sizeof (struct GNUNET_MessageHeader)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + rm = (const struct RouteMessage *) message; + payload = (const struct GNUNET_MessageHeader *) &rm[1]; + if (ntohs (message->size) != sizeof (struct RouteMessage) + ntohs (payload->size)) + { GNUNET_break_op (0); return GNUNET_SYSERR; } @@ -932,8 +1616,8 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, sizeof (struct GNUNET_PeerIdentity))) { /* message is for me, check reverse route! */ - route = GNUNET_CONTAINER_multihashmap_get (all_routes, - &rm->sender.hashPubKey); + route = GNUNET_CONTAINER_multipeermap_get (all_routes, + &rm->sender); if (NULL == route) { /* don't have reverse route, drop */ @@ -942,13 +1626,16 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, 1, GNUNET_NO); return GNUNET_OK; } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Delivering %u bytes to myself!\n", + ntohs (payload->size)); send_data_to_plugin (payload, &rm->sender, - route->target.distance); + ntohl (route->target.distance)); return GNUNET_OK; } - route = GNUNET_CONTAINER_multihashmap_get (all_routes, - &rm->target.hashPubKey); + route = GNUNET_CONTAINER_multipeermap_get (all_routes, + &rm->target); if (NULL == route) { GNUNET_STATISTICS_update (stats, @@ -956,18 +1643,23 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, 1, GNUNET_NO); return GNUNET_OK; } - if (route->target.distance > ntohl (rm->distance) + 1) + if (ntohl (route->target.distance) > ntohl (rm->distance) + 1) { GNUNET_STATISTICS_update (stats, "# messages discarded (target too far)", 1, GNUNET_NO); return GNUNET_OK; } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Forwarding message to %s\n", + GNUNET_i2s (&rm->target)); forward_payload (route->next_hop, - route->target.distance, + ntohl (route->target.distance), + 0, + &rm->target, &rm->sender, payload); - return GNUNET_OK; + return GNUNET_OK; } @@ -994,6 +1686,7 @@ handle_dv_send_message (void *cls, struct GNUNET_SERVER_Client *client, return; } msg = (const struct GNUNET_DV_SendMessage *) message; + GNUNET_break (0 != ntohl (msg->uid)); payload = (const struct GNUNET_MessageHeader *) &msg[1]; if (ntohs (message->size) != sizeof (struct GNUNET_DV_SendMessage) + ntohs (payload->size)) { @@ -1001,123 +1694,33 @@ handle_dv_send_message (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - route = GNUNET_CONTAINER_multihashmap_get (all_routes, - &msg->target.hashPubKey); + route = GNUNET_CONTAINER_multipeermap_get (all_routes, + &msg->target); if (NULL == route) { - /* got disconnected, send ACK anyway? - FIXME: What we really want is an 'NACK' here... */ + /* got disconnected */ GNUNET_STATISTICS_update (stats, "# local messages discarded (no route)", 1, GNUNET_NO); - send_ack_to_plugin (&msg->target, htonl (msg->uid)); + send_ack_to_plugin (&msg->target, ntohl (msg->uid), GNUNET_YES); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } - // FIXME: flow control (send ACK only once message has left the queue...) - send_ack_to_plugin (&msg->target, htonl (msg->uid)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Forwarding %u bytes to %s\n", + ntohs (payload->size), + GNUNET_i2s (&msg->target)); + forward_payload (route->next_hop, - route->target.distance, + ntohl (route->target.distance), + htonl (msg->uid), + &msg->target, &my_identity, payload); GNUNET_SERVER_receive_done (client, GNUNET_OK); } -/** - * Multihashmap iterator for freeing routes that go via a particular - * neighbor that disconnected and is thus no longer available. - * - * @param cls the direct neighbor that is now unavailable - * @param key key value stored under - * @param value a 'struct Route' that may or may not go via neighbor - * - * @return GNUNET_YES to continue iteration, GNUNET_NO to stop - */ -static int -cull_routes (void *cls, const struct GNUNET_HashCode * key, void *value) -{ - struct DirectNeighbor *neighbor = cls; - struct Route *route = value; - - if (route->next_hop != neighbor) - return GNUNET_YES; /* not affected */ - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (all_routes, key, value)); - release_route (route); - send_disconnect_to_plugin (&route->target.peer); - GNUNET_free (route); - return GNUNET_YES; -} - - -/** - * Multihashmap iterator for checking if a given route is - * (now) useful to this peer. - * - * @param cls the direct neighbor for the given route - * @param key key value stored under - * @param value a 'struct Target' that may or may not be useful; not that - * the distance in 'target' does not include the first hop yet - * @return GNUNET_YES to continue iteration, GNUNET_NO to stop - */ -static int -check_possible_route (void *cls, const struct GNUNET_HashCode * key, void *value) -{ - struct DirectNeighbor *neighbor = cls; - struct Target *target = value; - struct Route *route; - - route = GNUNET_CONTAINER_multihashmap_get (all_routes, - key); - if (NULL != route) - { - if (route->target.distance > target->distance + 1) - { - /* this 'target' is cheaper than the existing route; switch to alternative route! */ - move_route (route, target->distance + 1); - route->next_hop = neighbor; - // FIXME: notify plugin about distance update? - } - return GNUNET_YES; /* got a route to this target already */ - } - route = GNUNET_malloc (sizeof (struct Route)); - route->next_hop = neighbor; - route->target.distance = target->distance + 1; - route->target.peer = target->peer; - allocate_route (route, route->target.distance); - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (all_routes, - &route->target.peer.hashPubKey, - route, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); - send_connect_to_plugin (&route->target.peer, target->distance); - return GNUNET_YES; -} - - -/** - * Multihashmap iterator for finding routes that were previously - * "hidden" due to a better route (called after a disconnect event). - * - * @param cls NULL - * @param key peer identity of the given direct neighbor - * @param value a 'struct DirectNeighbor' to check for additional routes - * @return GNUNET_YES to continue iteration - */ -static int -refresh_routes (void *cls, const struct GNUNET_HashCode * key, void *value) -{ - struct DirectNeighbor *neighbor = value; - - if (NULL != neighbor->neighbor_table) - GNUNET_CONTAINER_multihashmap_iterate (neighbor->neighbor_table, - &check_possible_route, - neighbor); - return GNUNET_YES; -} - - /** * Cleanup all of the data structures associated with a given neighbor. * @@ -1133,30 +1736,13 @@ cleanup_neighbor (struct DirectNeighbor *neighbor) neighbor->pm_queue_size--; GNUNET_CONTAINER_DLL_remove (neighbor->pm_head, neighbor->pm_tail, - pending); + pending); GNUNET_free (pending); } - GNUNET_CONTAINER_multihashmap_iterate (all_routes, - &cull_routes, - neighbor); - if (NULL != neighbor->cth) - { - GNUNET_CORE_notify_transmit_ready_cancel (neighbor->cth); - neighbor->cth = NULL; - } - if (GNUNET_SCHEDULER_NO_TASK != neighbor->consensus_task) - { - GNUNET_SCHEDULER_cancel (neighbor->consensus_task); - neighbor->consensus_task = GNUNET_SCHEDULER_NO_TASK; - } - if (NULL != neighbor->consensus) - { - GNUNET_CONSENSUS_destroy (neighbor->consensus); - neighbor->consensus = NULL; - } + handle_direct_disconnect (neighbor); GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (direct_neighbors, - &neighbor->peer.hashPubKey, + GNUNET_CONTAINER_multipeermap_remove (direct_neighbors, + &neighbor->peer, neighbor)); GNUNET_free (neighbor); } @@ -1180,21 +1766,30 @@ handle_core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))) return; neighbor = - GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey); + GNUNET_CONTAINER_multipeermap_get (direct_neighbors, peer); if (NULL == neighbor) { - /* must have been a DV-neighbor, ignore */ + GNUNET_break (0); return; } + GNUNET_break (GNUNET_YES == neighbor->connected); + neighbor->connected = GNUNET_NO; + if (DIRECT_NEIGHBOR_COST == neighbor->distance) + { + + GNUNET_STATISTICS_update (stats, + "# peers connected (1-hop)", + -1, GNUNET_NO); + } cleanup_neighbor (neighbor); - GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors, + GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, &refresh_routes, NULL); } /** - * Multihashmap iterator for freeing routes. Should never be called. + * Multipeermap iterator for freeing routes. Should never be called. * * @param cls NULL * @param key key value stored under @@ -1203,13 +1798,13 @@ handle_core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) * @return GNUNET_YES to continue iteration, GNUNET_NO to stop */ static int -free_route (void *cls, const struct GNUNET_HashCode * key, void *value) +free_route (void *cls, const struct GNUNET_PeerIdentity * key, void *value) { struct Route *route = value; GNUNET_break (0); GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (all_routes, key, value)); + GNUNET_CONTAINER_multipeermap_remove (all_routes, key, value)); release_route (route); send_disconnect_to_plugin (&route->target.peer); GNUNET_free (route); @@ -1218,7 +1813,7 @@ free_route (void *cls, const struct GNUNET_HashCode * key, void *value) /** - * Multihashmap iterator for freeing direct neighbors. Should never be called. + * Multipeermap iterator for freeing direct neighbors. Should never be called. * * @param cls NULL * @param key key value stored under @@ -1227,7 +1822,7 @@ free_route (void *cls, const struct GNUNET_HashCode * key, void *value) * @return GNUNET_YES to continue iteration, GNUNET_NO to stop */ static int -free_direct_neighbors (void *cls, const struct GNUNET_HashCode * key, void *value) +free_direct_neighbors (void *cls, const struct GNUNET_PeerIdentity * key, void *value) { struct DirectNeighbor *neighbor = value; @@ -1246,26 +1841,22 @@ free_direct_neighbors (void *cls, const struct GNUNET_HashCode * key, void *valu static void shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct PendingMessage *pending; unsigned int i; - GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors, - &free_direct_neighbors, NULL); - GNUNET_CONTAINER_multihashmap_destroy (direct_neighbors); - GNUNET_CONTAINER_multihashmap_iterate (all_routes, - &free_route, NULL); - GNUNET_CONTAINER_multihashmap_destroy (all_routes); GNUNET_CORE_disconnect (core_api); core_api = NULL; + GNUNET_ATS_performance_done (ats); + ats = NULL; + GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, + &free_direct_neighbors, NULL); + GNUNET_CONTAINER_multipeermap_iterate (all_routes, + &free_route, NULL); + GNUNET_CONTAINER_multipeermap_destroy (direct_neighbors); + GNUNET_CONTAINER_multipeermap_destroy (all_routes); GNUNET_STATISTICS_destroy (stats, GNUNET_NO); stats = NULL; - while (NULL != (pending = plugin_pending_head)) - { - GNUNET_CONTAINER_DLL_remove (plugin_pending_head, - plugin_pending_tail, - pending); - GNUNET_free (pending); - } + GNUNET_SERVER_notification_context_destroy (nc); + nc = NULL; for (i=0;itarget.distance); + cm.peer = route->target.peer; + + GNUNET_SERVER_notification_context_unicast (nc, + client, + &cm.header, + GNUNET_NO); + return GNUNET_OK; +} + + /** * Handle START-message. This is the first message sent to us * by the client (can only be one!). @@ -1285,15 +1906,11 @@ static void handle_start (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - if (NULL != client_handle) - { - /* forcefully drop old client */ - GNUNET_SERVER_client_disconnect (client_handle); - GNUNET_SERVER_client_drop (client_handle); - } - client_handle = client; - GNUNET_SERVER_client_keep (client_handle); + GNUNET_SERVER_notification_context_add (nc, client); GNUNET_SERVER_receive_done (client, GNUNET_OK); + GNUNET_CONTAINER_multipeermap_iterate (all_routes, + &add_route, + client); } @@ -1301,11 +1918,10 @@ handle_start (void *cls, struct GNUNET_SERVER_Client *client, * Called on core init. * * @param cls unused - * @param server legacy * @param identity this peer's identity */ static void -core_init (void *cls, struct GNUNET_CORE_Handle *server, +core_init (void *cls, const struct GNUNET_PeerIdentity *identity) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -1331,28 +1947,36 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, {NULL, 0, 0} }; static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { - {&handle_start, NULL, - GNUNET_MESSAGE_TYPE_DV_START, + {&handle_start, NULL, + GNUNET_MESSAGE_TYPE_DV_START, sizeof (struct GNUNET_MessageHeader) }, - { &handle_dv_send_message, NULL, - GNUNET_MESSAGE_TYPE_DV_SEND, + { &handle_dv_send_message, NULL, + GNUNET_MESSAGE_TYPE_DV_SEND, 0}, {NULL, NULL, 0, 0} }; cfg = c; - direct_neighbors = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); - all_routes = GNUNET_CONTAINER_multihashmap_create (65536, GNUNET_NO); + direct_neighbors = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO); + all_routes = GNUNET_CONTAINER_multipeermap_create (65536, GNUNET_NO); core_api = GNUNET_CORE_connect (cfg, NULL, - &core_init, + &core_init, &handle_core_connect, &handle_core_disconnect, - NULL, GNUNET_NO, - NULL, GNUNET_NO, + NULL, GNUNET_NO, + NULL, GNUNET_NO, core_handlers); if (NULL == core_api) return; + ats = GNUNET_ATS_performance_init (cfg, &handle_ats_update, NULL); + if (NULL == ats) + { + GNUNET_CORE_disconnect (core_api); + return; + } + nc = GNUNET_SERVER_notification_context_create (server, + MAX_QUEUE_SIZE_PLUGIN); stats = GNUNET_STATISTICS_create ("dv", cfg); GNUNET_SERVER_add_handlers (server, plugin_handlers); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,