X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fgnunet-service-mesh.c;h=df4f39eedb11e99d0eefb58212093ed010a06136;hb=0b81657b642457b7e15414ded2f66b33ce6835c2;hp=faed1ac01759a3a831eabf0ea45ae8111fb5942c;hpb=d44e24bc22b673d5caa13451e733be3d9a392226;p=oweals%2Fgnunet.git diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index faed1ac01..df4f39eed 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -26,16 +26,19 @@ * STRUCTURE: * - DATA STRUCTURES * - GLOBAL VARIABLES + * - MESH NETWORK HANDLER HELPERS * - 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" @@ -49,15 +52,48 @@ #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. */ -enum PeerState +enum MeshPeerState { /** * Path to the peer not known yet @@ -80,95 +116,65 @@ enum PeerState MESH_PEER_RECONNECTING }; + /** * Struct containing all information regarding a given peer */ -struct PeerInfo +struct MeshPeerInfo { - /** - * Double linked list - */ - struct PeerInfo *next; - struct PeerInfo *prev; - /** * ID of the peer */ GNUNET_PEER_Id id; - /** - * Tunnel this peer belongs to - */ - struct MESH_tunnel *t; - /** * Is the peer reachable? Is the peer even connected? */ - enum PeerState state; + 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; /** - * Who to send the data to --- FIXME what about multiple (alternate) paths? + * Number of attempts to reconnect so far */ - GNUNET_PEER_Id first_hop; + int n_reconnect_attempts; /** - * Max data rate to this peer + * Paths to reach the peer */ - uint32_t max_speed; + struct MeshPath *path; + struct MeshPath *path_tail; /** * Handle to stop the DHT search for a path to this peer */ - struct GNUNET_DHT_GetHandle *dhtget; + struct GNUNET_DHT_GetHandle *dhtget; }; -typedef uint32_t MESH_PathID; - - /** - * Information regarding a path + * Data scheduled to transmit (to local client or remote peer) */ -struct Path +struct MeshQueue { /** * Double linked list */ - struct Path *next; - struct Path *prev; + struct MeshQueue *next; + struct MeshQueue *prev; /** - * Id of the path, in case it's needed + * Target of the data (NULL if target is client) */ - MESH_PathID id; + struct MeshPeerInfo *peer; /** - * Whether the path is serving traffic in a tunnel or is a backup + * Client to send the data to (NULL if target is peer) */ - int in_use; - - /** - * List of all the peers that form the path from origin to target - */ - GNUNET_PEER_Id *peers; - int length; -}; - -/** - * Data scheduled to transmit (to local client or remote peer) - */ -struct MESH_queue -{ - /** - * Double linked list - */ - struct MESH_queue *next; - struct MESH_queue *prev; + struct MeshClient *client; /** * Size of the message to transmit @@ -186,45 +192,43 @@ struct MESH_queue struct GNUNET_MessageHeader *data; }; - -struct Client; /* FWD declaration */ /** - * Struct containing all information regarding a tunnel - * For an intermediate node the improtant info used will be: - * - OID \ To identify - * - TID / the tunnel - * - paths[0] | To know where to send it next - * - metainfo: ready, speeds, accounting - * For an end node more fields will be needed (client-handling) + * Globally unique tunnel identification (owner + number) + * DO NOT USE OVER THE NETWORK */ -struct MESH_tunnel -{ - +struct MESH_TunnelID { /** - * Double linked list + * Node that owns the tunnel */ - struct MESH_tunnel *next; - struct MESH_tunnel *prev; + GNUNET_PEER_Id oid; /** - * Origin ID: Node that created the tunnel + * Tunnel number to differentiate all the tunnels owned by the node oid + * ( tid < GNUNET_MESH_LOCAL_TUNNEL_ID_MARK ) */ - GNUNET_PEER_Id oid; + MESH_TunnelNumber tid; +}; - /** - * Tunnel number (unique for a given oid) - */ - MESH_TunnelID tid; +struct MeshClient; /* FWD declaration */ +/** + * Struct containing all information regarding a tunnel + * For an intermediate node the improtant info used will be: + * - id Tunnel unique identification + * - paths[0] To know where to send it next + * - metainfo: ready, speeds, accounting + */ +struct MeshTunnel +{ /** - * Minimal speed for this tunnel in kb/s + * Tunnel ID */ - uint32_t speed_min; + struct MESH_TunnelID id; /** - * Maximal speed for this tunnel in kb/s + * Local tunnel number ( >= GNUNET_MESH_LOCAL_TUNNEL_ID_MARK or 0 ) */ - uint32_t speed_max; + MESH_TunnelNumber local_tid; /** * Last time the tunnel was used @@ -232,10 +236,9 @@ struct MESH_tunnel struct GNUNET_TIME_Absolute timestamp; /** - * Peers in the tunnel, for future optimizations + * Peers in the tunnelindexed by PeerIdentity (MeshPeerInfo) */ - struct PeerInfo *peers_head; - struct PeerInfo *peers_tail; + struct GNUNET_CONTAINER_MultiHashMap* peers; /** * Number of peers that are connected and potentially ready to receive data @@ -247,58 +250,52 @@ struct MESH_tunnel */ unsigned int peers_total; - /** - * Paths (used and backup) - */ - struct Path *paths_head; - struct Path *paths_tail; /** - * If this tunnel was created by a local client, what's its handle? + * Client owner of the tunnel, if any */ - struct Client *client; + struct MeshClient *client; /** * Messages ready to transmit */ - struct MESH_queue *out_head; - struct MESH_queue *out_tail; - - /** - * Messages received and not processed - */ - struct MESH_queue *in_head; - struct MESH_queue *in_tail; + struct MeshQueue *queue_head; + struct MeshQueue *queue_tail; }; /** * Struct containing information about a client of the service */ -struct Client +struct MeshClient { /** - * Double linked list + * Linked list */ - struct Client *next; - struct Client *prev; + struct MeshClient *next; + struct MeshClient *prev; /** - * Tunnels that belong to this client, for convenience on disconnect + * Tunnels that belong to this client, indexed by local id */ - struct MESH_tunnel *tunnels_head; - struct MESH_tunnel *tunnels_tail; + struct GNUNET_CONTAINER_MultiHashMap* tunnels; /** * Handle to communicate with the client */ struct GNUNET_SERVER_Client *handle; + /** + * Applications that this client has claimed to provide + */ + GNUNET_MESH_ApplicationType *apps; + unsigned int app_counter; + /** * Messages that this client has declared interest in */ - GNUNET_MESH_ApplicationType *messages_subscribed; - unsigned int subscription_counter; + uint16_t *types; + unsigned int type_counter; }; @@ -309,14 +306,18 @@ struct Client /** * All the clients */ -static struct Client *clients_head; -static struct Client *clients_tail; +static struct MeshClient *clients; +static struct MeshClient *clients_tail; + +/** + * Tunnels known, indexed by MESH_TunnelID (MeshTunnel) + */ +struct GNUNET_CONTAINER_MultiHashMap *tunnels; /** - * Tunnels not owned by this node + * Peers known, indexed by PeerIdentity (MeshPeerInfo) */ -// static struct MESH_Tunnel *tunnels_head; -// static struct MESH_Tunnel *tunnels_tail; +struct GNUNET_CONTAINER_MultiHashMap *peers; /** * Handle to communicate with core @@ -333,29 +334,204 @@ static struct GNUNET_DHT_Handle *dht_handle; */ static GNUNET_PEER_Id myid; +/** + * Tunnel ID for the next created tunnel (global tunnel number) + */ +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 * @return non-NULL if client exists in the global DLL */ -static struct Client * -retrieve_client (struct GNUNET_SERVER_Client *client) { - struct Client *c; - c = clients_head; - while(NULL != c) { - if(c->handle == client) return c; - if(c == clients_tail) - return NULL; - else - c = c->next; +static struct MeshClient * +retrieve_client (struct GNUNET_SERVER_Client *client) +{ + struct MeshClient *c; + + c = clients; + while (NULL != c) { + if (c->handle == client) return c; + c = c->next; } return NULL; } + +/** + * Search for a tunnel among the tunnels for a client + * @param client the client whose tunnels to search in + * @param tid the local id of the tunnel + * @return tunnel handler, NULL if doesn't exist + */ +static struct MeshTunnel * +retrieve_tunnel_by_local_id (struct MeshClient *c, MESH_TunnelNumber tid) +{ + GNUNET_HashCode hash; + + GNUNET_CRYPTO_hash(&tid, sizeof(MESH_TunnelNumber), &hash); + return GNUNET_CONTAINER_multihashmap_get(c->tunnels, &hash); +} + +/** + * Search for a tunnel by global ID using PEER_ID + * @param pi owner of the tunnel + * @param tid global tunnel number + * @return tunnel handler, NULL if doesn't exist + */ +static struct MeshTunnel * +retrieve_tunnel_by_pi (GNUNET_PEER_Id pi, MESH_TunnelNumber tid) +{ + struct MESH_TunnelID id; + GNUNET_HashCode hash; + + id.oid = pi; + id.tid = tid; + + GNUNET_CRYPTO_hash(&id, sizeof(struct MESH_TunnelID), &hash); + return GNUNET_CONTAINER_multihashmap_get(tunnels, &hash); +} + + + +/** + * Search for a tunnel by global ID using full PeerIdentities + * @param oid owner of the tunnel + * @param tid global tunnel number + * @return tunnel handler, NULL if doesn't exist + */ +static struct MeshTunnel * +retrieve_tunnel (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid) +{ + GNUNET_PEER_Id pi; + + pi = GNUNET_PEER_intern(oid); + GNUNET_PEER_change_rc(pi, -1); + return retrieve_tunnel_by_pi(pi, tid); +} + + /** * Destroy the path and free any allocated resources linked to it * @param t tunnel the path belongs to @@ -363,14 +539,15 @@ retrieve_client (struct GNUNET_SERVER_Client *client) { * @return GNUNET_OK on success */ static int -destroy_path(struct MESH_tunnel *t, struct Path *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; } +#if LATER /** * Destroy the peer_info and free any allocated resources linked to it * @param t tunnel the path belongs to @@ -378,12 +555,21 @@ destroy_path(struct MESH_tunnel *t, struct Path *p) { * @return GNUNET_OK on success */ static int -destroy_peer_info(struct MESH_tunnel *t, struct PeerInfo *pi) { +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_CONTAINER_DLL_remove(t->peers_head, t->peers_tail, pi); + GNUNET_CRYPTO_hash(&id, sizeof(struct GNUNET_PeerIdentity), &hash); + + GNUNET_CONTAINER_multihashmap_remove(peers, &hash, pi); GNUNET_free(pi); return GNUNET_OK; } +#endif + /** * Destroy the tunnel and free any allocated resources linked to it @@ -392,25 +578,34 @@ destroy_peer_info(struct MESH_tunnel *t, struct PeerInfo *pi) { * @return GNUNET_OK on success */ static int -destroy_tunnel(struct Client *c, struct MESH_tunnel *t) { - struct PeerInfo *pi; - struct Path *path; +destroy_tunnel(struct MeshTunnel *t) +{ +// struct MeshPath *path; + struct MeshClient *c; + GNUNET_HashCode hash; + int r; - for(pi = t->peers_head; pi != NULL; pi = t->peers_head) { - destroy_peer_info(t, pi); - } + if (NULL == t) return GNUNET_OK; + + c = t->client; - for(path = t->paths_head; path != NULL; path = t->paths_head) { - destroy_path(t, path); + GNUNET_CRYPTO_hash(&t->id, sizeof(struct MESH_TunnelID), &hash); + if(GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(tunnels, &hash, t)) { + r = GNUNET_SYSERR; } - GNUNET_CONTAINER_DLL_remove(c->tunnels_head, c->tunnels_tail, t); + GNUNET_CRYPTO_hash(&t->local_tid, sizeof(MESH_TunnelNumber), &hash); + if(GNUNET_YES != + GNUNET_CONTAINER_multihashmap_remove(c->tunnels, &hash, t)) + { + r = GNUNET_SYSERR; + } GNUNET_free(t); - return GNUNET_OK; + return r; } /******************************************************************************/ -/******************** MESH NETWORK HANDLERS **************************/ +/**************** MESH NETWORK HANDLER HELPERS ***********************/ /******************************************************************************/ /** @@ -425,56 +620,92 @@ destroy_tunnel(struct Client *c, struct MESH_tunnel *t) { * @return number of bytes written to buf */ static size_t -send_core_create_path_for_peer (void *cls, size_t size, void *buf) { - size_t size_needed; - struct PeerInfo *peer_info; +send_core_create_path_for_peer (void *cls, size_t size, void *buf) +{ + struct MeshPeerInfo *peer_info = cls; struct GNUNET_MESH_ManipulatePath *msg; - struct Path *p; - struct GNUNET_PeerIdentity peer_id; + struct MeshPath *p; struct GNUNET_PeerIdentity *peer_ptr; + struct GNUNET_PeerIdentity id; + size_t size_needed; int i; - if(0 == size && NULL == buf) { - // TODO retry? cancel? + if (0 == size && NULL == buf) { + 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 PeerInfo *)cls; - peer_info->dhtget = NULL; - p = peer_info->t->paths_head; - while(NULL != p) { - if(p->peers[p->length-1] == peer_info->id) { + p = peer_info->path; + while (NULL != p) { + if (p->in_use) { break; } - if(p != peer_info->t->paths_tail) { - p = p->next; - } else { - // TODO ERROR Path not found - } + p = p->next; } + if (p == NULL) return 0; // TODO Notify ERROR Path not found size_needed = sizeof(struct GNUNET_MESH_ManipulatePath) + p->length * sizeof(struct GNUNET_PeerIdentity); - if(size < size_needed) { + if (size < size_needed) { // TODO retry? cancel? return 0; } 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)); + for (i = 0; i < p->length; i++) { + 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 + * @param size Size in the buffer + * @param buf Memory where to put the data to transmit + * @return Size of data put in buffer + */ +static size_t +send_p2p_tunnel_destroy(void *cls, size_t size, void *buf) +{ + struct MeshTunnel *t = cls; + struct MeshClient *c; + struct GNUNET_MESH_TunnelMessage *msg; + + c = t->client; + msg = buf; + msg->header.type = htons(GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY); /*FIXME*/ + msg->header.size = htons(sizeof(struct GNUNET_MESH_TunnelMessage)); + msg->tunnel_id = htonl(t->id.tid); + + destroy_tunnel(c, t); + return sizeof(struct GNUNET_MESH_TunnelMessage); +} +#endif + + +/******************************************************************************/ +/******************** MESH NETWORK HANDLERS **************************/ +/******************************************************************************/ + /** * Core handler for path creation @@ -495,14 +726,102 @@ 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; } + /** * Core handler for mesh network traffic * @@ -520,7 +839,7 @@ handle_mesh_network_traffic (void *cls, const struct GNUNET_TRANSPORT_ATS_Information *atsi) { - if(GNUNET_MESSAGE_TYPE_MESH_DATA_GO == ntohs(message->type)) { + if (GNUNET_MESSAGE_TYPE_MESH_DATA_GO == ntohs(message->type)) { /* Retransmit to next in path of tunnel identified by message */ return GNUNET_OK; } else { /* GNUNET_MESSAGE_TYPE_MESH_DATA_BACK */ @@ -529,6 +848,7 @@ handle_mesh_network_traffic (void *cls, } } + /** * Functions to handle messages from core */ @@ -542,13 +862,29 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { /******************************************************************************/ -/********************* MESH LOCAL HANDLES **************************/ +/**************** 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 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 @@ -557,28 +893,59 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { * @return number of bytes written to buf */ static size_t -notify_client_connection_failure (void *cls, size_t size, void *buf) { +notify_client_connection_failure (void *cls, size_t size, void *buf) +{ int size_needed; - struct PeerInfo *peer_info; + struct MeshPeerInfo *peer_info; struct GNUNET_MESH_PeerControl *msg; struct GNUNET_PeerIdentity id; - if(0 == size && NULL == buf) { + if (0 == size && NULL == buf) { // TODO retry? cancel? return 0; } size_needed = sizeof(struct GNUNET_MESH_PeerControl); - peer_info = (struct PeerInfo *) cls; + peer_info = (struct MeshPeerInfo *) cls; msg = (struct GNUNET_MESH_PeerControl *) buf; msg->header.size = htons(sizeof(struct GNUNET_MESH_PeerControl)); msg->header.type = htons(GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DISCONNECTED); - msg->tunnel_id = htonl(peer_info->t->tid); +// msg->tunnel_id = htonl(peer_info->t->tid); GNUNET_PEER_resolve(peer_info->id, &id); memcpy(&msg->peer, &id, sizeof(struct GNUNET_PeerIdentity)); 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; +} /** @@ -607,58 +974,65 @@ dht_get_response_handler(void *cls, size_t size, const void *data) { - struct PeerInfo *peer_info; - struct MESH_tunnel *t; - struct Path *p; + struct MeshPeerInfo *peer_info = cls; + struct MeshPath *p; + struct GNUNET_PeerIdentity pi; int i; - peer_info = (struct PeerInfo *)cls; - t = peer_info->t; - - 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_relative_get_forever(), - ¬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 Path)); - 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 = GNUNET_malloc(sizeof(struct MeshPath)); + for (i = 0; get_path[i] != NULL; i++); + for (i--; i >= 0; i--) { p->peers = GNUNET_realloc(p->peers, sizeof(GNUNET_PEER_Id) * (p->length + 1)); p->peers[p->length] = GNUNET_PEER_intern(get_path[i]); p->length++; } - for(i = 0; put_path[i] != NULL; i++); - for(i--; i >= 0; i--) { + for (i = 0; put_path[i] != NULL; i++); + for (i--; i >= 0; i--) { p->peers = GNUNET_realloc(p->peers, sizeof(GNUNET_PEER_Id) * (p->length + 1)); 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, - GNUNET_TIME_relative_get_forever(), + GNUNET_TIME_UNIT_FOREVER_REL, get_path[1], sizeof(struct GNUNET_MESH_ManipulatePath) + (p->length * sizeof (struct GNUNET_PeerIdentity)), &send_core_create_path_for_peer, - peer_info - ); + peer_info); + GNUNET_SCHEDULER_add_delayed(REFRESH_PATH_TIME, &path_refresh, peer_info); return; } + +/******************************************************************************/ +/********************* MESH LOCAL HANDLES **************************/ +/******************************************************************************/ + + /** * Handler for client disconnection * @@ -669,28 +1043,38 @@ dht_get_response_handler(void *cls, static void handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) { - struct Client *c, *next; - struct MESH_tunnel *t; + struct MeshClient *c; + struct MeshClient *next; - c = clients_head; - while(NULL != c) { + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + "client disconnected\n"); + c = clients; + while (NULL != c) { if (c->handle == client) { - GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c); - while (NULL != (t = c->tunnels_head)) { - destroy_tunnel(c, t); - } - GNUNET_free (c->messages_subscribed); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + " 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; } - if(c == clients_head) return; /* Tail already processed? */ } + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + " done!\n"); return; } + /** * Handler for new clients * @@ -703,36 +1087,54 @@ handle_local_new_client (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - struct Client *c; - unsigned int payload_size; + struct GNUNET_MESH_ClientConnect *cc_msg; + struct MeshClient *c; + unsigned int size; + uint16_t types; + uint16_t apps; + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "new client connected\n"); /* Check data sanity */ - payload_size = message->size - sizeof(struct GNUNET_MessageHeader); - if (0 != payload_size % sizeof(GNUNET_MESH_ApplicationType)) { + size = ntohs(message->size) - sizeof(struct GNUNET_MESH_ClientConnect); + cc_msg = (struct GNUNET_MESH_ClientConnect *) message; + types = ntohs(cc_msg->types); + apps = ntohs(cc_msg->applications); + if (size != + types * sizeof(uint16_t) + apps * sizeof(GNUNET_MESH_ApplicationType)) + { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } /* Create new client structure */ - c = GNUNET_malloc(sizeof(struct Client)); + c = GNUNET_malloc(sizeof(struct MeshClient)); c->handle = client; - c->tunnels_head = NULL; - c->tunnels_tail = NULL; - if(payload_size != 0) { - c->messages_subscribed = GNUNET_malloc(payload_size); - memcpy(c->messages_subscribed, &message[1], payload_size); - } else { - c->messages_subscribed = NULL; + if (types != 0) { + c->type_counter = types; + c->types = GNUNET_malloc(types * sizeof(uint16_t)); + memcpy(c->types, &message[1], types * sizeof(uint16_t)); } - c->subscription_counter = payload_size/sizeof(GNUNET_MESH_ApplicationType); + if (apps != 0) { + c->app_counter = apps; + c->apps = GNUNET_malloc(apps * sizeof(GNUNET_MESH_ApplicationType)); + memcpy(c->apps, + &message[1] + types * sizeof(uint16_t), + apps * sizeof(GNUNET_MESH_ApplicationType)); + } + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, + " client has %u+%u subscriptions\n", + c->type_counter, + c->app_counter); - /* Insert new client in DLL */ - GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, c); + GNUNET_CONTAINER_DLL_insert(clients, clients_tail, c); + c->tunnels = GNUNET_CONTAINER_multihashmap_create(32); GNUNET_SERVER_receive_done(client, GNUNET_OK); + } + /** * Handler for requests of new tunnels * @@ -745,64 +1147,73 @@ handle_local_tunnel_create (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - struct GNUNET_MESH_TunnelMessage *tunnel_msg; - struct MESH_tunnel *t; - struct Client *c; + struct GNUNET_MESH_TunnelMessage *t_msg; + struct MeshTunnel *t; + struct MeshClient *c; + GNUNET_HashCode hash; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } /* Message sanity check */ - if(sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { + if (sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - tunnel_msg = (struct GNUNET_MESH_TunnelMessage *) message; + t_msg = (struct GNUNET_MESH_TunnelMessage *) message; /* Sanity check for tunnel numbering */ - if(0 == (ntohl(tunnel_msg->tunnel_id) & 0x80000000)) { + if (0 == (ntohl(t_msg->tunnel_id) & GNUNET_MESH_LOCAL_TUNNEL_ID_MARK)) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } /* Sanity check for duplicate tunnel IDs */ - t = c->tunnels_head; - while(NULL != t) { - if(t->tid == ntohl(tunnel_msg->tunnel_id)) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - if(t == c->tunnels_tail) break; - t = t->next; + if(NULL != retrieve_tunnel_by_local_id(c, ntohl(t_msg->tunnel_id))) { + GNUNET_break(0); + GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); + return; } - /* FIXME: calloc? Is NULL != 0 on any platform? */ - t = GNUNET_malloc(sizeof(struct MESH_tunnel)); - t->tid = ntohl(tunnel_msg->tunnel_id); - t->oid = myid; - t->peers_ready = 0; - t->peers_total = 0; - t->peers_head = NULL; - t->peers_tail = NULL; - t->paths_head = NULL; - t->paths_tail = NULL; - t->in_head = NULL; - t->in_tail = NULL; - t->out_head = NULL; - t->out_tail = NULL; + + t = GNUNET_malloc(sizeof(struct MeshTunnel)); + 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_CONTAINER_DLL_insert(c->tunnels_head, c->tunnels_tail, t); + GNUNET_CRYPTO_hash(&t->local_tid, sizeof(MESH_TunnelNumber), &hash); + if (GNUNET_OK != + GNUNET_CONTAINER_multihashmap_put(c->tunnels, &hash, t, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) + { + GNUNET_break(0); + GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); + return; + } + + 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_break(0); + GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); + return; + } GNUNET_SERVER_receive_done(client, GNUNET_OK); return; } + /** * Handler for requests of deleting tunnels * @@ -816,18 +1227,20 @@ handle_local_tunnel_destroy (void *cls, const struct GNUNET_MessageHeader *message) { struct GNUNET_MESH_TunnelMessage *tunnel_msg; - struct Client *c; - struct MESH_tunnel *t; - MESH_TunnelID tid; + struct MeshClient *c; + struct MeshTunnel *t; + MESH_TunnelNumber tid; + GNUNET_HashCode hash; + /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } /* Message sanity check */ - if(sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { + if (sizeof(struct GNUNET_MESH_TunnelMessage) != ntohs(message->size)) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -835,31 +1248,24 @@ handle_local_tunnel_destroy (void *cls, tunnel_msg = (struct GNUNET_MESH_TunnelMessage *) message; - /* Tunnel exists? */ + /* Retrieve tunnel */ tid = ntohl(tunnel_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - t = t->next; - } - destroy_tunnel(c, t); + /* Remove from local id hashmap */ + GNUNET_CRYPTO_hash(&tid, sizeof(MESH_TunnelNumber), &hash); + t = GNUNET_CONTAINER_multihashmap_get(c->tunnels, &hash); + GNUNET_CONTAINER_multihashmap_remove(c->tunnels, &hash, t); + /* Remove from global id hashmap */ + GNUNET_CRYPTO_hash(&t->id, sizeof(struct MESH_TunnelID), &hash); + GNUNET_CONTAINER_multihashmap_remove(tunnels, &hash, t); + +// notify_tunnel_destroy(t); GNUNET_SERVER_receive_done(client, GNUNET_OK); return; } + /** * Handler for connection requests to new peers * @@ -873,16 +1279,14 @@ handle_local_connect_add (void *cls, const struct GNUNET_MessageHeader *message) { struct GNUNET_MESH_PeerControl *peer_msg; - struct Client *c; - struct MESH_tunnel *t; - MESH_TunnelID tid; - struct PeerInfo *peer_info; - - GNUNET_HashCode key; + struct MeshClient *c; + struct MeshTunnel *t; + MESH_TunnelNumber tid; + struct MeshPeerInfo *peer_info; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -890,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; @@ -898,45 +1304,29 @@ handle_local_connect_add (void *cls, /* Tunnel exists? */ tid = ntohl(peer_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { + t = retrieve_tunnel_by_local_id(c, tid); + if (NULL == t) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - t = t->next; - } /* Does client own tunnel? */ - if(t->client->handle != client) { + if (t->client->handle != client) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - /* Ok, add peer to tunnel */ - peer_info = (struct PeerInfo *) GNUNET_malloc(sizeof(struct PeerInfo)); - peer_info->id = GNUNET_PEER_intern(&peer_msg->peer); - peer_info->state = MESH_PEER_SEARCHING; - peer_info->t = t; t->peers_total++; - GNUNET_CONTAINER_DLL_insert(t->peers_head, t->peers_tail, peer_info); - /* Start DHT search */ - GNUNET_CRYPTO_hash (&peer_msg->peer, - sizeof(struct GNUNET_PeerIdentity), - &key); - peer_info->dhtget = GNUNET_DHT_get_start(dht_handle, - GNUNET_TIME_relative_get_forever(), + 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 */ @@ -945,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; @@ -964,24 +1355,22 @@ handle_local_connect_del (void *cls, const struct GNUNET_MessageHeader *message) { struct GNUNET_MESH_PeerControl *peer_msg; - struct Client *c; - struct MESH_tunnel *t; - struct Path *p; - struct Path *aux_path; - MESH_TunnelID tid; + struct MeshClient *c; + struct MeshTunnel *t; + MESH_TunnelNumber tid; GNUNET_PEER_Id peer_id; - struct PeerInfo *peer_info; - struct PeerInfo *aux_peer_info; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } 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; @@ -989,25 +1378,15 @@ handle_local_connect_del (void *cls, /* Tunnel exists? */ tid = ntohl(peer_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { + t = retrieve_tunnel_by_local_id(c, tid); + if (NULL == t) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - t = t->next; - } /* Does client own tunnel? */ - if(t->client->handle != client) { + if (t->client->handle != client) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1016,40 +1395,8 @@ 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; - } - if(p == t->paths_head) { - break; - } - } - - /*Delete peer info */ - peer_info = t->peers_head; - while(peer_info != NULL) { - if(peer_info->id == peer_id) { - GNUNET_CONTAINER_DLL_remove(t->peers_head, - t->peers_tail, - peer_info); - aux_peer_info = peer_info; - peer_info = peer_info->next; - GNUNET_free(aux_peer_info); - } else { - peer_info = peer_info->next; - } - if(peer_info == t->peers_head) { - break; - } - } + /* FIXME Delete paths */ + /* FIXME Delete peer info */ GNUNET_PEER_change_rc(peer_id, -1); @@ -1071,13 +1418,13 @@ handle_local_connect_by_type (void *cls, const struct GNUNET_MessageHeader *message) { struct GNUNET_MESH_ConnectPeerByType *connect_msg; - MESH_TunnelID tid; + MESH_TunnelNumber tid; GNUNET_MESH_ApplicationType application; - struct Client *c; - struct MESH_tunnel *t; + struct MeshClient *c; + struct MeshTunnel *t; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1085,7 +1432,9 @@ handle_local_connect_by_type (void *cls, connect_msg = (struct GNUNET_MESH_ConnectPeerByType *)message; /* Sanity check for message size */ - if(sizeof(struct GNUNET_MESH_PeerControl) != ntohs(connect_msg->header.size)) { + if (sizeof(struct GNUNET_MESH_PeerControl) != + ntohs(connect_msg->header.size)) + { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1093,25 +1442,15 @@ handle_local_connect_by_type (void *cls, /* Tunnel exists? */ tid = ntohl(connect_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { + t = retrieve_tunnel_by_local_id(c, tid); + if (NULL == t) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - t = t->next; - } /* Does client own tunnel? */ - if(t->client->handle != client) { + if (t->client->handle != client) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1138,20 +1477,22 @@ handle_local_network_traffic (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - struct Client *c; - struct MESH_tunnel *t; + struct MeshClient *c; + struct MeshTunnel *t; struct GNUNET_MESH_Data *data_msg; - MESH_TunnelID tid; + MESH_TunnelNumber tid; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } data_msg = (struct GNUNET_MESH_Data *)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; @@ -1159,25 +1500,15 @@ handle_local_network_traffic (void *cls, /* Tunnel exists? */ tid = ntohl(data_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { + t = retrieve_tunnel_by_local_id(c, tid); + if (NULL == t) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - t = t->next; - } /* Does client own tunnel? */ - if(t->client->handle != client) { + if (t->client->handle != client) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1201,20 +1532,22 @@ handle_local_network_traffic_bcast (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { - struct Client *c; - struct MESH_tunnel *t; + struct MeshClient *c; + struct MeshTunnel *t; struct GNUNET_MESH_DataBroadcast *data_msg; - MESH_TunnelID tid; + MESH_TunnelNumber tid; /* Sanity check for client registration */ - if(NULL == (c = retrieve_client(client))) { + if (NULL == (c = retrieve_client(client))) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } 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; @@ -1222,25 +1555,15 @@ handle_local_network_traffic_bcast (void *cls, /* Tunnel exists? */ tid = ntohl(data_msg->tunnel_id); - if(NULL == (t = c->tunnels_head)) { + t = retrieve_tunnel_by_local_id(c, tid); + if (NULL == t) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; } - while(NULL != t) { - if(t->tid == tid) { - break; - } - if(t == c->tunnels_tail) { - GNUNET_break(0); - GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); - return; - } - t = t->next; - } /* Does client own tunnel? */ - if(t->client->handle != client) { + if (t->client->handle != client) { GNUNET_break(0); GNUNET_SERVER_receive_done(client, GNUNET_SYSERR); return; @@ -1294,6 +1617,8 @@ core_init (void *cls, const struct GNUNET_PeerIdentity *identity, const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Core init\n"); core_handle = server; myid = GNUNET_PEER_intern(identity); return; @@ -1311,6 +1636,23 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_TRANSPORT_ATS_Information *atsi) { +// GNUNET_PEER_Id pid; + struct MeshPeerInfo *peer_info; + struct MeshPath *path; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer connected\n"); + 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; } @@ -1325,13 +1667,46 @@ 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 ****************************/ /******************************************************************************/ +/** + * Task run during shutdown. + * + * @param cls unused + * @param tc unused + */ +static void +shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "shutting down\n"); + if (core_handle != NULL) { + GNUNET_CORE_disconnect (core_handle); + core_handle = NULL; + } + if (dht_handle != NULL) { + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "shut down\n"); +} + /** * Process mesh requests. * @@ -1344,11 +1719,12 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, const struct GNUNET_CONFIGURATION_Handle *c) { - + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "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 */ @@ -1359,15 +1735,26 @@ run (void *cls, NULL, /* Don't notify about all outbound messages */ GNUNET_NO, /* For header-only out notification */ core_handlers); /* Register these handlers */ - if (core_handle == NULL) { GNUNET_break(0); } - - dht_handle = GNUNET_DHT_connect(c, 100); /* FIXME ht len correct size? */ + dht_handle = GNUNET_DHT_connect(c, 64); if (dht_handle == NULL) { GNUNET_break(0); } + next_tid = 0; + + 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"); } /** @@ -1388,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; - } +}