X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fgnunet-service-mesh.c;h=df4f39eedb11e99d0eefb58212093ed010a06136;hb=0b81657b642457b7e15414ded2f66b33ce6835c2;hp=cb006bc42fa22c324e89d9f7025c4057a9228c77;hpb=b8bc30b1a609c041f9fbdf72212e6f15e82d875d;p=oweals%2Fgnunet.git diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index cb006bc42..df4f39eed 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -30,14 +30,15 @@ * - MESH NETWORK HANDLES * - MESH LOCAL HANDLER HELPERS * - MESH LOCAL HANDLES + * - PERIODIC FUNCTIONS * - MAIN FUNCTIONS (main & run) * * TODO: - * - soft stateing (keep-alive (CHANGE?) / timeout / disconnect) -- not a message issue * - error reporting (CREATE/CHANGE/ADD/DEL?) -- new message! * - partial disconnect reporting -- same as error reporting? * - add vs create? change vs. keep-alive? same msg or different ones? -- thinking... * - speed requirement specification (change?) in mesh API -- API call + * - add ping message (connection confirmation, others?) */ #include "platform.h" @@ -51,11 +52,44 @@ #include "mesh_protocol.h" #include "gnunet_dht_service.h" +#define REFRESH_PATH_TIME GNUNET_TIME_relative_multiply(\ + GNUNET_TIME_UNIT_SECONDS,\ + 300) + /******************************************************************************/ /************************ DATA STRUCTURES ****************************/ /******************************************************************************/ +/** + * Information regarding a path + */ +struct MeshPath +{ + + /** + * Linked list + */ + struct MeshPath *next; + struct MeshPath *prev; + + /** + * Whether the path is serving traffic in a tunnel or is a backup + */ + int in_use; + + /** + * List of all the peers that form the path from origin to target + */ + GNUNET_PEER_Id *peers; + + /** + * Number of peers (hops) in the path + */ + unsigned int length; +}; + + /** * All the states a peer participating in a tunnel can be in. */ @@ -82,6 +116,7 @@ enum MeshPeerState MESH_PEER_RECONNECTING }; + /** * Struct containing all information regarding a given peer */ @@ -98,9 +133,9 @@ struct MeshPeerInfo enum MeshPeerState state; /** - * When to try to establish contact again? + * Last time we heard from this peer */ - struct GNUNET_TIME_Absolute next_reconnect_attempt; + struct GNUNET_TIME_Absolute last_contact; /** * Number of attempts to reconnect so far @@ -108,9 +143,10 @@ struct MeshPeerInfo int n_reconnect_attempts; /** - * First hop whom to send data to reach this peer in the current active path + * Paths to reach the peer */ - GNUNET_PEER_Id first_hop; + struct MeshPath *path; + struct MeshPath *path_tail; /** * Handle to stop the DHT search for a path to this peer @@ -119,33 +155,6 @@ struct MeshPeerInfo }; -/** - * Information regarding a path - */ -struct MeshPath -{ - /** - * Double linked list - */ - struct MeshPath *next; - struct MeshPath *prev; - - /** - * Whether the path is serving traffic in a tunnel or is a backup - */ - int in_use; - - /** - * List of all the peers that form the path from origin to target - */ - GNUNET_PEER_Id *peers; - - /** - * Number of peers (hops) in the path - */ - int length; -}; - /** * Data scheduled to transmit (to local client or remote peer) */ @@ -227,7 +236,7 @@ struct MeshTunnel struct GNUNET_TIME_Absolute timestamp; /** - * Peers in the tunnel, for future optimizations + * Peers in the tunnelindexed by PeerIdentity (MeshPeerInfo) */ struct GNUNET_CONTAINER_MultiHashMap* peers; @@ -241,11 +250,6 @@ struct MeshTunnel */ unsigned int peers_total; - /** - * Paths (used and backup) - */ - struct MeshPath *paths_head; - struct MeshPath *paths_tail; /** * Client owner of the tunnel, if any @@ -269,6 +273,7 @@ struct MeshClient * Linked list */ struct MeshClient *next; + struct MeshClient *prev; /** * Tunnels that belong to this client, indexed by local id @@ -302,12 +307,18 @@ struct MeshClient * All the clients */ static struct MeshClient *clients; +static struct MeshClient *clients_tail; /** - * Tunnels known, indexed by MESH_TunnelID + * Tunnels known, indexed by MESH_TunnelID (MeshTunnel) */ struct GNUNET_CONTAINER_MultiHashMap *tunnels; +/** + * Peers known, indexed by PeerIdentity (MeshPeerInfo) + */ +struct GNUNET_CONTAINER_MultiHashMap *peers; + /** * Handle to communicate with core */ @@ -332,6 +343,123 @@ static MESH_TunnelNumber next_tid; /****************** GENERAL HELPER FUNCTIONS ************************/ /******************************************************************************/ +/** + * Retrieve the MeshPeerInfo stucture associated with the peer, create one + * and inster it in the appropiate structures if the peer is not known yet. + * @param peer Identity of the peer + * @return Existing or newly created peer info + */ +static struct MeshPeerInfo * +get_peer_info (const struct GNUNET_PeerIdentity *peer) +{ + struct MeshPeerInfo * peer_info; + + peer_info = GNUNET_CONTAINER_multihashmap_get(peers, + &peer->hashPubKey); + if (NULL == peer_info) { + peer_info = (struct MeshPeerInfo *) + GNUNET_malloc(sizeof(struct MeshPeerInfo)); + GNUNET_CONTAINER_multihashmap_put(peers, + &peer->hashPubKey, + peer_info, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + peer_info->id = GNUNET_PEER_intern(peer); + peer_info->state = MESH_PEER_SEARCHING; + } + + return peer_info; +} + +/** + * Find the first peer whom to send a packet to go down this path + * @param path The path to use + * @return short id of the next peer, myid in case of local delivery, + * or 0 in case of error + */ +static GNUNET_PEER_Id +get_first_hop (struct MeshPath *path) +{ + unsigned int i; + + if (NULL == path) return 0; + if (path->in_use == 0) return 0; + + for (i = 0; i < path->length; i++) { + if (path->peers[i] == myid) { + if (i < path->length - 1) { + return path->peers[i+1]; + } else { + return myid; + } + } + } + return 0; +} + + +/** + * Get the cost of the path. + * @param path The path to analyze + * @return Number of hops to reach destination, UINT_MAX in case the peer is not + * in the path + */ +static unsigned int +get_path_cost(struct MeshPath *path) +{ + unsigned int i; + + if (NULL == path) return UINT_MAX; + for (i = 0; i < path->length; i++) { + if (path->peers[i] == myid) { + return path->length - i; + } + } + return UINT_MAX; +} + + +/** + * Add the path to the peer and update the path used to reach it in case this + * is the shortest. + * @param peer_info Destination peer to add the path to. + * @param path New path to add. Last peer must be the peer in arg 1. + */ +static void +add_path_to_peer(struct MeshPeerInfo *peer_info, struct MeshPath *path) +{ + unsigned int i; + unsigned int new_cost; + unsigned int best_cost; + struct MeshPath *aux; + struct MeshPath *best; + + if (NULL == peer_info || NULL == path) return; + + new_cost = get_path_cost(path); + best_cost = UINT_MAX; + best = NULL; + for (aux = peer_info->path; aux != NULL; aux = aux->next) { + if ((i = get_path_cost(aux)) < best_cost) { + best = aux; + best_cost = i; + } + } + if (best_cost < new_cost) { + path->in_use = 0; + GNUNET_CONTAINER_DLL_insert_tail(peer_info->path, + peer_info->path_tail, + path); + } else { + if (NULL != best) best->in_use = 0; + path->in_use = 1; + GNUNET_CONTAINER_DLL_insert(peer_info->path, + peer_info->path_tail, + path); + } + return; +} + + /** * Check if client has registered with the service and has not disconnected * @param client the client to check @@ -386,7 +514,7 @@ retrieve_tunnel_by_pi (GNUNET_PEER_Id pi, MESH_TunnelNumber tid) } -#if LATER + /** * Search for a tunnel by global ID using full PeerIdentities * @param oid owner of the tunnel @@ -402,7 +530,6 @@ retrieve_tunnel (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid) GNUNET_PEER_change_rc(pi, -1); return retrieve_tunnel_by_pi(pi, tid); } -#endif /** @@ -412,11 +539,10 @@ retrieve_tunnel (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid) * @return GNUNET_OK on success */ static int -destroy_path(struct MeshTunnel *t, struct MeshPath *p) +destroy_path(struct MeshPath *p) { GNUNET_PEER_decrement_rcs(p->peers, p->length); GNUNET_free(p->peers); - GNUNET_CONTAINER_DLL_remove(t->paths_head, t->paths_tail, p); GNUNET_free(p); return GNUNET_OK; } @@ -428,14 +554,20 @@ destroy_path(struct MeshTunnel *t, struct MeshPath *p) * @param pi the peer_info to destroy * @return GNUNET_OK on success */ -// static int -// destroy_peer_info(struct MeshTunnel *t, struct MeshPeerInfo *pi) -// { -// GNUNET_PEER_change_rc(pi->id, -1); -// /* FIXME delete from list */ -// GNUNET_free(pi); -// return GNUNET_OK; -// } +static int +destroy_peer_info(struct MeshPeerInfo *pi) +{ + GNUNET_HashCode hash; + struct GNUNET_PeerIdentity id; + + GNUNET_PEER_resolve(pi->id, &id); + GNUNET_PEER_change_rc(pi->id, -1); + GNUNET_CRYPTO_hash(&id, sizeof(struct GNUNET_PeerIdentity), &hash); + + GNUNET_CONTAINER_multihashmap_remove(peers, &hash, pi); + GNUNET_free(pi); + return GNUNET_OK; +} #endif @@ -446,17 +578,16 @@ destroy_path(struct MeshTunnel *t, struct MeshPath *p) * @return GNUNET_OK on success */ static int -destroy_tunnel(struct MeshClient *c, struct MeshTunnel *t) +destroy_tunnel(struct MeshTunnel *t) { - struct MeshPath *path; - GNUNET_HashCode hash; - int r; +// struct MeshPath *path; + struct MeshClient *c; + GNUNET_HashCode hash; + int r; if (NULL == t) return GNUNET_OK; - for (path = t->paths_head; path != NULL; path = t->paths_head) { - if(GNUNET_OK != destroy_path(t, path)) r = GNUNET_SYSERR; - } + c = t->client; GNUNET_CRYPTO_hash(&t->id, sizeof(struct MESH_TunnelID), &hash); if(GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(tunnels, &hash, t)) { @@ -478,7 +609,6 @@ destroy_tunnel(struct MeshClient *c, struct MeshTunnel *t) /******************************************************************************/ /** - * FIXME: rewrite * Function called to notify a client about the socket * being ready to queue more data. "buf" will be * NULL and "size" zero if the socket was closed for @@ -492,24 +622,32 @@ destroy_tunnel(struct MeshClient *c, struct MeshTunnel *t) static size_t send_core_create_path_for_peer (void *cls, size_t size, void *buf) { - size_t size_needed; - struct MeshPeerInfo *peer_info; + struct MeshPeerInfo *peer_info = cls; struct GNUNET_MESH_ManipulatePath *msg; struct MeshPath *p; - struct GNUNET_PeerIdentity peer_id; struct GNUNET_PeerIdentity *peer_ptr; + struct GNUNET_PeerIdentity id; + size_t size_needed; int i; if (0 == size && NULL == buf) { - // TODO retry? cancel? + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Retransmitting create path\n"); + GNUNET_PEER_resolve(get_first_hop(peer_info->path), &id); + GNUNET_CORE_notify_transmit_ready(core_handle, + 0, + 0, + GNUNET_TIME_UNIT_FOREVER_REL, + &id, + sizeof(struct GNUNET_MESH_ManipulatePath) + + (peer_info->path->length + * sizeof (struct GNUNET_PeerIdentity)), + &send_core_create_path_for_peer, + peer_info); return 0; } - peer_info = (struct MeshPeerInfo *)cls; - peer_info->dhtget = NULL; -// p = peer_info->t->paths_head; - p = NULL; + p = peer_info->path; while (NULL != p) { - if (p->peers[p->length-1] == peer_info->id) { + if (p->in_use) { break; } p = p->next; @@ -524,22 +662,20 @@ send_core_create_path_for_peer (void *cls, size_t size, void *buf) } msg = (struct GNUNET_MESH_ManipulatePath *) buf; - msg->header.size = htons(sizeof(struct GNUNET_MESH_ManipulatePath)); + msg->header.size = htons(size_needed); msg->header.type = htons(GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE); - msg->speed_min = 0; peer_ptr = (struct GNUNET_PeerIdentity *) &msg[1]; for (i = 0; i < p->length; i++) { - GNUNET_PEER_resolve(p->peers[i], &peer_id); - memcpy(&peer_ptr[i], &peer_id, sizeof(struct GNUNET_PeerIdentity)); + GNUNET_PEER_resolve(p->peers[i], peer_ptr++); } - peer_info->state = MESH_PEER_WAITING; + peer_info->state = MESH_PEER_WAITING; // TODO maybe already ready? return size_needed; } - +#if LATER /** * Send another peer a notification to destroy a tunnel * @param cls The tunnel to destroy @@ -563,6 +699,7 @@ send_p2p_tunnel_destroy(void *cls, size_t size, void *buf) destroy_tunnel(c, t); return sizeof(struct GNUNET_MESH_TunnelMessage); } +#endif /******************************************************************************/ @@ -589,11 +726,98 @@ handle_mesh_path_create (void *cls, const struct GNUNET_TRANSPORT_ATS_Information *atsi) { - /* Extract path */ - /* Find origin & self */ - /* Search for origin in local tunnels */ - /* Create tunnel / add path */ - /* Retransmit to next link in chain, if any (core_notify + callback) */ + unsigned int own_pos; + uint16_t size; + uint16_t i; + MESH_TunnelNumber tid; + struct GNUNET_MESH_ManipulatePath *msg; + struct GNUNET_PeerIdentity *pi; + GNUNET_HashCode hash; + struct MeshPath *path; + struct MeshPeerInfo *peer_info; + struct MeshTunnel *t; + + + size = ntohs(message->size); + if (size < sizeof(struct GNUNET_MESH_ManipulatePath)) { + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, + "received create path message too short\n"); + return GNUNET_OK; + } + + size -= sizeof(struct GNUNET_MESH_ManipulatePath); + if (size < 2 * sizeof(struct GNUNET_PeerIdentity)) { + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, + "create path message lacks enough peers\n"); + return GNUNET_OK; + } + if (size % sizeof(struct GNUNET_PeerIdentity)) { + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, + "create path message of wrong size\n"); + return GNUNET_OK; + } + msg = (struct GNUNET_MESH_ManipulatePath *) message; + size /= sizeof(struct GNUNET_PeerIdentity); + + tid = ntohl(msg->tid); + pi = (struct GNUNET_PeerIdentity *) &msg[1]; + t = retrieve_tunnel(pi, tid); + + if (NULL == t) { + t = GNUNET_malloc(sizeof(struct MeshTunnel)); + t->id.oid = GNUNET_PEER_intern(pi); + t->id.tid = tid; + t->local_tid = 0; + t->client = NULL; + t->peers = GNUNET_CONTAINER_multihashmap_create(32); + + GNUNET_CRYPTO_hash(&t->id, sizeof(struct MESH_TunnelID), &hash); + if (GNUNET_OK != + GNUNET_CONTAINER_multihashmap_put(tunnels, + &hash, + t, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) + { + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, + "create path: could not store tunnel in hashmap\n"); + return GNUNET_OK; + } + + } + peer_info = GNUNET_CONTAINER_multihashmap_get(peers, + &pi[size - 1].hashPubKey); + if (NULL == peer_info) { + peer_info = GNUNET_malloc(sizeof(struct MeshPeerInfo)); + peer_info->id = GNUNET_PEER_intern(&pi[size - 1]); + peer_info->state = MESH_PEER_WAITING; + GNUNET_CONTAINER_multihashmap_put(peers, + &pi[size - 1].hashPubKey, + peer_info, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + } + + path = GNUNET_malloc(sizeof(struct MeshPath)); + path->length = size; + path->peers = GNUNET_malloc(size * sizeof(GNUNET_PEER_Id)); + own_pos = 0; + for (i = 0; i < size; i++) { + path->peers[i] = GNUNET_PEER_intern(&pi[i]); + if (path->peers[i] == myid) own_pos = i; + } + if (own_pos == 0) { /* cannot be self, must be 'not found' */ + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, + "create path: self not found in path through self\n"); + destroy_path(path); + /* FIXME destroy tunnel? leave for timeout? */ + return 0; + } + if (own_pos == size - 1) { /* it is for us! */ + destroy_path(path); /* not needed anymore */ + /* TODO: send ack? new meesage type? */ + } else { + add_path_to_peer(peer_info, path); + /* TODO: Retransmit to next link in chain, if any (core_notify + callback) */ + } return GNUNET_OK; } @@ -641,17 +865,26 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { /**************** MESH LOCAL HANDLER HELPERS ***********************/ /******************************************************************************/ +/** + * delete_tunnel_entry: iterator for deleting each tunnel that belongs to a + * client when the client disconnects. + * @param cls closure (client that is disconnecting) + * @param key the hash of the local tunnel id (used to access the hashmap) + * @param value the value stored at the key (tunnel to destroy) + * @return GNUNET_OK on success + */ static int delete_tunnel_entry (void *cls, const GNUNET_HashCode * key, void *value) { int r; - r = destroy_tunnel((struct MeshClient *) cls, (struct MeshTunnel *) value); + r = destroy_tunnel((struct MeshTunnel *) value); return r; } +#if LATER /** * notify_client_connection_failure: notify a client that the connection to the * requested remote peer is not possible (for instance, no route found) - * Function called when the socket is ready to queue more data."buf" will be + * Function called when the socket is ready to queue more data. "buf" will be * NULL and "size" zero if the socket was closed for writing in the meantime. * * @param cls closure @@ -683,10 +916,39 @@ notify_client_connection_failure (void *cls, size_t size, void *buf) return size_needed; } +#endif + + +/** + * Send keepalive packets for a peer + * + * @param cls unused + * @param tc unused + */ +static void +path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct MeshPeerInfo *peer_info = cls; + struct GNUNET_PeerIdentity id; + + if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) return; + GNUNET_PEER_resolve(get_first_hop(peer_info->path), &id); + GNUNET_CORE_notify_transmit_ready(core_handle, + 0, + 0, + GNUNET_TIME_UNIT_FOREVER_REL, + &id, + sizeof(struct GNUNET_MESH_ManipulatePath) + + (peer_info->path->length + * sizeof (struct GNUNET_PeerIdentity)), + &send_core_create_path_for_peer, + peer_info); + + return; +} /** - * FIXME: rewrite * Function to process paths received for a new peer addition. The recorded * paths form the initial tunnel, which can be optimized later. * Called on each result obtained for the DHT search. @@ -712,28 +974,30 @@ dht_get_response_handler(void *cls, size_t size, const void *data) { - struct MeshPeerInfo *peer_info; - struct MeshTunnel *t; + struct MeshPeerInfo *peer_info = cls; struct MeshPath *p; + struct GNUNET_PeerIdentity pi; int i; - peer_info = (struct MeshPeerInfo *)cls; -// t = peer_info->t; - t = NULL; // FIXME - - if (NULL == get_path || NULL == put_path) { - // TODO: find ourselves some alternate initial path to the destination - GNUNET_SERVER_notify_transmit_ready( - t->client->handle, - sizeof(struct GNUNET_MESH_PeerControl), - GNUNET_TIME_UNIT_FOREVER_REL, - ¬ify_client_connection_failure, - peer_info - ); + if ((NULL == get_path || NULL == put_path) && NULL == peer_info->path) { + // Find ourselves some alternate initial path to the destination: retry + GNUNET_DHT_get_stop(peer_info->dhtget); + GNUNET_PEER_resolve(peer_info->id, &pi); + peer_info->dhtget = GNUNET_DHT_get_start(dht_handle, + GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_BLOCK_TYPE_ANY, + &pi.hashPubKey, + 4, /* replication level */ + GNUNET_DHT_RO_RECORD_ROUTE, + NULL, /* bloom filter */ + 0, /* mutator */ + NULL, /* xquery */ + 0, /* xquery bits */ + dht_get_response_handler, + (void *)peer_info); } p = GNUNET_malloc(sizeof(struct MeshPath)); - GNUNET_CONTAINER_DLL_insert(t->paths_head, t->paths_tail, p); for (i = 0; get_path[i] != NULL; i++); for (i--; i >= 0; i--) { p->peers = GNUNET_realloc(p->peers, @@ -748,9 +1012,7 @@ dht_get_response_handler(void *cls, p->peers[p->length] = GNUNET_PEER_intern(put_path[i]); p->length++; } - // p->id = 0; // FIXME generate ID or remove field - p->in_use = 0; - // peer_info->first_hop = p->peers[1]; // FIXME do this on path completion + add_path_to_peer(peer_info, p); GNUNET_CORE_notify_transmit_ready(core_handle, 0, 0, @@ -761,6 +1023,7 @@ dht_get_response_handler(void *cls, * sizeof (struct GNUNET_PeerIdentity)), &send_core_create_path_for_peer, peer_info); + GNUNET_SCHEDULER_add_delayed(REFRESH_PATH_TIME, &path_refresh, peer_info); return; } @@ -784,25 +1047,30 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) struct MeshClient *next; GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: client disconnected\n"); + "client disconnected\n"); c = clients; while (NULL != c) { if (c->handle == client) { GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: matching client found, cleaning\n"); + " matching client found, cleaning\n"); GNUNET_CONTAINER_multihashmap_iterate(c->tunnels, &delete_tunnel_entry, c); GNUNET_CONTAINER_multihashmap_destroy(c->tunnels); if(0 != c->app_counter) GNUNET_free (c->apps); if(0 != c->type_counter) GNUNET_free (c->types); + GNUNET_CONTAINER_DLL_remove(clients, clients_tail, c); next = c->next; GNUNET_free (c); c = next; } else { + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + " ... searching\n"); c = c->next; } } + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + " done!\n"); return; } @@ -825,7 +1093,7 @@ handle_local_new_client (void *cls, uint16_t types; uint16_t apps; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: new client connected\n"); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "new client connected\n"); /* Check data sanity */ size = ntohs(message->size) - sizeof(struct GNUNET_MESH_ClientConnect); cc_msg = (struct GNUNET_MESH_ClientConnect *) message; @@ -855,12 +1123,11 @@ handle_local_new_client (void *cls, apps * sizeof(GNUNET_MESH_ApplicationType)); } GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: client has %u+%u subscriptions\n", + " client has %u+%u subscriptions\n", c->type_counter, c->app_counter); - c->next = clients; - clients = c; + GNUNET_CONTAINER_DLL_insert(clients, clients_tail, c); c->tunnels = GNUNET_CONTAINER_multihashmap_create(32); GNUNET_SERVER_receive_done(client, GNUNET_OK); @@ -914,12 +1181,13 @@ handle_local_tunnel_create (void *cls, } t = GNUNET_malloc(sizeof(struct MeshTunnel)); - // FIXME: what if all 2^32 ID are taken? - while (NULL != retrieve_tunnel_by_pi(myid, next_tid)) next_tid++; + while (NULL != retrieve_tunnel_by_pi(myid, next_tid)) + next_tid = (next_tid + 1) % GNUNET_MESH_LOCAL_TUNNEL_ID_MARK; t->id.tid = next_tid++; t->id.oid = myid; t->local_tid = ntohl(t_msg->tunnel_id); t->client = c; + t->peers = GNUNET_CONTAINER_multihashmap_create(32); GNUNET_CRYPTO_hash(&t->local_tid, sizeof(MESH_TunnelNumber), &hash); if (GNUNET_OK != @@ -992,15 +1260,7 @@ handle_local_tunnel_destroy (void *cls, GNUNET_CRYPTO_hash(&t->id, sizeof(struct MESH_TunnelID), &hash); GNUNET_CONTAINER_multihashmap_remove(tunnels, &hash, t); - GNUNET_CORE_notify_transmit_ready(core_handle, - 1, - 1, - GNUNET_TIME_UNIT_FOREVER_REL, - NULL, - sizeof(struct GNUNET_MESH_TunnelMessage), - &send_p2p_tunnel_destroy, - t); - +// notify_tunnel_destroy(t); GNUNET_SERVER_receive_done(client, GNUNET_OK); return; } @@ -1023,7 +1283,6 @@ handle_local_connect_add (void *cls, struct MeshTunnel *t; MESH_TunnelNumber tid; struct MeshPeerInfo *peer_info; - GNUNET_HashCode key; /* Sanity check for client registration */ @@ -1035,7 +1294,9 @@ handle_local_connect_add (void *cls, peer_msg = (struct GNUNET_MESH_PeerControl *)message; /* Sanity check for message size */ - if (sizeof(struct GNUNET_MESH_PeerControl) != ntohs(peer_msg->header.size)) { + if (sizeof(struct GNUNET_MESH_PeerControl) + != ntohs(peer_msg->header.size)) + { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1057,20 +1318,15 @@ handle_local_connect_add (void *cls, return; } - /* Ok, add peer to tunnel */ - peer_info = (struct MeshPeerInfo *) GNUNET_malloc(sizeof(struct MeshPeerInfo)); - peer_info->id = GNUNET_PEER_intern(&peer_msg->peer); - peer_info->state = MESH_PEER_SEARCHING; t->peers_total++; - /* FIXME insert */ - /* Start DHT search */ - GNUNET_CRYPTO_hash (&peer_msg->peer, - sizeof(struct GNUNET_PeerIdentity), - &key); - peer_info->dhtget = GNUNET_DHT_get_start(dht_handle, + peer_info = get_peer_info(&peer_msg->peer); + + /* Start DHT search if needed */ + if(MESH_PEER_READY != peer_info->state && NULL == peer_info->dhtget) { + peer_info->dhtget = GNUNET_DHT_get_start(dht_handle, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_BLOCK_TYPE_ANY, - &key, + &peer_msg->peer.hashPubKey, 4, /* replication level */ GNUNET_DHT_RO_RECORD_ROUTE, NULL, /* bloom filter */ @@ -1079,6 +1335,7 @@ handle_local_connect_add (void *cls, 0, /* xquery bits */ dht_get_response_handler, (void *)peer_info); + } GNUNET_SERVER_receive_done(client, GNUNET_OK); return; @@ -1100,8 +1357,6 @@ handle_local_connect_del (void *cls, struct GNUNET_MESH_PeerControl *peer_msg; struct MeshClient *c; struct MeshTunnel *t; - struct MeshPath *p; - struct MeshPath *aux_path; MESH_TunnelNumber tid; GNUNET_PEER_Id peer_id; @@ -1113,7 +1368,9 @@ handle_local_connect_del (void *cls, } peer_msg = (struct GNUNET_MESH_PeerControl *)message; /* Sanity check for message size */ - if (sizeof(struct GNUNET_MESH_PeerControl) != ntohs(peer_msg->header.size)) { + if (sizeof(struct GNUNET_MESH_PeerControl) + != ntohs(peer_msg->header.size)) + { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1138,20 +1395,7 @@ handle_local_connect_del (void *cls, /* Ok, delete peer from tunnel */ peer_id = GNUNET_PEER_intern(&peer_msg->peer); - /* Delete paths */ - p = t->paths_head; - while (p != NULL) { - if (p->peers[p->length-1] == peer_id) { /* one path per destination */ - GNUNET_CONTAINER_DLL_remove(t->paths_head, t->paths_tail, p); - GNUNET_PEER_decrement_rcs(p->peers, p->length); - aux_path = p; - p = p->next; - GNUNET_free(aux_path); - } else { - p = p->next; - } - } - + /* FIXME Delete paths */ /* FIXME Delete peer info */ GNUNET_PEER_change_rc(peer_id, -1); @@ -1301,7 +1545,9 @@ handle_local_network_traffic_bcast (void *cls, } data_msg = (struct GNUNET_MESH_DataBroadcast *)message; /* Sanity check for message size */ - if (sizeof(struct GNUNET_MESH_PeerControl) != ntohs(data_msg->header.size)) { + if (sizeof(struct GNUNET_MESH_PeerControl) + != ntohs(data_msg->header.size)) + { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1390,14 +1636,23 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_TRANSPORT_ATS_Information *atsi) { - GNUNET_PEER_Id pid; +// GNUNET_PEER_Id pid; + struct MeshPeerInfo *peer_info; + struct MeshPath *path; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer connected\n"); - pid = GNUNET_PEER_intern(peer); - if (myid == pid) { + peer_info = get_peer_info(peer); + if (myid == peer_info->id) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " (self)\n"); } + path = GNUNET_malloc(sizeof(struct MeshPath)); + path->length = 2; + path->peers = GNUNET_malloc(sizeof(GNUNET_PEER_Id) * 2); + path->peers[0] = myid; + path->peers[1] = peer_info->id; + add_path_to_peer(peer_info, path); return; } @@ -1412,11 +1667,19 @@ core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { + GNUNET_PEER_Id pid; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n"); + pid = GNUNET_PEER_intern(peer); + GNUNET_PEER_change_rc(pid, -1); + if (myid == pid) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " (self)\n"); + } return; } + /******************************************************************************/ /************************ MAIN FUNCTIONS ****************************/ /******************************************************************************/ @@ -1431,7 +1694,7 @@ static void shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH shutting down\n"); + "shutting down\n"); if (core_handle != NULL) { GNUNET_CORE_disconnect (core_handle); core_handle = NULL; @@ -1439,7 +1702,9 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (dht_handle != NULL) { GNUNET_DHT_disconnect (dht_handle); dht_handle = NULL; - } + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "shut down\n"); } /** @@ -1455,11 +1720,11 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *c) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH starting to run\n"); + "starting to run\n"); GNUNET_SERVER_add_handlers (server, plugin_handlers); GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); core_handle = GNUNET_CORE_connect (c, /* Main configuration */ - 32, /* queue size */ + 1, /* queue size */ NULL, /* Closure passed to MESH functions */ &core_init, /* Call core_init once connected */ &core_connect, /* Handle connects */ @@ -1479,12 +1744,17 @@ run (void *cls, } next_tid = 0; - tunnels = GNUNET_CONTAINER_multihashmap_create(64); + tunnels = GNUNET_CONTAINER_multihashmap_create(32); + peers = GNUNET_CONTAINER_multihashmap_create(32); + clients = NULL; + clients_tail = NULL; /* Scheduled the task to clean up when shutdown is called */ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "end if run()\n"); } /** @@ -1505,5 +1775,7 @@ main (int argc, char *const *argv) "mesh", GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "end of main()\n"); return ret; }