X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2Fgnunet-service-dv.c;h=f95a2ac5922cf359dac8d5034c6f4a345ba0ad69;hb=2cae42046220b7d6a9cd1ce0f908d737746e7d56;hp=16e10d674737a0d59f4b4bacb2c8b09ac6a966fe;hpb=18308311e0d3f83ca05171b060430428d65ae0dd;p=oweals%2Fgnunet.git diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 16e10d674..f95a2ac59 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -45,42 +45,24 @@ #include "gnunet_crypto_lib.h" #include "dv.h" -#define DEBUG_DV_PEER_NUMBERS GNUNET_YES - -/** - * DV Service Context stuff goes here... - */ - -/** - * Handle to the core service api. - */ -static struct GNUNET_CORE_Handle *coreAPI; - -/** - * The identity of our peer. - */ -static struct GNUNET_PeerIdentity my_identity; - /** - * The configuration for this service. + * For testing mostly, remember only the + * shortest path to a distant neighbor. */ -static const struct GNUNET_CONFIGURATION_Handle *cfg; +#define AT_MOST_ONE GNUNET_NO -/** - * The scheduler for this service. - */ -static struct GNUNET_SCHEDULER_Handle *sched; +#define USE_PEER_ID GNUNET_YES /** * How often do we check about sending out more peer information (if * we are connected to no peers previously). */ -#define GNUNET_DV_DEFAULT_SEND_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50000) +#define GNUNET_DV_DEFAULT_SEND_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500000) /** * How long do we wait at most between sending out information? */ -#define GNUNET_DV_MAX_SEND_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50000) +#define GNUNET_DV_MAX_SEND_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500000) /** * How long can we have not heard from a peer and @@ -130,31 +112,6 @@ static struct GNUNET_SCHEDULER_Handle *sched; */ #define DEFAULT_FISHEYE_DEPTH 4 -/** - * 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; - -/** - * Task to run when we shut down, cleaning up all our trash - */ -GNUNET_SCHEDULER_TaskIdentifier cleanup_task; - -/** - * Task to run to gossip about peers. Will reschedule itself forever until shutdown! - */ -GNUNET_SCHEDULER_TaskIdentifier gossip_task; - -/** - * Struct where neighbor information is stored. - */ -struct DistantNeighbor *referees; - -static size_t default_dv_priority = 0; - - /** * Linked list of messages to send to clients. */ @@ -170,49 +127,37 @@ struct PendingMessage */ struct PendingMessage *prev; - struct GNUNET_DV_SendResultMessage *send_result; /** - * Actual message to be sent; // avoid allocation + * The PeerIdentity to send to */ - const struct GNUNET_MessageHeader *msg; // msg = (cast) &pm[1]; // memcpy (&pm[1], data, len); - -}; - -/** - * Transmit handle to the plugin. - */ -struct GNUNET_CONNECTION_TransmitHandle * plugin_transmit_handle; - -/** - * Head of DLL for client messages - */ -struct PendingMessage *plugin_pending_head; + struct GNUNET_PeerIdentity recipient; -/** - * Tail of DLL for client messages - */ -struct PendingMessage *plugin_pending_tail; + /** + * The result of message sending. + */ + struct GNUNET_DV_SendResultMessage *send_result; -/** - * Handle to the peerinfo service - */ -struct GNUNET_PEERINFO_Handle *peerinfo_handle; + /** + * Message importance level. + */ + unsigned int importance; -/** - * Transmit handle to core service. - */ -struct GNUNET_CORE_TransmitHandle * core_transmit_handle; + /** + * Size of message. + */ + unsigned int msg_size; -/** - * Head of DLL for core messages - */ -struct PendingMessage *core_pending_head; + /** + * How long to wait before sending message. + */ + struct GNUNET_TIME_Relative timeout; -/** - * Tail of DLL for core messages - */ -struct PendingMessage *core_pending_tail; + /** + * Actual message to be sent; // avoid allocation + */ + const struct GNUNET_MessageHeader *msg; // msg = (cast) &pm[1]; // memcpy (&pm[1], data, len); +}; struct FastGossipNeighborList { @@ -289,6 +234,12 @@ struct NeighborUpdateInfo * The time we heard about this peer */ struct GNUNET_TIME_Absolute now; + + /** + * Peer id this peer uses to refer to neighbor. + */ + unsigned int referrer_peer_id; + }; /** @@ -414,6 +365,11 @@ struct PeerIteratorContext */ struct DirectNeighbor *neighbor; + /** + * The distant neighbor entry for this direct neighbor. + */ + struct DistantNeighbor *distant; + }; /** @@ -478,58 +434,26 @@ struct DV_SendContext * Timeout for this message */ struct GNUNET_TIME_Relative timeout; -}; - -/** - * Global construct - */ -struct GNUNET_DV_Context -{ - /** - * Map of PeerIdentifiers to 'struct GNUNET_dv_neighbor*'s for all - * directly connected peers. - */ - struct GNUNET_CONTAINER_MultiHashMap *direct_neighbors; - - /** - * Map of PeerIdentifiers to 'struct GNUNET_dv_neighbor*'s for - * peers connected via DV (extended neighborhood). Does ALSO - * include any peers that are in 'direct_neighbors'; for those - * peers, the cost will be zero and the referrer all zeros. - */ - struct GNUNET_CONTAINER_MultiHashMap *extended_neighbors; - - /** - * We use the min heap (min refers to cost) to prefer - * gossipping about peers with small costs. - */ - struct GNUNET_CONTAINER_Heap *neighbor_min_heap; /** - * We use the max heap (max refers to cost) for general - * iterations over all peers and to remove the most costly - * connection if we have too many. + * Unique ID for DV message */ - struct GNUNET_CONTAINER_Heap *neighbor_max_heap; - - unsigned long long fisheye_depth; - - unsigned long long max_table_size; - - unsigned int neighbor_id_loc; - - int closing; - + unsigned int uid; }; -static struct GNUNET_DV_Context ctx; - struct FindDestinationContext { unsigned int tid; struct DistantNeighbor *dest; }; +struct FindIDContext +{ + unsigned int tid; + struct GNUNET_PeerIdentity *dest; + const struct GNUNET_PeerIdentity *via; +}; + struct DisconnectContext { /** @@ -543,6 +467,147 @@ struct DisconnectContext struct DirectNeighbor *direct; }; +struct TokenizedMessageContext +{ + /** + * Immediate sender of this message + */ + const struct GNUNET_PeerIdentity *peer; + + /** + * Distant sender of the message + */ + struct DistantNeighbor *distant; + + /** + * Uid for this set of messages + */ + uint32_t uid; +}; + +/** + * Context for finding the least cost peer to send to. + * Transport selection can only go so far. + */ +struct FindLeastCostContext +{ + struct DistantNeighbor *target; + unsigned int least_cost; +}; + +/** + * Handle to the core service api. + */ +static struct GNUNET_CORE_Handle *coreAPI; + +/** + * Stream tokenizer to handle messages coming in from core. + */ +static struct GNUNET_SERVER_MessageStreamTokenizer *coreMST; + +/** + * The identity of our peer. + */ +static struct GNUNET_PeerIdentity my_identity; + +/** + * The configuration for this service. + */ +static const struct GNUNET_CONFIGURATION_Handle *cfg; + +/** + * The scheduler for this service. + */ +static struct GNUNET_SCHEDULER_Handle *sched; + +/** + * 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; + +/** + * Task to run when we shut down, cleaning up all our trash + */ +static GNUNET_SCHEDULER_TaskIdentifier cleanup_task; + +static size_t default_dv_priority = 0; + +static char *my_short_id; + +/** + * Transmit handle to the plugin. + */ +static struct GNUNET_CONNECTION_TransmitHandle * plugin_transmit_handle; + +/** + * Head of DLL for client messages + */ +static struct PendingMessage *plugin_pending_head; + +/** + * Tail of DLL for client messages + */ +static struct PendingMessage *plugin_pending_tail; + +/** + * Handle to the peerinfo service + */ +static struct GNUNET_PEERINFO_Handle *peerinfo_handle; + +/** + * Transmit handle to core service. + */ +static struct GNUNET_CORE_TransmitHandle * core_transmit_handle; + +/** + * Head of DLL for core messages + */ +static struct PendingMessage *core_pending_head; + +/** + * Tail of DLL for core messages + */ +static struct PendingMessage *core_pending_tail; + +/** + * Map of PeerIdentifiers to 'struct GNUNET_dv_neighbor*'s for all + * directly connected peers. + */ +static struct GNUNET_CONTAINER_MultiHashMap *direct_neighbors; + +/** + * Map of PeerIdentifiers to 'struct GNUNET_dv_neighbor*'s for + * peers connected via DV (extended neighborhood). Does ALSO + * include any peers that are in 'direct_neighbors'; for those + * peers, the cost will be zero and the referrer all zeros. + */ +static struct GNUNET_CONTAINER_MultiHashMap *extended_neighbors; + +/** + * We use the min heap (min refers to cost) to prefer + * gossipping about peers with small costs. + */ +static struct GNUNET_CONTAINER_Heap *neighbor_min_heap; + +/** + * We use the max heap (max refers to cost) for general + * iterations over all peers and to remove the most costly + * connection if we have too many. + */ +static struct GNUNET_CONTAINER_Heap *neighbor_max_heap; + +/** + * How far out to keep peers we learn about. + */ +static unsigned long long fisheye_depth; + +/** + * How many peers to store at most. + */ +static unsigned long long max_table_size; + /** * We've been given a target ID based on the random numbers that * we assigned to our DV-neighborhood. Find the entry for the @@ -562,6 +627,28 @@ find_destination (void *cls, return GNUNET_NO; } + +/** + * We've been given a target ID based on the random numbers that + * we assigned to our DV-neighborhood. Find the entry for the + * respective neighbor. + */ +static int +find_specific_id (void *cls, + const GNUNET_HashCode *key, + void *value) +{ + struct FindIDContext *fdc = cls; + struct DistantNeighbor *dn = value; + + if (memcmp(&dn->referrer->identity, fdc->via, sizeof(struct GNUNET_PeerIdentity)) == 0) + { + fdc->tid = dn->referrer_id; + return GNUNET_NO; + } + return GNUNET_YES; +} + /** * Find a distant peer whose referrer_id matches what we're * looking for. For looking up a peer we've gossipped about @@ -765,11 +852,12 @@ size_t core_transmit_notify (void *cls, core_transmit_handle = NULL; off = 0; - while ( (NULL != (reply = core_pending_head)) && - (size >= off + (msize = ntohs (reply->msg->size)))) + reply = core_pending_head; + if ( (reply != NULL) && + (size >= (msize = ntohs (reply->msg->size)))) { #if DEBUG_DV - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "`%s' : transmit_notify (core) called with size %d\n", "dv service", msize); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "`%s' : transmit_notify (core) called with size %d\n", "dv service", msize); #endif GNUNET_CONTAINER_DLL_remove (core_pending_head, core_pending_tail, @@ -801,6 +889,10 @@ size_t core_transmit_notify (void *cls, GNUNET_free (reply); off += msize; } + reply = core_pending_head; + if (reply != NULL) + core_transmit_handle = GNUNET_CORE_notify_transmit_ready(coreAPI, reply->importance, reply->timeout, &reply->recipient, reply->msg_size, &core_transmit_notify, NULL); + return off; } @@ -809,82 +901,130 @@ size_t core_transmit_notify (void *cls, * Send a DV data message via DV. * * @param sender the original sender of the message - * @param specific_neighbor the specific DistantNeighbor to use, complete with referrer! + * @param recipient the next hop recipient, may be our direct peer, maybe not * @param send_context the send context */ static int -send_message_via (const struct GNUNET_PeerIdentity * sender, - const struct DistantNeighbor * specific_neighbor, - struct DV_SendContext *send_context) +send_message_via (const struct GNUNET_PeerIdentity *sender, + const struct GNUNET_PeerIdentity *recipient, + struct DV_SendContext *send_context) { p2p_dv_MESSAGE_Data *toSend; unsigned int msg_size; - unsigned int cost; unsigned int recipient_id; unsigned int sender_id; struct DistantNeighbor *source; struct PendingMessage *pending_message; + struct FindIDContext find_context; #if DEBUG_DV char shortname[5]; #endif msg_size = send_context->message_size + sizeof (p2p_dv_MESSAGE_Data); - if (specific_neighbor == NULL) + find_context.dest = send_context->distant_peer; + find_context.via = recipient; + find_context.tid = 0; + GNUNET_CONTAINER_multihashmap_get_multiple (extended_neighbors, &send_context->distant_peer->hashPubKey, + &find_specific_id, &find_context); + + if (find_context.tid == 0) { + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s: find_specific_id failed to find peer!\n", my_short_id); /* target unknown to us, drop! */ return GNUNET_SYSERR; } - recipient_id = specific_neighbor->referrer_id; + recipient_id = find_context.tid; - source = GNUNET_CONTAINER_multihashmap_get (ctx.extended_neighbors, - &sender->hashPubKey); - if (source == NULL) - { - if (0 != (memcmp (&my_identity, + if (0 == (memcmp (&my_identity, sender, sizeof (struct GNUNET_PeerIdentity)))) - { - /* sender unknown to us, drop! */ - return GNUNET_SYSERR; - } - sender_id = 0; /* 0 == us */ - } + { + sender_id = 0; + source = GNUNET_CONTAINER_multihashmap_get (extended_neighbors, + &sender->hashPubKey); + if (source != NULL) + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s: send_message_via found %s, myself in extended peer list???\n", my_short_id, GNUNET_i2s(&source->identity)); + } else - { - /* find out the number that we use when we gossip about - the sender */ - sender_id = source->our_id; - } - - cost = specific_neighbor->cost; - pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + msg_size); + { + source = GNUNET_CONTAINER_multihashmap_get (extended_neighbors, + &sender->hashPubKey); + if (source == NULL) + { + /* sender unknown to us, drop! */ + return GNUNET_SYSERR; + } + sender_id = source->our_id; + } + + pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + msg_size); pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; pending_message->send_result = send_context->send_result; + memcpy(&pending_message->recipient, recipient, sizeof(struct GNUNET_PeerIdentity)); + pending_message->msg_size = msg_size; + pending_message->importance = send_context->importance; + pending_message->timeout = send_context->timeout; toSend = (p2p_dv_MESSAGE_Data *)pending_message->msg; toSend->header.size = htons (msg_size); toSend->header.type = htons (GNUNET_MESSAGE_TYPE_DV_DATA); toSend->sender = htonl (sender_id); toSend->recipient = htonl (recipient_id); +#if DEBUG_DV_MESSAGES + toSend->uid = send_context->uid; /* Still sent around in network byte order */ +#else + toSend->uid = htonl(0); +#endif + memcpy (&toSend[1], send_context->message, send_context->message_size); #if DEBUG_DV - memcpy(&shortname, GNUNET_i2s(&specific_neighbor->identity), 4); + memcpy(&shortname, GNUNET_i2s(send_context->distant_peer), 4); shortname[4] = '\0'; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Notifying core of send to destination `%s' via `%s' size %u\n", "DV", &shortname, GNUNET_i2s(&specific_neighbor->referrer->identity), msg_size); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Notifying core of send to destination `%s' via `%s' size %u\n", "DV", &shortname, GNUNET_i2s(recipient), msg_size); #endif GNUNET_CONTAINER_DLL_insert_after (core_pending_head, core_pending_tail, core_pending_tail, pending_message); + if (core_transmit_handle == NULL) - core_transmit_handle = GNUNET_CORE_notify_transmit_ready(coreAPI, send_context->importance, send_context->timeout, &specific_neighbor->referrer->identity, msg_size, &core_transmit_notify, NULL); + core_transmit_handle = GNUNET_CORE_notify_transmit_ready(coreAPI, send_context->importance, send_context->timeout, recipient, msg_size, &core_transmit_notify, NULL); else - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "`%s': Failed to schedule pending transmission (must be one in progress!)\n", "dv service"); - - return (int) cost; + { +#if DEBUG_DV + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "`%s': Failed to schedule pending transmission (must be one in progress!)\n", "dv service"); +#endif + } + return GNUNET_YES; } +/** + * Given a FindLeastCostContext, and a set + * of peers that match the target, return the cheapest. + * + * @param cls closure, a struct FindLeastCostContext + * @param key the key identifying the target peer + * @param value the target peer + * + * @return GNUNET_YES to continue iteration, GNUNET_NO to stop + */ +static int +find_least_cost_peer (void *cls, + const GNUNET_HashCode *key, + void *value) +{ + struct FindLeastCostContext *find_context = cls; + struct DistantNeighbor *dn = value; + + if (dn->cost < find_context->least_cost) + { + find_context->target = dn; + } + if (dn->cost == DIRECT_NEIGHBOR_COST) + return GNUNET_NO; + return GNUNET_YES; +} /** * Send a DV data message via DV. @@ -903,7 +1043,9 @@ send_message (const struct GNUNET_PeerIdentity * recipient, const struct DistantNeighbor * specific_neighbor, const struct GNUNET_MessageHeader * message, size_t message_size, - unsigned int importance, struct GNUNET_TIME_Relative timeout) + unsigned int importance, + unsigned int uid, + struct GNUNET_TIME_Relative timeout) { p2p_dv_MESSAGE_Data *toSend; unsigned int msg_size; @@ -913,11 +1055,26 @@ send_message (const struct GNUNET_PeerIdentity * recipient, struct DistantNeighbor *target; struct DistantNeighbor *source; struct PendingMessage *pending_message; - + struct FindLeastCostContext find_least_ctx; +#if DEBUG_DV_PEER_NUMBERS + struct GNUNET_CRYPTO_HashAsciiEncoded encPeerFrom; + struct GNUNET_CRYPTO_HashAsciiEncoded encPeerTo; + struct GNUNET_CRYPTO_HashAsciiEncoded encPeerVia; +#endif msg_size = message_size + sizeof (p2p_dv_MESSAGE_Data); - target = GNUNET_CONTAINER_multihashmap_get (ctx.extended_neighbors, - &recipient->hashPubKey); + find_least_ctx.least_cost = -1; + find_least_ctx.target = NULL; + /* + * Need to find the least cost peer, lest the transport selection keep + * picking the same DV route for the same destination which results + * in messages looping forever. Relatively cheap, we don't iterate + * over all known peers, just those that apply. + */ + GNUNET_CONTAINER_multihashmap_get_multiple (extended_neighbors, + &recipient->hashPubKey, &find_least_cost_peer, &find_least_ctx); + target = find_least_ctx.target; + if (target == NULL) { /* target unknown to us, drop! */ @@ -925,7 +1082,7 @@ send_message (const struct GNUNET_PeerIdentity * recipient, } recipient_id = target->referrer_id; - source = GNUNET_CONTAINER_multihashmap_get (ctx.extended_neighbors, + source = GNUNET_CONTAINER_multihashmap_get (extended_neighbors, &sender->hashPubKey); if (source == NULL) { @@ -944,17 +1101,42 @@ send_message (const struct GNUNET_PeerIdentity * recipient, sender_id = source->our_id; } +#if DEBUG_DV_PEER_NUMBERS + GNUNET_CRYPTO_hash_to_enc (&source->identity.hashPubKey, &encPeerFrom); + GNUNET_CRYPTO_hash_to_enc (&target->referrer->identity.hashPubKey, &encPeerVia); + encPeerFrom.encoding[4] = '\0'; + encPeerVia.encoding[4] = '\0'; +#endif + if ((sender_id != 0) && (0 == memcmp(&source->identity, &target->referrer->identity, sizeof(struct GNUNET_PeerIdentity)))) + { + return 0; + } + cost = target->cost; pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + msg_size); pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; pending_message->send_result = NULL; + pending_message->importance = importance; + pending_message->timeout = timeout; + memcpy(&pending_message->recipient, &target->referrer->identity, sizeof(struct GNUNET_PeerIdentity)); + pending_message->msg_size = msg_size; toSend = (p2p_dv_MESSAGE_Data *)pending_message->msg; toSend->header.size = htons (msg_size); toSend->header.type = htons (GNUNET_MESSAGE_TYPE_DV_DATA); toSend->sender = htonl (sender_id); toSend->recipient = htonl (recipient_id); - memcpy (&toSend[1], message, message_size); +#if DEBUG_DV_MESSAGES + toSend->uid = htonl(uid); +#else + toSend->uid = htonl(0); +#endif +#if DEBUG_DV_PEER_NUMBERS + GNUNET_CRYPTO_hash_to_enc (&target->identity.hashPubKey, &encPeerTo); + encPeerTo.encoding[4] = '\0'; + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Sending DATA message. Sender id %u, source %s, destination %s, via %s\n", GNUNET_i2s(&my_identity), sender_id, &encPeerFrom, &encPeerTo, &encPeerVia); +#endif + memcpy (&toSend[1], message, message_size); GNUNET_CONTAINER_DLL_insert_after (core_pending_head, core_pending_tail, core_pending_tail, @@ -964,10 +1146,79 @@ send_message (const struct GNUNET_PeerIdentity * recipient, #endif if (core_transmit_handle == NULL) core_transmit_handle = GNUNET_CORE_notify_transmit_ready(coreAPI, importance, timeout, &target->referrer->identity, msg_size, &core_transmit_notify, NULL); - + else + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: CORE ALREADY SENDING\n", "DV SEND MESSAGE", msg_size); return (int) cost; } +#if USE_PEER_ID +struct CheckPeerContext +{ + /** + * Peer we found + */ + struct DistantNeighbor *peer; + + /** + * Sender id to search for + */ + unsigned int sender_id; +}; + +/** + * Iterator over hash map entries. + * + * @param cls closure + * @param key current key code + * @param value value in the hash map + * @return GNUNET_YES if we should continue to + * iterate, + * GNUNET_NO if not. + */ +int checkPeerID (void *cls, + const GNUNET_HashCode * key, + void *value) +{ + struct CheckPeerContext *ctx = cls; + struct DistantNeighbor *distant = value; + + if (memcmp(key, &ctx->sender_id, sizeof(unsigned int)) == 0) + { + ctx->peer = distant; + return GNUNET_NO; + } + return GNUNET_YES; + +} +#endif + + +/** + * Handler for messages parsed out by the tokenizer from + * DV DATA received for this peer. + * + * @param cls NULL + * @param client the TokenizedMessageContext which contains message information + * @param message the actual message + */ +void tokenized_message_handler (void *cls, + void *client, + const struct GNUNET_MessageHeader *message) +{ + struct TokenizedMessageContext *ctx = client; + GNUNET_break_op (ntohs (message->type) != GNUNET_MESSAGE_TYPE_DV_GOSSIP); + GNUNET_break_op (ntohs (message->type) != GNUNET_MESSAGE_TYPE_DV_DATA); + if ( (ntohs (message->type) != GNUNET_MESSAGE_TYPE_DV_GOSSIP) && + (ntohs (message->type) != GNUNET_MESSAGE_TYPE_DV_DATA) ) + { +#if DEBUG_DV_MESSAGES + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: Receives %s message for me, uid %u, total size %d cost %u from %s!\n", my_short_id, "DV DATA", ctx->uid, ntohs(message->size), ctx->distant->cost, GNUNET_i2s(&ctx->distant->identity)); +#endif + GNUNET_assert(memcmp(ctx->peer, &ctx->distant->identity, sizeof(struct GNUNET_PeerIdentity)) != 0); + send_to_plugin(ctx->peer, message, ntohs(message->size), &ctx->distant->identity, ctx->distant->cost); + } +} /** * Core handler for dv data messages. Whatever this message @@ -996,27 +1247,37 @@ static int handle_dv_data_message (void *cls, struct GNUNET_PeerIdentity original_sender; struct GNUNET_PeerIdentity destination; struct FindDestinationContext fdc; + struct TokenizedMessageContext tkm_ctx; +#if USE_PEER_ID + struct CheckPeerContext checkPeerCtx; +#endif + char *sender_id; + char *direct_id; int ret; size_t packed_message_size; char *cbuf; +#if NO_MST size_t offset; - +#endif packed_message_size = ntohs(incoming->header.size) - sizeof(p2p_dv_MESSAGE_Data); + #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Receives %s message size %d, packed message size %d!\n", "dv", "DV DATA", ntohs(incoming->header.size), packed_message_size); + "%s: Receives DATA message from %s size %d, packed size %d!\n", my_short_id, GNUNET_i2s(peer) , ntohs(incoming->header.size), packed_message_size); #endif + if (ntohs (incoming->header.size) < sizeof (p2p_dv_MESSAGE_Data) + sizeof (struct GNUNET_MessageHeader)) { + #if DEBUG_DV - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "`%s': Message sizes don't add up, total size %u, expected at least %u!\n", "dv service", ntohs(incoming->header.size), sizeof (p2p_dv_MESSAGE_Data) + sizeof (struct GNUNET_MessageHeader)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "`%s': Message sizes don't add up, total size %u, expected at least %u!\n", "dv service", ntohs(incoming->header.size), sizeof (p2p_dv_MESSAGE_Data) + sizeof (struct GNUNET_MessageHeader)); #endif return GNUNET_SYSERR; } - dn = GNUNET_CONTAINER_multihashmap_get (ctx.direct_neighbors, + dn = GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey); if (dn == NULL) { @@ -1027,15 +1288,47 @@ static int handle_dv_data_message (void *cls, return GNUNET_OK; } sid = ntohl (incoming->sender); +#if USE_PEER_ID + if (sid != 0) + { + checkPeerCtx.sender_id = sid; + checkPeerCtx.peer = NULL; + GNUNET_CONTAINER_multihashmap_iterate(extended_neighbors, &checkPeerID, &checkPeerCtx); + pos = checkPeerCtx.peer; + } + else + { + pos = GNUNET_CONTAINER_multihashmap_get (extended_neighbors, + &peer->hashPubKey); + } +#else pos = dn->referee_head; while ((NULL != pos) && (pos->referrer_id != sid)) pos = pos->next; +#endif if (pos == NULL) { -#if DEBUG_DV_PEER_NUMBERS + direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity)); +#if DEBUG_DV + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: unknown sender (%u), Message from %s!\n", GNUNET_i2s(&my_identity), ntohl(incoming->sender), direct_id); +#endif + GNUNET_free(direct_id); + pos = dn->referee_head; + while ((NULL != pos) && (pos->referrer_id != sid)) + { + sender_id = strdup(GNUNET_i2s(&pos->identity)); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "I know sender %u %s\n", pos->referrer_id, sender_id); + GNUNET_free(sender_id); + pos = pos->next; + } + +#if DEBUG_MESSAGE_DROP + direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s peer %s: unknown sender (%d)!\n", "DV SERVICE", GNUNET_i2s(&my_identity), ntohl(incoming->sender), GNUNET_CONTAINER_multihashmap_size (ctx.extended_neighbors)); + "%s: DROPPING MESSAGE type %d, unknown sender! Message immediately from %s!\n", GNUNET_i2s(&my_identity), ntohs(((struct GNUNET_MessageHeader *)&incoming[1])->type), direct_id); + GNUNET_free(direct_id); #endif /* unknown sender */ return GNUNET_OK; @@ -1046,24 +1339,41 @@ static int handle_dv_data_message (void *cls, { /* 0 == us */ cbuf = (char *)&incoming[1]; + + tkm_ctx.peer = peer; + tkm_ctx.distant = pos; + tkm_ctx.uid = ntohl(incoming->uid); + if (GNUNET_OK != GNUNET_SERVER_mst_receive (coreMST, + &tkm_ctx, + cbuf, + packed_message_size, + GNUNET_NO, + GNUNET_NO)) + { + GNUNET_break_op(0); + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s: %s Received corrupt data, discarding!", my_short_id, "DV SERVICE"); + } +#if NO_MST offset = 0; while(offset < packed_message_size) { packed_message = (struct GNUNET_MessageHeader *)&cbuf[offset]; -#if DEBUG_DV - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Receives %s message for me, size %d type %d, cost %u!\n", "dv", "DV DATA", ntohs(packed_message->size), ntohs(packed_message->type), pos->cost); -#endif + GNUNET_break_op (ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_GOSSIP); GNUNET_break_op (ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_DATA); if ( (ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_GOSSIP) && (ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_DATA) ) { +#if DEBUG_DV_MESSAGES + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: Receives %s message(s) for me, uid %u, total size %d cost %u from %s!\n", my_short_id, "DV DATA", ntohl(incoming->uid), ntohs(packed_message->size), pos->cost, GNUNET_i2s(&pos->identity)); +#endif + GNUNET_assert(memcmp(peer, &pos->identity, sizeof(struct GNUNET_PeerIdentity)) != 0); send_to_plugin(peer, packed_message, ntohs(packed_message->size), &pos->identity, pos->cost); } offset += ntohs(packed_message->size); } - +#endif return GNUNET_OK; } else @@ -1077,7 +1387,7 @@ static int handle_dv_data_message (void *cls, issue) */ fdc.tid = tid; fdc.dest = NULL; - GNUNET_CONTAINER_heap_iterate (ctx.neighbor_max_heap, + GNUNET_CONTAINER_heap_iterate (neighbor_max_heap, &find_destination, &fdc); #if DEBUG_DV @@ -1087,16 +1397,26 @@ static int handle_dv_data_message (void *cls, if (fdc.dest == NULL) { - return GNUNET_OK; +#if DEBUG_DV_MESSAGES + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: Receives %s message uid %u for someone we don't know (id %u)!\n", my_short_id, "DV DATA", ntohl(incoming->uid), tid); +#endif + return GNUNET_OK; } destination = fdc.dest->identity; if (0 == memcmp (&destination, peer, sizeof (struct GNUNET_PeerIdentity))) { /* FIXME: create stat: routing loop-discard! */ -#if DEBUG_DV +#if DEBUG_DV_PEER_NUMBERS GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "\n\n\nLoopy loo message\n\n\n"); #endif + +#if DEBUG_DV_MESSAGES + direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: DROPPING MESSAGE uid %u type %d, routing loop! Message immediately from %s!\n", my_short_id, ntohl(incoming->uid), ntohs(packed_message->type), direct_id); +#endif return GNUNET_OK; } @@ -1109,18 +1429,61 @@ static int handle_dv_data_message (void *cls, /*ret = send_message (&destination, &original_sender, packed_message, DV_PRIORITY, DV_DELAY);*/ -#if DEBUG_DV + +#if DEBUG_DV_MESSAGES GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Sends message size %d on!\n", "dv", packed_message_size); + "%s: FORWARD %s message for %s, uid %u, size %d type %d, cost %u!\n", my_short_id, "DV DATA", GNUNET_i2s(&destination), ntohl(incoming->uid), ntohs(packed_message->size), ntohs(packed_message->type), pos->cost); #endif - ret = send_message(&destination, &original_sender, NULL, packed_message, packed_message_size, default_dv_priority, GNUNET_TIME_relative_get_forever()); + + ret = send_message(&destination, + &original_sender, + NULL, + packed_message, + packed_message_size, + default_dv_priority, + ntohl(incoming->uid), + GNUNET_TIME_relative_get_forever()); if (ret != GNUNET_SYSERR) return GNUNET_OK; else - return GNUNET_SYSERR; + { +#if DEBUG_MESSAGE_DROP + direct_id = GNUNET_strdup(GNUNET_i2s(&dn->identity)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: DROPPING MESSAGE type %d, forwarding failed! Message immediately from %s!\n", GNUNET_i2s(&my_identity), ntohs(((struct GNUNET_MessageHeader *)&incoming[1])->type), direct_id); +#endif + return GNUNET_SYSERR; + } } +#if DEBUG_DV +/** + * Iterator over hash map entries. + * + * @param cls closure (NULL) + * @param key current key code + * @param value value in the hash map (DistantNeighbor) + * @return GNUNET_YES if we should continue to + * iterate, + * GNUNET_NO if not. + */ +int print_neighbors (void *cls, + const GNUNET_HashCode * key, + void *value) +{ + struct DistantNeighbor *distant_neighbor = value; + char my_shortname[5]; + char referrer_shortname[5]; + memcpy(&my_shortname, GNUNET_i2s(&my_identity), 4); + my_shortname[4] = '\0'; + memcpy(&referrer_shortname, GNUNET_i2s(&distant_neighbor->referrer->identity), 4); + referrer_shortname[4] = '\0'; + + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "`%s' %s: Peer `%s', distance %d, referrer `%s' pkey: %s\n", &my_shortname, "DV", GNUNET_i2s(&distant_neighbor->identity), distant_neighbor->cost, &referrer_shortname, distant_neighbor->pkey == NULL ? "no" : "yes"); + return GNUNET_YES; +} +#endif /** * Scheduled task which gossips about known direct peers to other connected @@ -1149,14 +1512,13 @@ neighbor_send_task (void *cls, "%s: Called with reason shutdown, shutting down!\n", GNUNET_i2s(&my_identity)); #endif - send_context->task = GNUNET_SCHEDULER_NO_TASK; return; } if (send_context->fast_gossip_list_head != NULL) { about_list = send_context->fast_gossip_list_head; - about = send_context->fast_gossip_list_head->about; + about = about_list->about; GNUNET_CONTAINER_DLL_remove(send_context->fast_gossip_list_head, send_context->fast_gossip_list_tail, about_list); @@ -1173,8 +1535,10 @@ neighbor_send_task (void *cls, * once to get a list of peers to gossip about and gossip them over time... But then if one goes away * in the mean time that becomes nasty. For now we'll just assume that the walking is done * asynchronously enough to avoid major problems (-; + * + * NOTE: probably fixed once we decided send rate based on allowed bandwidth. */ - about = GNUNET_CONTAINER_heap_walk_get_next (ctx.neighbor_min_heap); + about = GNUNET_CONTAINER_heap_walk_get_next (neighbor_min_heap); } to = send_context->toNeighbor; @@ -1199,6 +1563,10 @@ neighbor_send_task (void *cls, #endif pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + sizeof(p2p_dv_MESSAGE_NeighborInfo)); pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; + pending_message->importance = default_dv_priority; + pending_message->timeout = GNUNET_TIME_relative_get_forever(); + memcpy(&pending_message->recipient, &to->identity, sizeof(struct GNUNET_PeerIdentity)); + pending_message->msg_size = sizeof(p2p_dv_MESSAGE_NeighborInfo); message = (p2p_dv_MESSAGE_NeighborInfo *)pending_message->msg; message->header.size = htons (sizeof (p2p_dv_MESSAGE_NeighborInfo)); message->header.type = htons (GNUNET_MESSAGE_TYPE_DV_GOSSIP); @@ -1221,15 +1589,15 @@ neighbor_send_task (void *cls, if (send_context->fast_gossip_list_head != NULL) /* If there are other peers in the fast list, schedule right away */ { -#if DEBUG_DV - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DV SERVICE: still in fast send mode\n"); +#if DEBUG_DV_PEER_NUMBERS + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "DV SERVICE: still in fast send mode\n"); #endif send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, send_context); } else { -#if DEBUG_DV - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DV SERVICE: entering slow send mode\n"); +#if DEBUG_DV_PEER_NUMBERS + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "DV SERVICE: entering slow send mode\n"); #endif send_context->task = GNUNET_SCHEDULER_add_delayed(sched, GNUNET_DV_DEFAULT_SEND_INTERVAL, &neighbor_send_task, send_context); } @@ -1263,7 +1631,7 @@ handle_start (void *cls, GNUNET_SERVER_receive_done (client, GNUNET_OK); } - +#if UNSIMPLER /** * Iterate over hash map entries for a distant neighbor, * if direct neighbor matches context call send message @@ -1289,6 +1657,7 @@ int send_iterator (void *cls, } return GNUNET_YES; } +#endif /** * Service server's handler for message send requests (which come @@ -1314,6 +1683,10 @@ void handle_dv_send_message (void *cls, int offset; static struct GNUNET_CRYPTO_HashAsciiEncoded dest_hash; struct DV_SendContext *send_context; +#if DEBUG_DV_MESSAGES + char *cbuf; + struct GNUNET_MessageHeader *packed_message; +#endif if (client_handle == NULL) { @@ -1325,8 +1698,10 @@ void handle_dv_send_message (void *cls, { client_handle = client; /* What should we do in this case, assert fail or just log the warning? */ - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, +#if DEBUG_DV + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Setting client handle (was a different client!)!\n", "dv"); +#endif } GNUNET_assert(ntohs(message->size) > sizeof(struct GNUNET_DV_SendMessage)); @@ -1334,9 +1709,7 @@ void handle_dv_send_message (void *cls, address_len = ntohl(send_msg->addrlen); GNUNET_assert(address_len == sizeof(struct GNUNET_PeerIdentity) * 2); - message_size = ntohl(send_msg->msgbuf_size); - - GNUNET_assert(ntohs(message->size) == sizeof(struct GNUNET_DV_SendMessage) + address_len + message_size); + message_size = ntohs(message->size) - sizeof(struct GNUNET_DV_SendMessage) - address_len; destination = GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity)); direct = GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity)); message_buf = GNUNET_malloc(message_size); @@ -1359,11 +1732,19 @@ void handle_dv_send_message (void *cls, GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s: asked to send message to `%s', but address is for `%s'!", "DV SERVICE", GNUNET_i2s(&send_msg->target), (const char *)&dest_hash.encoding); } -#if DEBUG_DV +#if DEBUG_DV_MESSAGES + cbuf = (char *)message_buf; + offset = 0; + while(offset < message_size) + { + packed_message = (struct GNUNET_MessageHeader *)&cbuf[offset]; + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: DV PLUGIN SEND uid %u type %d to %s\n", my_short_id, ntohl(send_msg->uid), ntohs(packed_message->type), GNUNET_i2s(destination)); + offset += ntohs(packed_message->size); + } + /*GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: DV PLUGIN SEND uid %u type %d to %s\n", my_short_id, ntohl(send_msg->uid), ntohs(message_buf->type), GNUNET_i2s(destination));*/ +#endif GNUNET_CRYPTO_hash_to_enc (&destination->hashPubKey, &dest_hash); /* GNUNET_i2s won't properly work, need to hash one ourselves */ dest_hash.encoding[4] = '\0'; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DV SEND called with message of size %d type %d, destination `%s' via `%s'\n", message_size, ntohs(message_buf->type), (const char *)&dest_hash.encoding, GNUNET_i2s(direct)); -#endif send_context = GNUNET_malloc(sizeof(struct DV_SendContext)); send_result_msg = GNUNET_malloc(sizeof(struct GNUNET_DV_SendResultMessage)); @@ -1378,9 +1759,11 @@ void handle_dv_send_message (void *cls, send_context->message = message_buf; send_context->message_size = message_size; send_context->send_result = send_result_msg; +#if DEBUG_DV_MESSAGES + send_context->uid = send_msg->uid; +#endif - /* In bizarro world GNUNET_SYSERR indicates that we succeeded */ - if (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_get_multiple(ctx.extended_neighbors, &destination->hashPubKey, &send_iterator, send_context)) + if (send_message_via(&my_identity, direct, send_context) != GNUNET_YES) { send_result_msg->result = htons(1); pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + sizeof(struct GNUNET_DV_SendResultMessage)); @@ -1404,13 +1787,42 @@ void handle_dv_send_message (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to queue message for plugin, must be one in progress already!!\n"); } } - GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "DV SEND failed to send message to destination `%s' via `%s'\n", (const char *)&dest_hash.encoding, GNUNET_i2s(direct)); + GNUNET_CRYPTO_hash_to_enc (&destination->hashPubKey, &dest_hash); /* GNUNET_i2s won't properly work, need to hash one ourselves */ + dest_hash.encoding[4] = '\0'; + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s DV SEND failed to send message to destination `%s' via `%s'\n", my_short_id, (const char *)&dest_hash.encoding, GNUNET_i2s(direct)); } - else + + /* In bizarro world GNUNET_SYSERR indicates that we succeeded */ +#if UNSIMPLER + if (GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_get_multiple(extended_neighbors, &destination->hashPubKey, &send_iterator, send_context)) { + send_result_msg->result = htons(1); + pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + sizeof(struct GNUNET_DV_SendResultMessage)); + pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; + memcpy(&pending_message[1], send_result_msg, sizeof(struct GNUNET_DV_SendResultMessage)); + GNUNET_free(send_result_msg); - } + GNUNET_CONTAINER_DLL_insert_after(plugin_pending_head, plugin_pending_tail, plugin_pending_tail, pending_message); + if (client_handle != NULL) + { + if (plugin_transmit_handle == NULL) + { + plugin_transmit_handle = GNUNET_SERVER_notify_transmit_ready (client_handle, + sizeof(struct GNUNET_DV_SendResultMessage), + GNUNET_TIME_UNIT_FOREVER_REL, + &transmit_to_plugin, NULL); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to queue message for plugin, must be one in progress already!!\n"); + } + } + GNUNET_CRYPTO_hash_to_enc (&destination->hashPubKey, &dest_hash); /* GNUNET_i2s won't properly work, need to hash one ourselves */ + dest_hash.encoding[4] = '\0'; + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s DV SEND failed to send message to destination `%s' via `%s'\n", my_short_id, (const char *)&dest_hash.encoding, GNUNET_i2s(direct)); + } +#endif GNUNET_free(message_buf); GNUNET_free(send_context); GNUNET_free(direct); @@ -1472,11 +1884,11 @@ distant_neighbor_free (struct DistantNeighbor *referee) GNUNET_CONTAINER_DLL_remove (referrer->referee_head, referrer->referee_tail, referee); } - GNUNET_CONTAINER_heap_remove_node (ctx.neighbor_max_heap, referee->max_loc); - GNUNET_CONTAINER_heap_remove_node (ctx.neighbor_min_heap, referee->min_loc); - GNUNET_CONTAINER_multihashmap_remove_all (ctx.extended_neighbors, + GNUNET_CONTAINER_heap_remove_node (neighbor_max_heap, referee->max_loc); + GNUNET_CONTAINER_heap_remove_node (neighbor_min_heap, referee->min_loc); + GNUNET_CONTAINER_multihashmap_remove_all (extended_neighbors, &referee->identity.hashPubKey); - GNUNET_free (referee->pkey); + GNUNET_free_non_null (referee->pkey); GNUNET_free (referee); } @@ -1533,6 +1945,10 @@ static int schedule_disconnect_messages (void *cls, pending_message = GNUNET_malloc(sizeof(struct PendingMessage) + sizeof(p2p_dv_MESSAGE_Disconnect)); pending_message->msg = (struct GNUNET_MessageHeader *)&pending_message[1]; + pending_message->importance = default_dv_priority; + pending_message->timeout = GNUNET_TIME_relative_get_forever(); + memcpy(&pending_message->recipient, ¬ify->identity, sizeof(struct GNUNET_PeerIdentity)); + pending_message->msg_size = sizeof(p2p_dv_MESSAGE_Disconnect); disconnect_message = (p2p_dv_MESSAGE_Disconnect *)pending_message->msg; disconnect_message->header.size = htons (sizeof (p2p_dv_MESSAGE_Disconnect)); disconnect_message->header.type = htons (GNUNET_MESSAGE_TYPE_DV_DISCONNECT); @@ -1585,6 +2001,7 @@ static int free_direct_neighbors (void *cls, return GNUNET_YES; } + /** * Task run during shutdown. * @@ -1597,17 +2014,20 @@ shutdown_task (void *cls, { #if DEBUG_DV GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "calling CORE_DISCONNECT\n"); + GNUNET_CONTAINER_multihashmap_iterate(extended_neighbors, &print_neighbors, NULL); #endif - GNUNET_CONTAINER_multihashmap_iterate(ctx.extended_neighbors, &free_extended_neighbors, NULL); - GNUNET_CONTAINER_multihashmap_destroy(ctx.extended_neighbors); - GNUNET_CONTAINER_multihashmap_iterate(ctx.direct_neighbors, &free_direct_neighbors, NULL); - GNUNET_CONTAINER_multihashmap_destroy(ctx.direct_neighbors); + GNUNET_CONTAINER_multihashmap_iterate(extended_neighbors, &free_extended_neighbors, NULL); + GNUNET_CONTAINER_multihashmap_destroy(extended_neighbors); + GNUNET_CONTAINER_multihashmap_iterate(direct_neighbors, &free_direct_neighbors, NULL); + GNUNET_CONTAINER_multihashmap_destroy(direct_neighbors); - GNUNET_CONTAINER_heap_destroy(ctx.neighbor_max_heap); - GNUNET_CONTAINER_heap_destroy(ctx.neighbor_min_heap); + GNUNET_CONTAINER_heap_destroy(neighbor_max_heap); + GNUNET_CONTAINER_heap_destroy(neighbor_min_heap); GNUNET_CORE_disconnect (coreAPI); GNUNET_PEERINFO_disconnect(peerinfo_handle); + GNUNET_SERVER_mst_destroy(coreMST); + GNUNET_free_non_null(my_short_id); #if DEBUG_DV GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "CORE_DISCONNECT completed\n"); #endif @@ -1633,9 +2053,12 @@ void core_init (void *cls, "%s: Core connection initialized, I am peer: %s\n", "dv", GNUNET_i2s(identity)); #endif memcpy(&my_identity, identity, sizeof(struct GNUNET_PeerIdentity)); + my_short_id = GNUNET_strdup(GNUNET_i2s(&my_identity)); coreAPI = server; } + +#if PKEY_NO_NEIGHBOR_ON_ADD /** * Iterator over hash map entries. * @@ -1661,6 +2084,7 @@ static int add_pkey_to_extended (void *cls, return GNUNET_YES; } +#endif /** * Iterator over hash map entries. @@ -1682,12 +2106,13 @@ static int update_matching_neighbors (void *cls, if (update_info->referrer == distant_neighbor->referrer) /* Direct neighbor matches, update it's info and return GNUNET_NO */ { /* same referrer, cost change! */ - GNUNET_CONTAINER_heap_update_cost (ctx.neighbor_max_heap, + GNUNET_CONTAINER_heap_update_cost (neighbor_max_heap, update_info->neighbor->max_loc, update_info->cost); - GNUNET_CONTAINER_heap_update_cost (ctx.neighbor_min_heap, + GNUNET_CONTAINER_heap_update_cost (neighbor_min_heap, update_info->neighbor->min_loc, update_info->cost); update_info->neighbor->last_activity = update_info->now; update_info->neighbor->cost = update_info->cost; + update_info->neighbor->referrer_id = update_info->referrer_peer_id; return GNUNET_NO; } @@ -1695,34 +2120,119 @@ static int update_matching_neighbors (void *cls, } -#if DEBUG_DV_GOSSIP /** - * Iterator over hash map entries. + * Iterate over all current direct peers, add DISTANT newly connected + * peer to the fast gossip list for that peer so we get DV routing + * information out as fast as possible! * - * @param cls closure (NULL) - * @param key current key code - * @param value value in the hash map (DistantNeighbor) - * @return GNUNET_YES if we should continue to - * iterate, - * GNUNET_NO if not. + * @param cls the newly connected neighbor we will gossip about + * @param key the hashcode of the peer + * @param value the direct neighbor we should gossip to + * + * @return GNUNET_YES to continue iteration, GNUNET_NO otherwise */ -int print_neighbors (void *cls, - const GNUNET_HashCode * key, - void *value) +static int add_distant_all_direct_neighbors (void *cls, + const GNUNET_HashCode * key, + void *value) { - struct DistantNeighbor *distant_neighbor = value; - char my_shortname[5]; - char referrer_shortname[5]; - memcpy(&my_shortname, GNUNET_i2s(&my_identity), 4); - my_shortname[4] = '\0'; - memcpy(&referrer_shortname, GNUNET_i2s(&distant_neighbor->referrer->identity), 4); - referrer_shortname[4] = '\0'; + struct DirectNeighbor *direct = (struct DirectNeighbor *)value; + struct DistantNeighbor *distant = (struct DistantNeighbor *)cls; + struct NeighborSendContext *send_context = direct->send_context; + struct FastGossipNeighborList *gossip_entry; +#if DEBUG_DV + char *encPeerAbout; + char *encPeerTo; +#endif + + if (distant == NULL) + { + return GNUNET_YES; + } + + if (memcmp(&direct->identity, &distant->identity, sizeof(struct GNUNET_PeerIdentity)) == 0) + { + return GNUNET_YES; /* Don't gossip to a peer about itself! */ + } + +#if SUPPORT_HIDING + if (distant->hidden == GNUNET_YES) + return GNUNET_YES; /* This peer should not be gossipped about (hidden) */ +#endif + gossip_entry = GNUNET_malloc(sizeof(struct FastGossipNeighborList)); + gossip_entry->about = distant; + + GNUNET_CONTAINER_DLL_insert_after(send_context->fast_gossip_list_head, + send_context->fast_gossip_list_tail, + send_context->fast_gossip_list_tail, + gossip_entry); +#if DEBUG_DV + encPeerAbout = GNUNET_strdup(GNUNET_i2s(&distant->identity)); + encPeerTo = GNUNET_strdup(GNUNET_i2s(&direct->identity)); + + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Fast send info about peer %s id %u for directly connected peer %s\n", + GNUNET_i2s(&my_identity), + encPeerAbout, distant->our_id, encPeerTo); + GNUNET_free(encPeerAbout); + GNUNET_free(encPeerTo); +#endif + /*if (send_context->task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel(sched, send_context->task);*/ - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "`%s' %s: Peer `%s', distance %d, referrer `%s'\n", &my_shortname, "DV", GNUNET_i2s(&distant_neighbor->identity), distant_neighbor->cost, &referrer_shortname); + send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, send_context); return GNUNET_YES; } -#endif +/** + * Callback for hello address creation. + * + * @param cls closure, a struct HelloContext + * @param max maximum number of bytes that can be written to buf + * @param buf where to write the address information + * + * @return number of bytes written, 0 to signal the + * end of the iteration. + */ +static size_t +generate_hello_address (void *cls, size_t max, void *buf) +{ + struct HelloContext *hello_context = cls; + char *addr_buffer; + size_t offset; + size_t size; + size_t ret; + char *addr1; + char *addr2; + + if (hello_context->addresses_to_add == 0) + return 0; + + /* Hello "address" will be concatenation of distant peer and direct peer identities */ + size = 2 * sizeof(struct GNUNET_PeerIdentity); + GNUNET_assert(max >= size); + + addr_buffer = GNUNET_malloc(size); + offset = 0; + /* Copy the distant peer identity to buffer */ + memcpy(addr_buffer, &hello_context->distant_peer, sizeof(struct GNUNET_PeerIdentity)); + offset += sizeof(struct GNUNET_PeerIdentity); + /* Copy the direct peer identity to buffer */ + memcpy(&addr_buffer[offset], hello_context->direct_peer, sizeof(struct GNUNET_PeerIdentity)); + addr1 = GNUNET_strdup(GNUNET_i2s(hello_context->direct_peer)); + addr2 = GNUNET_strdup(GNUNET_i2s(&hello_context->distant_peer)); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: GIVING HELLO for %s via %s to TRANSPORT\n", my_short_id, addr2, addr1); + GNUNET_free(addr1); + GNUNET_free(addr2); + ret = GNUNET_HELLO_add_address ("dv", + GNUNET_TIME_relative_to_absolute + (GNUNET_TIME_UNIT_HOURS), addr_buffer, size, + buf, max); + + hello_context->addresses_to_add--; + + GNUNET_free(addr_buffer); + return ret; +} + /** * Handles when a peer is either added due to being newly connected @@ -1734,8 +2244,11 @@ int print_neighbors (void *cls, * @param referrer_peer_id id to use when sending to 'peer' * @param referrer if this is a gossiped peer, who did we hear it from? * @param cost the cost of communicating with this peer via 'referrer' + * + * @return the added neighbor, the updated neighbor or NULL (neighbor + * not added) */ -static void +static struct DistantNeighbor * addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey, unsigned int referrer_peer_id, struct DirectNeighbor *referrer, unsigned int cost) @@ -1744,53 +2257,87 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO struct DistantNeighbor *max; struct GNUNET_TIME_Absolute now; struct NeighborUpdateInfo *neighbor_update; + struct HelloContext *hello_context; + struct GNUNET_HELLO_Message *hello_msg; unsigned int our_id; #if DEBUG_DV_PEER_NUMBERS + char *encAbout; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s Received sender id (%u)!\n", "DV SERVICE", referrer_peer_id); #endif now = GNUNET_TIME_absolute_get (); - neighbor = GNUNET_CONTAINER_multihashmap_get (ctx.extended_neighbors, + neighbor = GNUNET_CONTAINER_multihashmap_get (extended_neighbors, &peer->hashPubKey); neighbor_update = GNUNET_malloc(sizeof(struct NeighborUpdateInfo)); neighbor_update->neighbor = neighbor; neighbor_update->cost = cost; neighbor_update->now = now; neighbor_update->referrer = referrer; + neighbor_update->referrer_peer_id = referrer_peer_id; - - our_id = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, RAND_MAX - 1) + 1; -#if DEBUG_DV_PEER_NUMBERS - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s Chose NEW id (%u)!\n", "DV SERVICE", our_id); + if (neighbor != NULL) + { +#if USE_PEER_ID + memcpy(&our_id, &neighbor->identity, sizeof(unsigned int)); +#else + our_id = neighbor->our_id; +#endif + } + else + { +#if USE_PEER_ID + memcpy(&our_id, peer, sizeof(unsigned int)); +#else + our_id = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, RAND_MAX - 1) + 1; #endif + } /* Either we do not know this peer, or we already do but via a different immediate peer */ if ((neighbor == NULL) || - (GNUNET_CONTAINER_multihashmap_get_multiple(ctx.extended_neighbors, + (GNUNET_CONTAINER_multihashmap_get_multiple(extended_neighbors, &peer->hashPubKey, &update_matching_neighbors, neighbor_update) != GNUNET_SYSERR)) { + +#if AT_MOST_ONE + if ((neighbor != NULL) && (cost < neighbor->cost)) /* New cost is less than old, remove old */ + { + distant_neighbor_free(neighbor); + } + else if (neighbor != NULL) /* Only allow one DV connection to each peer */ + { + return NULL; + } +#endif /* new neighbor! */ - if (cost > ctx.fisheye_depth) + if (cost > fisheye_depth) { /* too costly */ GNUNET_free(neighbor_update); - return; + return NULL; } - if (ctx.max_table_size <= - GNUNET_CONTAINER_multihashmap_size (ctx.extended_neighbors)) + +#if DEBUG_DV_PEER_NUMBERS + encAbout = GNUNET_strdup(GNUNET_i2s(peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: %s Chose NEW id (%u) for peer %s!\n", GNUNET_i2s(&my_identity), "DV SERVICE", our_id, encAbout); + GNUNET_free(encAbout); +#endif + + if (max_table_size <= + GNUNET_CONTAINER_multihashmap_size (extended_neighbors)) { /* remove most expensive entry */ - max = GNUNET_CONTAINER_heap_peek (ctx.neighbor_max_heap); + max = GNUNET_CONTAINER_heap_peek (neighbor_max_heap); + GNUNET_assert(max != NULL); if (cost > max->cost) { /* new entry most expensive, don't create */ GNUNET_free(neighbor_update); - return; + return NULL; } if (max->cost > 1) { @@ -1804,9 +2351,9 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO neighbor = GNUNET_malloc (sizeof (struct DistantNeighbor)); GNUNET_CONTAINER_DLL_insert (referrer->referee_head, referrer->referee_tail, neighbor); - neighbor->max_loc = GNUNET_CONTAINER_heap_insert (ctx.neighbor_max_heap, + neighbor->max_loc = GNUNET_CONTAINER_heap_insert (neighbor_max_heap, neighbor, cost); - neighbor->min_loc = GNUNET_CONTAINER_heap_insert (ctx.neighbor_min_heap, + neighbor->min_loc = GNUNET_CONTAINER_heap_insert (neighbor_min_heap, neighbor, cost); neighbor->referrer = referrer; memcpy (&neighbor->identity, peer, sizeof (struct GNUNET_PeerIdentity)); @@ -1826,9 +2373,24 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO (cost == DIRECT_NEIGHBOR_COST) ? (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 4) == 0) : GNUNET_NO; - GNUNET_CONTAINER_multihashmap_put (ctx.extended_neighbors, &peer->hashPubKey, + GNUNET_CONTAINER_multihashmap_put (extended_neighbors, &peer->hashPubKey, neighbor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + + if (cost != DIRECT_NEIGHBOR_COST) + { + /* Added neighbor, now send HELLO to transport */ + hello_context = GNUNET_malloc(sizeof(struct HelloContext)); + hello_context->direct_peer = &referrer->identity; + memcpy(&hello_context->distant_peer, peer, sizeof(struct GNUNET_PeerIdentity)); + hello_context->addresses_to_add = 1; + hello_msg = GNUNET_HELLO_create(pkey, &generate_hello_address, hello_context); + GNUNET_assert(memcmp(hello_context->direct_peer, &hello_context->distant_peer, sizeof(struct GNUNET_PeerIdentity)) != 0); + send_to_plugin(hello_context->direct_peer, GNUNET_HELLO_get_header(hello_msg), GNUNET_HELLO_size(hello_msg), &hello_context->distant_peer, cost); + GNUNET_free(hello_context); + GNUNET_free(hello_msg); + } + } else { @@ -1839,45 +2401,11 @@ addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct GNUNET_CRYPTO } #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Size of extended_neighbors is %d\n", "dv", GNUNET_CONTAINER_multihashmap_size(ctx.extended_neighbors)); + "%s: Size of extended_neighbors is %d\n", "dv", GNUNET_CONTAINER_multihashmap_size(extended_neighbors)); #endif - GNUNET_free(neighbor_update); - -} - - -static size_t -generate_hello_address (void *cls, size_t max, void *buf) -{ - struct HelloContext *hello_context = cls; - char *addr_buffer; - size_t offset; - size_t size; - size_t ret; - - if (hello_context->addresses_to_add == 0) - return 0; - - /* Hello "address" will be concatenation of distant peer and direct peer identities */ - size = 2 * sizeof(struct GNUNET_PeerIdentity); - GNUNET_assert(max >= size); - - addr_buffer = GNUNET_malloc(size); - offset = 0; - /* Copy the distant peer identity to buffer */ - memcpy(addr_buffer, &hello_context->distant_peer, sizeof(struct GNUNET_PeerIdentity)); - offset += sizeof(struct GNUNET_PeerIdentity); - /* Copy the direct peer identity to buffer */ - memcpy(&addr_buffer[offset], hello_context->direct_peer, sizeof(struct GNUNET_PeerIdentity)); - ret = GNUNET_HELLO_add_address ("dv", - GNUNET_TIME_relative_to_absolute - (GNUNET_TIME_UNIT_HOURS), addr_buffer, size, - buf, max); - - hello_context->addresses_to_add--; - GNUNET_free(addr_buffer); - return ret; + GNUNET_free(neighbor_update); + return neighbor; } @@ -1909,7 +2437,7 @@ static int handle_dv_disconnect_message (void *cls, return GNUNET_SYSERR; /* invalid message */ } - referrer = GNUNET_CONTAINER_multihashmap_get (ctx.direct_neighbors, + referrer = GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey); if (referrer == NULL) return GNUNET_OK; @@ -1921,6 +2449,7 @@ static int handle_dv_disconnect_message (void *cls, { distant_neighbor_free(distant); } + distant = referrer->referee_head; } return GNUNET_OK; @@ -1946,8 +2475,6 @@ static int handle_dv_gossip_message (void *cls, struct GNUNET_TIME_Relative latency, uint32_t distance) { - struct HelloContext *hello_context; - struct GNUNET_HELLO_Message *hello_msg; struct DirectNeighbor *referrer; p2p_dv_MESSAGE_NeighborInfo *enc_message = (p2p_dv_MESSAGE_NeighborInfo *)message; @@ -1963,12 +2490,12 @@ static int handle_dv_gossip_message (void *cls, encPeerAbout = GNUNET_strdup(GNUNET_i2s(&enc_message->neighbor)); encPeerFrom = GNUNET_strdup(GNUNET_i2s(peer)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Receives %s message from peer %s about peer %s id %u distance %d!\n", "dv", "DV GOSSIP", encPeerFrom, encPeerAbout, ntohl(enc_message->neighbor_id), ntohl (enc_message->cost) + 1); + "%s: Received %s message from peer %s about peer %s id %u distance %d!\n", GNUNET_i2s(&my_identity), "DV GOSSIP", encPeerFrom, encPeerAbout, ntohl(enc_message->neighbor_id), ntohl (enc_message->cost) + 1); GNUNET_free(encPeerAbout); GNUNET_free(encPeerFrom); #endif - referrer = GNUNET_CONTAINER_multihashmap_get (ctx.direct_neighbors, + referrer = GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey); if (referrer == NULL) return GNUNET_OK; @@ -1977,15 +2504,6 @@ static int handle_dv_gossip_message (void *cls, ntohl (enc_message->neighbor_id), referrer, ntohl (enc_message->cost) + 1); - hello_context = GNUNET_malloc(sizeof(struct HelloContext)); - hello_context->direct_peer = peer; - memcpy(&hello_context->distant_peer, &enc_message->neighbor, sizeof(struct GNUNET_PeerIdentity)); - hello_context->addresses_to_add = 1; - hello_msg = GNUNET_HELLO_create(&enc_message->pkey, &generate_hello_address, hello_context); - - send_to_plugin(hello_context->direct_peer, GNUNET_HELLO_get_header(hello_msg), GNUNET_HELLO_size(hello_msg), &hello_context->distant_peer, ntohl(enc_message->cost) + 1); - GNUNET_free(hello_context); - GNUNET_free(hello_msg); return GNUNET_OK; } @@ -2027,56 +2545,51 @@ static int add_all_extended_peers (void *cls, return GNUNET_YES; } - +#if INSANE_GOSSIP /** - * Iterate over all current direct peers, add DISTANT newly connected - * peer to the fast gossip list for that peer so we get DV routing - * information out as fast as possible! - * - * @param cls the newly connected neighbor we will gossip about - * @param key the hashcode of the peer - * @param value the direct neighbor we should gossip to + * Iterator over hash map entries. * - * @return GNUNET_YES to continue iteration, GNUNET_NO otherwise + * @param cls closure + * @param key current key code + * @param value value in the hash map + * @return GNUNET_YES if we should continue to + * iterate, + * GNUNET_NO if not. */ -static int add_distant_all_direct_neighbors (void *cls, - const GNUNET_HashCode * key, - void *value) +static int gossip_all_to_all_iterator (void *cls, + const GNUNET_HashCode * key, + void *value) { - struct DirectNeighbor *direct = (struct DirectNeighbor *)value; - struct DistantNeighbor *distant = (struct DistantNeighbor *)cls; - struct NeighborSendContext *send_context = direct->send_context; - struct FastGossipNeighborList *gossip_entry; - - if (distant == NULL) - { - return GNUNET_YES; - } + struct DirectNeighbor *direct = value; - if (memcmp(&direct->identity, &distant->identity, sizeof(struct GNUNET_PeerIdentity)) == 0) - { - return GNUNET_YES; /* Don't gossip to a peer about itself! */ - } + GNUNET_CONTAINER_multihashmap_iterate (extended_neighbors, &add_all_extended_peers, direct->send_context); -#if SUPPORT_HIDING - if (distant->hidden == GNUNET_YES) - return GNUNET_YES; /* This peer should not be gossipped about (hidden) */ -#endif - gossip_entry = GNUNET_malloc(sizeof(struct FastGossipNeighborList)); - gossip_entry->about = distant; - - GNUNET_CONTAINER_DLL_insert_after(send_context->fast_gossip_list_head, - send_context->fast_gossip_list_tail, - send_context->fast_gossip_list_tail, - gossip_entry); - if (send_context->task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel(sched, send_context->task); + if (direct->send_context->task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel(sched, direct->send_context->task); - send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, send_context); + direct->send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, direct->send_context); return GNUNET_YES; } +/** + * Task run during shutdown. + * + * @param cls unused + * @param tc unused + */ +static void +gossip_all_to_all (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors, &gossip_all_to_all_iterator, NULL); + + GNUNET_SCHEDULER_add_delayed (sched, + GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5), + &gossip_all_to_all, + NULL); +} +#endif /** * Iterate over all current direct peers, add newly connected peer * to the fast gossip list for that peer so we get DV routing @@ -2097,8 +2610,10 @@ static int add_all_direct_neighbors (void *cls, struct DistantNeighbor *distant; struct NeighborSendContext *send_context = direct->send_context; struct FastGossipNeighborList *gossip_entry; + char *direct_id; + - distant = GNUNET_CONTAINER_multihashmap_get(ctx.extended_neighbors, &to->identity.hashPubKey); + distant = GNUNET_CONTAINER_multihashmap_get(extended_neighbors, &to->identity.hashPubKey); if (distant == NULL) { return GNUNET_YES; @@ -2113,6 +2628,11 @@ static int add_all_direct_neighbors (void *cls, if (distant->hidden == GNUNET_YES) return GNUNET_YES; /* This peer should not be gossipped about (hidden) */ #endif + direct_id = GNUNET_strdup(GNUNET_i2s(&direct->identity)); +#if DEBUG_DV_GOSSIP + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s: adding peer %s to fast send list for %s\n", my_short_id, GNUNET_i2s(&distant->identity), direct_id); +#endif + GNUNET_free(direct_id); gossip_entry = GNUNET_malloc(sizeof(struct FastGossipNeighborList)); gossip_entry->about = distant; @@ -2124,10 +2644,20 @@ static int add_all_direct_neighbors (void *cls, GNUNET_SCHEDULER_cancel(sched, send_context->task); send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, send_context); + //tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT; + //neighbor_send_task(send_context, &tc); return GNUNET_YES; } - +/** + * Type of an iterator over the hosts. Note that each + * host will be called with each available protocol. + * + * @param cls closure + * @param peer id of the peer, NULL for last call + * @param hello hello message for the peer (can be NULL) + * @param trust amount of trust we have in the peer + */ static void process_peerinfo (void *cls, const struct GNUNET_PeerIdentity *peer, @@ -2135,11 +2665,30 @@ process_peerinfo (void *cls, { struct PeerIteratorContext *peerinfo_iterator = cls; struct DirectNeighbor *neighbor = peerinfo_iterator->neighbor; + struct DistantNeighbor *distant = peerinfo_iterator->distant; +#if DEBUG_DV_PEER_NUMBERS + char *neighbor_pid; +#endif + int sent; - if ((peer == NULL))/* && (neighbor->pkey == NULL))*/ + if (peer == NULL) /* && (neighbor->pkey == NULL))*/ { - /* FIXME: Remove peer! */ - GNUNET_free(peerinfo_iterator); + if (distant->pkey == NULL) /* FIXME: Reschedule? */ + { +#if DEBUG_DV + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to get peerinfo information for this peer, retrying!\n"); +#endif + peerinfo_iterator->ic = GNUNET_PEERINFO_iterate(peerinfo_handle, + &peerinfo_iterator->neighbor->identity, + 0, + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3), + &process_peerinfo, + peerinfo_iterator); + } + else + { + GNUNET_free(peerinfo_iterator); + } return; } @@ -2148,14 +2697,29 @@ process_peerinfo (void *cls, if ((hello != NULL) && (GNUNET_HELLO_get_key (hello, &neighbor->pkey) == GNUNET_OK)) { - GNUNET_CONTAINER_multihashmap_get_multiple(ctx.extended_neighbors, + if (distant->pkey == NULL) + { + distant->pkey = GNUNET_malloc(sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); + memcpy(distant->pkey, &neighbor->pkey, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); + } + + /* Why do it this way, now we have the distant neighbor! */ + /*GNUNET_CONTAINER_multihashmap_get_multiple(extended_neighbors, &peer->hashPubKey, &add_pkey_to_extended, - &neighbor->pkey); + &neighbor->pkey);*/ - GNUNET_CONTAINER_multihashmap_iterate (ctx.extended_neighbors, &add_all_extended_peers, neighbor->send_context); + sent = GNUNET_CONTAINER_multihashmap_iterate (extended_neighbors, &add_all_extended_peers, neighbor->send_context); - GNUNET_CONTAINER_multihashmap_iterate (ctx.direct_neighbors, &add_all_direct_neighbors, neighbor); +#if DEBUG_DV_PEER_NUMBERS + neighbor_pid = GNUNET_strdup(GNUNET_i2s(&neighbor->identity)); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Gossipped %d extended peers to %s\n", GNUNET_i2s(&my_identity), sent, neighbor_pid); +#endif + sent = GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors, &add_all_direct_neighbors, neighbor); +#if DEBUG_DV_PEER_NUMBERS + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Gossipped about %s to %d direct peers\n", GNUNET_i2s(&my_identity), neighbor_pid, sent); + GNUNET_free(neighbor_pid); +#endif neighbor->send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, neighbor->send_context); } } @@ -2177,12 +2741,13 @@ void handle_core_connect (void *cls, struct DirectNeighbor *neighbor; struct DistantNeighbor *about; struct PeerIteratorContext *peerinfo_iterator; + int sent; #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Receives core connect message for peer %s distance %d!\n", "dv", GNUNET_i2s(peer), distance); #endif - if ((distance == DIRECT_NEIGHBOR_COST) && (GNUNET_CONTAINER_multihashmap_get(ctx.direct_neighbors, &peer->hashPubKey) == NULL)) + if ((distance == DIRECT_NEIGHBOR_COST) && (GNUNET_CONTAINER_multihashmap_get(direct_neighbors, &peer->hashPubKey) == NULL)) { peerinfo_iterator = GNUNET_malloc(sizeof(struct PeerIteratorContext)); neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor)); @@ -2190,29 +2755,35 @@ void handle_core_connect (void *cls, neighbor->send_context->toNeighbor = neighbor; memcpy (&neighbor->identity, peer, sizeof (struct GNUNET_PeerIdentity)); - GNUNET_CONTAINER_multihashmap_put (ctx.direct_neighbors, + GNUNET_assert(GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_put (direct_neighbors, &peer->hashPubKey, - neighbor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); - addUpdateNeighbor (peer, NULL, 0, neighbor, DIRECT_NEIGHBOR_COST); + neighbor, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + about = addUpdateNeighbor (peer, NULL, 0, neighbor, DIRECT_NEIGHBOR_COST); + peerinfo_iterator->distant = about; peerinfo_iterator->neighbor = neighbor; peerinfo_iterator->ic = GNUNET_PEERINFO_iterate (peerinfo_handle, peer, 0, - GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3), &process_peerinfo, peerinfo_iterator); - /* Only add once we get the publicKey of this guy - * - * neighbor->send_context->task = GNUNET_SCHEDULER_add_now(sched, &neighbor_send_task, neighbor->send_context); - */ + if ((about != NULL) && (about->pkey == NULL)) + { +#if DEBUG_DV + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Newly added peer %s has NULL pkey!\n", GNUNET_i2s(peer)); +#endif + } + else if (about != NULL) + { + GNUNET_free(peerinfo_iterator); + } } else { - about = GNUNET_CONTAINER_multihashmap_get(ctx.extended_neighbors, &peer->hashPubKey); - if ((GNUNET_CONTAINER_multihashmap_get(ctx.direct_neighbors, &peer->hashPubKey) == NULL) && (about != NULL)) - GNUNET_CONTAINER_multihashmap_iterate(ctx.direct_neighbors, &add_distant_all_direct_neighbors, about); - + about = GNUNET_CONTAINER_multihashmap_get(extended_neighbors, &peer->hashPubKey); + if ((GNUNET_CONTAINER_multihashmap_get(direct_neighbors, &peer->hashPubKey) == NULL) && (about != NULL)) + sent = GNUNET_CONTAINER_multihashmap_iterate(direct_neighbors, &add_distant_all_direct_neighbors, about); #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Distance (%d) greater than %d or already know about peer (%s), not re-adding!\n", "dv", distance, DIRECT_NEIGHBOR_COST, GNUNET_i2s(peer)); @@ -2234,13 +2805,14 @@ void handle_core_disconnect (void *cls, struct DistantNeighbor *referee; struct FindDestinationContext fdc; struct DisconnectContext disconnect_context; + #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Receives core peer disconnect message!\n", "dv"); #endif neighbor = - GNUNET_CONTAINER_multihashmap_get (ctx.direct_neighbors, &peer->hashPubKey); + GNUNET_CONTAINER_multihashmap_get (direct_neighbors, &peer->hashPubKey); if (neighbor == NULL) { return; @@ -2251,18 +2823,21 @@ void handle_core_disconnect (void *cls, fdc.dest = NULL; fdc.tid = 0; - GNUNET_CONTAINER_multihashmap_iterate (ctx.extended_neighbors, &find_distant_peer, &fdc); + GNUNET_CONTAINER_multihashmap_iterate (extended_neighbors, &find_distant_peer, &fdc); if (fdc.dest != NULL) { disconnect_context.direct = neighbor; disconnect_context.distant = fdc.dest; - GNUNET_CONTAINER_multihashmap_iterate (ctx.direct_neighbors, &schedule_disconnect_messages, &disconnect_context); + GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors, &schedule_disconnect_messages, &disconnect_context); } GNUNET_assert (neighbor->referee_tail == NULL); - GNUNET_CONTAINER_multihashmap_remove (ctx.direct_neighbors, - &peer->hashPubKey, neighbor); + if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_remove (direct_neighbors, + &peer->hashPubKey, neighbor)) + { + GNUNET_break(0); + } if ((neighbor->send_context != NULL) && (neighbor->send_context->task != GNUNET_SCHEDULER_NO_TASK)) GNUNET_SCHEDULER_cancel(sched, neighbor->send_context->task); GNUNET_free (neighbor); @@ -2289,32 +2864,27 @@ run (void *cls, /* FIXME: Read from config, or calculate, or something other than this! */ max_hosts = DEFAULT_DIRECT_CONNECTIONS; - ctx.max_table_size = DEFAULT_DV_SIZE; - ctx.fisheye_depth = DEFAULT_FISHEYE_DEPTH; + max_table_size = DEFAULT_DV_SIZE; + fisheye_depth = DEFAULT_FISHEYE_DEPTH; if (GNUNET_CONFIGURATION_have_value(cfg, "dv", "max_direct_connections")) - { - GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "max_direct_connections", &max_hosts); - } + GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "max_direct_connections", &max_hosts)); if (GNUNET_CONFIGURATION_have_value(cfg, "dv", "max_total_connections")) - { - GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "max_total_connections", &ctx.max_table_size); - } + GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "max_total_connections", &max_table_size)); + if (GNUNET_CONFIGURATION_have_value(cfg, "dv", "fisheye_depth")) - { - GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "fisheye_depth", &ctx.fisheye_depth); - } + GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "dv", "fisheye_depth", &fisheye_depth)); - ctx.neighbor_min_heap = + neighbor_min_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); - ctx.neighbor_max_heap = + neighbor_max_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX); - ctx.direct_neighbors = GNUNET_CONTAINER_multihashmap_create (max_hosts); - ctx.extended_neighbors = - GNUNET_CONTAINER_multihashmap_create (ctx.max_table_size * 3); + direct_neighbors = GNUNET_CONTAINER_multihashmap_create (max_hosts); + extended_neighbors = + GNUNET_CONTAINER_multihashmap_create (max_table_size * 3); GNUNET_SERVER_add_handlers (server, plugin_handlers); coreAPI = @@ -2334,6 +2904,10 @@ run (void *cls, if (coreAPI == NULL) return; + coreMST = GNUNET_SERVER_mst_create (GNUNET_SERVER_MAX_MESSAGE_SIZE, + &tokenized_message_handler, + NULL); + peerinfo_handle = GNUNET_PEERINFO_connect(sched, cfg); if (peerinfo_handle == NULL) @@ -2347,6 +2921,12 @@ run (void *cls, GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); +#if INSANE_GOSSIP + GNUNET_SCHEDULER_add_delayed (sched, + GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5), + &gossip_all_to_all, + NULL); +#endif }