X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fgnunet-service-mesh.c;h=63700504860f550761679d45ac7bb822cfb332f4;hb=7c6b8edcc300e1be76803a9b80bfd720ddf0283a;hp=1ec2371dc46e9680c722a0e522f98510fb9829f4;hpb=a540dba8d2abd13ba6552b0d6081c4c11e95eb31;p=oweals%2Fgnunet.git diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 1ec2371dc..637005048 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -41,6 +41,7 @@ * - speed requirement specification (change?) in mesh API -- API call * - add ping message * - relay corking down to core + * - set ttl relative to tree depth */ #include "platform.h" @@ -68,6 +69,11 @@ #define UNACKNOWLEDGED_WAIT GNUNET_TIME_relative_multiply(\ GNUNET_TIME_UNIT_SECONDS,\ 2) +#define DEFAULT_TTL 64 + +#define MESH_DEBUG_DHT GNUNET_NO + + /******************************************************************************/ /************************ DATA STRUCTURES ****************************/ @@ -76,39 +82,50 @@ /** FWD declaration */ struct MeshPeerInfo; + +/** + * Struct representing a piece of data being sent to other peers + */ +struct MeshData +{ + /** Tunnel it belongs to. */ + struct MeshTunnel *t; + + /** In case of a multicast, task to allow a client to send more data if + * some neighbor is too slow. */ + GNUNET_SCHEDULER_TaskIdentifier *task; + + /** How many remaining neighbors we need to send this to. */ + unsigned int *reference_counter; + + /** Size of the data. */ + size_t data_len; + + /** Data itself */ + void *data; +}; + + /** * Struct containing all info possibly needed to build a package when called * back by core. */ -struct MeshDataDescriptor +struct MeshTransmissionDescriptor { /** ID of the tunnel this packet travels in */ struct MESH_TunnelID *origin; - /** Data itself */ - void *data; - - /** Client that asked for the transmission, if any */ - struct GNUNET_SERVER_Client *client; - /** Who was this message being sent to */ struct MeshPeerInfo *peer; /** Ultimate destination of the packet */ GNUNET_PEER_Id destination; - /** Number of identical messages sent to different hops (multicast) */ - unsigned int *copies; - /** Which handler was used to request the transmission */ unsigned int handler_n; - /** Size of the data */ - size_t size; - - /** Used to allow a client send more traffic to the service after a - * previous packet was tried to be sent to a neighbor and couldn't */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + /** Data descriptor */ + struct MeshData* mesh_data; }; @@ -259,6 +276,16 @@ struct MeshTunnel */ MESH_TunnelNumber local_tid; + /** + * Local tunnel number for local destination clients + */ + MESH_TunnelNumber local_tid_dest; + + /** + * ID of the last multicast packet seen/sent. + */ + uint32_t mid; + /** * Last time the tunnel was used */ @@ -340,7 +367,7 @@ struct MeshPathInfo * Path itself */ struct MeshPeerPath *path; - + /** * Position in peer's transmit queue */ @@ -394,7 +421,7 @@ struct MeshClient /************************ DEBUG FUNCTIONS ****************************/ /******************************************************************************/ - +#if MESH_DEBUG /** * GNUNET_SCHEDULER_Task for printing a message after some operation is done * @param cls string to print @@ -411,7 +438,7 @@ mesh_debug (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", s); } - +#endif /******************************************************************************/ /*********************** GLOBAL VARIABLES ****************************/ @@ -444,6 +471,11 @@ static struct GNUNET_CONTAINER_MultiHashMap *peers; */ static struct GNUNET_CORE_Handle *core_handle; +/** + * Handle to communicate with transport + */ +// static struct GNUNET_TRANSPORT_Handle *transport_handle; + /** * Handle to use DHT */ @@ -472,7 +504,7 @@ static struct GNUNET_PeerIdentity my_full_id; /** * Own private key */ -static struct GNUNET_CRYPTO_RsaPrivateKey* my_private_key; +static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key; /** * Own public key. @@ -539,12 +571,9 @@ static int announce_application (void *cls, const GNUNET_HashCode * key, void *value) { /* FIXME are hashes in multihash map equal on all aquitectures? */ - GNUNET_DHT_put (dht_handle, - key, - 10U, + GNUNET_DHT_put (dht_handle, key, 10U, GNUNET_DHT_RO_RECORD_ROUTE | - GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, - GNUNET_BLOCK_TYPE_TEST, + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, GNUNET_BLOCK_TYPE_TEST, sizeof (struct GNUNET_PeerIdentity), (const char *) &my_full_id, #if MESH_DEBUG @@ -573,13 +602,17 @@ announce_applications (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) announce_applications_task = GNUNET_SCHEDULER_NO_TASK; return; } +#if MESH_DEBUG_DHT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Starting PUT for apps\n"); +#endif GNUNET_CONTAINER_multihashmap_iterate (applications, &announce_application, NULL); announce_applications_task = GNUNET_SCHEDULER_add_delayed (APP_ANNOUNCE_TIME, &announce_applications, cls); +#if MESH_DEBUG_DHT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Finished PUT for apps\n"); +#endif return; } @@ -602,19 +635,20 @@ announce_id (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * - Set data expiration in function of X * - Adapt X to churn */ +#if MESH_DEBUG_DHT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n", - GNUNET_h2s_full (&my_full_id.hashPubKey)); + GNUNET_i2s (&my_full_id)); +#endif GNUNET_DHT_put (dht_handle, /* DHT handle */ &my_full_id.hashPubKey, /* Key to use */ 10U, /* Replication level */ - GNUNET_DHT_RO_RECORD_ROUTE | - GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, /* DHT options */ + GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, /* DHT options */ GNUNET_BLOCK_TYPE_TEST, /* Block type */ - sizeof(my_full_id), /* Size of the data */ - (char *)&my_full_id, /* Data itself */ + sizeof (my_full_id), /* Size of the data */ + (char *) &my_full_id, /* Data itself */ GNUNET_TIME_absolute_get_forever (), /* Data expiration */ GNUNET_TIME_UNIT_FOREVER_REL, /* Retry time */ -#if MESH_DEBUG +#if MESH_DEBUG_DHT &mesh_debug, "DHT_put for id completed"); #else NULL, /* Continuation */ @@ -643,8 +677,8 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp, const struct GNUNET_PeerIdentity *get_path, unsigned int get_path_length, const struct GNUNET_PeerIdentity *put_path, - unsigned int put_path_length, - enum GNUNET_BLOCK_Type type, size_t size, const void *data); + unsigned int put_path_length, enum GNUNET_BLOCK_Type type, + size_t size, const void *data); /******************************************************************************/ @@ -693,15 +727,30 @@ client_is_subscribed (uint16_t message_type, struct MeshClient *c) return GNUNET_CONTAINER_multihashmap_contains (c->types, &hc); } + +/** + * Allow a client to send more data after transmitting a multicast message + * which some neighbor has not yet accepted altough a reasonable time has + * passed. + * + * @param cls Closure (DataDescriptor containing the task identifier) + * @param tc Task Context + */ static void -client_allow_send(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +client_allow_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct MeshDataDescriptor *info = cls; + struct MeshData *mdata = cls; if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason) return; - info->timeout_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_SERVER_receive_done(info->client, GNUNET_OK); +#if MESH_DEBUG + GNUNET_assert (NULL != mdata->reference_counter); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "MESH: CLIENT ALLOW SEND DESPITE %u COPIES PENDING\n", + mdata->reference_counter); +#endif + *(mdata->task) = GNUNET_SCHEDULER_NO_TASK; + GNUNET_SERVER_receive_done (mdata->t->client->handle, GNUNET_OK); } @@ -729,8 +778,7 @@ tunnel_get (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid); * 0 if the tunnel remained unaffected. */ static GNUNET_PEER_Id -tunnel_notify_connection_broken (struct MeshTunnel *t, - GNUNET_PEER_Id p1, +tunnel_notify_connection_broken (struct MeshTunnel *t, GNUNET_PEER_Id p1, GNUNET_PEER_Id p2); @@ -738,6 +786,7 @@ tunnel_notify_connection_broken (struct MeshTunnel *t, * Send the message to all clients that have subscribed to its type * * @param msg Pointer to the message itself + * @param payload Pointer to the payload of the message. * @return number of clients this message was sent to */ static unsigned int @@ -750,57 +799,63 @@ send_subscribed_clients (const struct GNUNET_MessageHeader *msg, MESH_TunnelNumber *tid; unsigned int count; uint16_t type; - char cbuf[htons(msg->size)]; + char cbuf[htons (msg->size)]; +#if MESH_DEBUG GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Sending to clients...\n"); type = ntohs (payload->type); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: message of type %u\n", type); +#endif - memcpy (cbuf, msg, sizeof(cbuf)); - switch (htons(msg->type)) + memcpy (cbuf, msg, sizeof (cbuf)); + switch (htons (msg->type)) { struct GNUNET_MESH_Unicast *uc; struct GNUNET_MESH_Multicast *mc; struct GNUNET_MESH_ToOrigin *to; - case GNUNET_MESSAGE_TYPE_MESH_UNICAST: - uc = (struct GNUNET_MESH_Unicast *) cbuf; - tid = &uc->tid; - oid = &uc->oid; - break; - case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: - mc = (struct GNUNET_MESH_Multicast *) cbuf; - tid = &mc->tid; - oid = &mc->oid; - break; - case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: - to = (struct GNUNET_MESH_ToOrigin *) cbuf; - tid = &to->tid; - oid = &to->oid; - break; - default: - GNUNET_break (0); - return 0; + case GNUNET_MESSAGE_TYPE_MESH_UNICAST: + uc = (struct GNUNET_MESH_Unicast *) cbuf; + tid = &uc->tid; + oid = &uc->oid; + break; + case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: + mc = (struct GNUNET_MESH_Multicast *) cbuf; + tid = &mc->tid; + oid = &mc->oid; + break; + case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: + to = (struct GNUNET_MESH_ToOrigin *) cbuf; + tid = &to->tid; + oid = &to->oid; + break; + default: + GNUNET_break (0); + return 0; } - t = tunnel_get (oid, ntohl(*tid)); + t = tunnel_get (oid, ntohl (*tid)); if (NULL == t) { GNUNET_break (0); return 0; } - *tid = htonl (t->local_tid); + // FIXME proper client differentiation mechanism required + if (htons (msg->type) == GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN) + *tid = htonl (t->local_tid); + else + *tid = htonl (t->local_tid_dest != 0 ? t->local_tid_dest : t->local_tid); for (count = 0, c = clients; c != NULL; c = c->next) { +#if MESH_DEBUG GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: client %u\n", c->id); +#endif if (client_is_subscribed (type, c)) { count++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: sending\n"); - GNUNET_SERVER_notification_context_unicast ( - nc, - c->handle, - (struct GNUNET_MessageHeader *) cbuf, - GNUNET_YES); + GNUNET_SERVER_notification_context_unicast (nc, c->handle, + (struct GNUNET_MessageHeader + *) cbuf, GNUNET_YES); } } return count; @@ -810,7 +865,7 @@ send_subscribed_clients (const struct GNUNET_MessageHeader *msg, /** * Notify the client that owns the tunnel that a peer has connected to it * (the requested path to it has been confirmed). - * + * * @param t Tunnel whose owner to notify * @param id Short id of the peer that has connected */ @@ -823,26 +878,26 @@ send_client_peer_connected (const struct MeshTunnel *t, const GNUNET_PEER_Id id) pc.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl)); pc.tunnel_id = htonl (t->local_tid); GNUNET_PEER_resolve (id, &pc.peer); - GNUNET_SERVER_notification_context_unicast (nc, t->client->handle, - &pc.header, GNUNET_NO); + GNUNET_SERVER_notification_context_unicast (nc, t->client->handle, &pc.header, + GNUNET_NO); } /** * Notify all clients (not depending on registration status) that the incoming * tunnel is no longer valid. - * + * * @param t Tunnel that was destroyed. */ static void send_clients_tunnel_destroy (struct MeshTunnel *t) { - struct GNUNET_MESH_TunnelMessage msg; + struct GNUNET_MESH_TunnelMessage msg; - msg.header.size = htons (sizeof (msg)); - msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY); - msg.tunnel_id = htonl (t->local_tid); - GNUNET_SERVER_notification_context_broadcast(nc, &msg.header, GNUNET_NO); + msg.header.size = htons (sizeof (msg)); + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY); + msg.tunnel_id = htonl (t->local_tid); + GNUNET_SERVER_notification_context_broadcast (nc, &msg.header, GNUNET_NO); } @@ -877,19 +932,50 @@ static size_t send_core_data_multicast (void *cls, size_t size, void *buf); +/** + * Decrements the reference counter and frees all resources if needed + * + * @param dd Data Descriptor used in a multicast message. Freed if needed. + */ +static void +data_descriptor_decrement_multicast (struct MeshData *mesh_data) +{ + /* Make sure it's a multicast packet */ + GNUNET_assert (NULL != mesh_data->reference_counter); + + if (0 == --(*(mesh_data->reference_counter))) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Last copy!\n"); + if (NULL != mesh_data->task) + { + if (GNUNET_SCHEDULER_NO_TASK != *(mesh_data->task)) + { + GNUNET_SCHEDULER_cancel (*(mesh_data->task)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: notifying client...\n"); + GNUNET_SERVER_receive_done (mesh_data->t->client->handle, GNUNET_OK); + } + GNUNET_free (mesh_data->task); + } + GNUNET_free (mesh_data->reference_counter); + GNUNET_free (mesh_data->data); + GNUNET_free (mesh_data); + } +} + + /** * Cancel a core transmission that was already requested and free all resources * associated to the request. - * + * * @param peer PeeInfo of the peer whose transmission is cancelled. * @param i Position of the transmission to be cancelled. */ static void -peer_info_cancel_transmission(struct MeshPeerInfo *peer, unsigned int i) +peer_info_cancel_transmission (struct MeshPeerInfo *peer, unsigned int i) { if (NULL != peer->core_transmit[i]) { - struct MeshDataDescriptor *dd; + struct MeshTransmissionDescriptor *dd; struct MeshPathInfo *path_info; #if MESH_DEBUG @@ -899,40 +985,34 @@ peer_info_cancel_transmission(struct MeshPeerInfo *peer, unsigned int i) GNUNET_PEER_resolve (peer->id, &id); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Cancelling data transmission at %s [%u]\n", - GNUNET_i2s (&id), - i); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: message type %u\n", + GNUNET_i2s (&id), i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: message type %u\n", peer->types[i]); } #endif /* TODO: notify that tranmission has failed */ switch (peer->types[i]) { - case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: - case GNUNET_MESSAGE_TYPE_MESH_UNICAST: - case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type payload\n"); - dd = peer->infos[i]; - if (0 == --(*dd->copies)) - { - GNUNET_free (dd->copies); - GNUNET_free (dd->data); - } - break; - case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE: - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type create path\n"); - path_info = peer->infos[i]; - path_destroy(path_info->path); - break; - default: - GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type unknown!\n"); + case GNUNET_MESSAGE_TYPE_MESH_MULTICAST: + case GNUNET_MESSAGE_TYPE_MESH_UNICAST: + case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN: + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type payload\n"); + dd = peer->infos[i]; + data_descriptor_decrement_multicast (dd->mesh_data); + break; + case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE: + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type create path\n"); + path_info = peer->infos[i]; + path_destroy (path_info->path); + break; + default: + GNUNET_break (0); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type unknown!\n"); } GNUNET_CORE_notify_transmit_ready_cancel (peer->core_transmit[i]); peer->core_transmit[i] = NULL; GNUNET_free (peer->infos[i]); - } + } } @@ -955,7 +1035,7 @@ peer_info_transmit_slot (struct MeshPeerInfo *peer) { /* All positions are taken! Overwriting! */ GNUNET_break (0); - peer_info_cancel_transmission(peer, 0); + peer_info_cancel_transmission (peer, 0); return 0; } } @@ -1003,8 +1083,8 @@ peer_info_get_short (const GNUNET_PEER_Id peer) { struct GNUNET_PeerIdentity id; - GNUNET_PEER_resolve(peer, &id); - return peer_info_get(&id); + GNUNET_PEER_resolve (peer, &id); + return peer_info_get (&id); } @@ -1019,7 +1099,7 @@ peer_info_get_short (const GNUNET_PEER_Id peer) * @return always GNUNET_YES, to keep iterating */ static int -peer_info_delete_tunnel (void* cls, const GNUNET_HashCode* key, void* value) +peer_info_delete_tunnel (void *cls, const GNUNET_HashCode * key, void *value) { struct MeshTunnel *t = cls; struct MeshPeerInfo *peer = value; @@ -1027,9 +1107,8 @@ peer_info_delete_tunnel (void* cls, const GNUNET_HashCode* key, void* value) for (i = 0; i < peer->ntunnels; i++) { - if (0 == memcmp(&peer->tunnels[i]->id, - &t->id, - sizeof(struct MESH_TunnelID))) + if (0 == + memcmp (&peer->tunnels[i]->id, &t->id, sizeof (struct MESH_TunnelID))) { peer->ntunnels--; peer->tunnels[i] = peer->tunnels[peer->ntunnels]; @@ -1042,24 +1121,24 @@ peer_info_delete_tunnel (void* cls, const GNUNET_HashCode* key, void* value) /** - * Core callback to write a + * Core callback to write a * - * @param cls Closure (MeshDataDescriptor with data in "data" member). + * @param cls Closure (MeshTransmissionDescriptor with data in "data" member). * @param size Number of bytes available in buf. * @param buf Where the to write the message. - * + * * @return number of bytes written to buf */ static size_t send_core_data_raw (void *cls, size_t size, void *buf) { - struct MeshDataDescriptor *info = cls; + struct MeshTransmissionDescriptor *info = cls; struct GNUNET_MessageHeader *msg; size_t total_size; GNUNET_assert (NULL != info); - GNUNET_assert (NULL != info->data); - msg = (struct GNUNET_MessageHeader *) info->data; + GNUNET_assert (NULL != info->mesh_data); + msg = (struct GNUNET_MessageHeader *) info->mesh_data->data; total_size = ntohs (msg->size); if (total_size > size) @@ -1068,19 +1147,14 @@ send_core_data_raw (void *cls, size_t size, void *buf) GNUNET_PEER_resolve (info->peer->id, &id); info->peer->core_transmit[info->handler_n] = - GNUNET_CORE_notify_transmit_ready(core_handle, - 0, - 100, - GNUNET_TIME_UNIT_FOREVER_REL, - &id, - size, - &send_core_data_raw, - info); - return 0; + GNUNET_CORE_notify_transmit_ready (core_handle, 0, 100, + GNUNET_TIME_UNIT_FOREVER_REL, &id, + size, &send_core_data_raw, info); + return 0; } info->peer->core_transmit[info->handler_n] = NULL; memcpy (buf, msg, total_size); - GNUNET_free (info->data); + GNUNET_free (info->mesh_data); GNUNET_free (info); return total_size; } @@ -1090,37 +1164,54 @@ send_core_data_raw (void *cls, size_t size, void *buf) * Sends an already built message to a peer, properly registrating * all used resources. * - * @param message Message to send. + * @param message Message to send. Fucntion makes a copy of it. * @param peer Short ID of the neighbor whom to send the message. + * + * FIXME tunnel? */ static void send_message (const struct GNUNET_MessageHeader *message, const struct GNUNET_PeerIdentity *peer) { - struct MeshDataDescriptor *info; + struct MeshTransmissionDescriptor *info; struct MeshPeerInfo *neighbor; + struct MeshPeerPath *p; unsigned int i; size_t size; +// GNUNET_TRANSPORT_try_connect(); + size = ntohs (message->size); - info = GNUNET_malloc (sizeof (struct MeshDataDescriptor)); - info->data = GNUNET_malloc (size); - memcpy (info->data, message, size); + info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor)); + info->mesh_data = GNUNET_malloc (sizeof (struct MeshData)); + info->mesh_data->data = GNUNET_malloc (size); + memcpy (info->mesh_data->data, message, size); + info->mesh_data->data_len = size; neighbor = peer_info_get (peer); + for (p = neighbor->path_head; NULL != p; p = p->next) + { + if (2 == p->length) + { + break; + } + } + if (NULL == p) + { + GNUNET_break (0); + GNUNET_free (info->mesh_data->data); + GNUNET_free (info->mesh_data); + GNUNET_free (info); + return; + } i = peer_info_transmit_slot (neighbor); info->handler_n = i; info->peer = neighbor; neighbor->types[i] = GNUNET_MESSAGE_TYPE_MESH_UNICAST; neighbor->infos[i] = info; neighbor->core_transmit[i] = - GNUNET_CORE_notify_transmit_ready(core_handle, - 0, - 100, - GNUNET_TIME_UNIT_FOREVER_REL, - peer, - size, - &send_core_data_raw, - info); + GNUNET_CORE_notify_transmit_ready (core_handle, 0, 100, + GNUNET_TIME_UNIT_FOREVER_REL, peer, + size, &send_core_data_raw, info); } @@ -1128,14 +1219,13 @@ send_message (const struct GNUNET_MessageHeader *message, /** * Sends a CREATE PATH message for a path to a peer, properly registrating * all used resources. - * + * * @param peer PeerInfo of the final peer for whom this path is being created. * @param p Path itself. * @param t Tunnel for which the path is created. */ static void -send_create_path (struct MeshPeerInfo *peer, - struct MeshPeerPath *p, +send_create_path (struct MeshPeerInfo *peer, struct MeshPeerPath *p, struct MeshTunnel *t) { struct GNUNET_PeerIdentity id; @@ -1145,7 +1235,7 @@ send_create_path (struct MeshPeerInfo *peer, if (NULL == p) { - p = tree_get_path_to_peer(t->tree, peer->id); + p = tree_get_path_to_peer (t->tree, peer->id); if (NULL == p) { GNUNET_break (0); @@ -1159,50 +1249,44 @@ send_create_path (struct MeshPeerInfo *peer, } if (i >= p->length - 1) { - path_destroy(p); + path_destroy (p); GNUNET_break (0); return; } - GNUNET_PEER_resolve(p->peers[i + 1], &id); + GNUNET_PEER_resolve (p->peers[i + 1], &id); path_info = GNUNET_malloc (sizeof (struct MeshPathInfo)); path_info->path = p; path_info->t = t; - neighbor = peer_info_get(&id); + neighbor = peer_info_get (&id); path_info->peer = neighbor; - path_info->pos = peer_info_transmit_slot(neighbor); + path_info->pos = peer_info_transmit_slot (neighbor); neighbor->types[path_info->pos] = GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE; neighbor->infos[path_info->pos] = path_info; - neighbor->core_transmit[path_info->pos] = - GNUNET_CORE_notify_transmit_ready ( - core_handle, /* handle */ - 0, /* cork */ - 0, /* priority */ - GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ - &id, /* target */ - sizeof (struct GNUNET_MESH_ManipulatePath) - + (p->length * sizeof (struct GNUNET_PeerIdentity)), /*size */ - &send_core_create_path, /* callback */ - path_info); /* cls */ + neighbor->core_transmit[path_info->pos] = GNUNET_CORE_notify_transmit_ready (core_handle, /* handle */ + 0, /* cork */ + 0, /* priority */ + GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + &id, /* target */ + sizeof (struct GNUNET_MESH_ManipulatePath) + (p->length * sizeof (struct GNUNET_PeerIdentity)), /*size */ + &send_core_create_path, /* callback */ + path_info); /* cls */ } /** * Sends a DESTROY PATH message to free resources for a path in a tunnel - * + * * @param t Tunnel whose path to destroy. * @param destination Short ID of the peer to whom the path to destroy. */ static void send_destroy_path (struct MeshTunnel *t, GNUNET_PEER_Id destination) { - struct GNUNET_MESH_ManipulatePath *msg; - struct GNUNET_PeerIdentity *pi; struct MeshPeerPath *p; - unsigned int i; size_t size; - p = tree_get_path_to_peer(t->tree, destination); + p = tree_get_path_to_peer (t->tree, destination); if (NULL == p) { GNUNET_break (0); @@ -1210,16 +1294,23 @@ send_destroy_path (struct MeshTunnel *t, GNUNET_PEER_Id destination) } size = sizeof (struct GNUNET_MESH_ManipulatePath); size += p->length * sizeof (struct GNUNET_PeerIdentity); - msg = GNUNET_malloc (size); - msg->header.size = htons (size); - msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY); - msg->tid = htonl (t->id.tid); - pi = (struct GNUNET_PeerIdentity *) &msg[1]; - for (i = 0; i < p->length; i++) { - GNUNET_PEER_resolve(p->peers[i], &pi[i]); + struct GNUNET_MESH_ManipulatePath *msg; + struct GNUNET_PeerIdentity *pi; + char cbuf[size]; + unsigned int i; + + msg = (struct GNUNET_MESH_ManipulatePath *) cbuf; + msg->header.size = htons (size); + msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY); + msg->tid = htonl (t->id.tid); + pi = (struct GNUNET_PeerIdentity *) &msg[1]; + for (i = 0; i < p->length; i++) + { + GNUNET_PEER_resolve (p->peers[i], &pi[i]); + } + send_message (&msg->header, tree_get_first_hop (t->tree, destination)); } - send_message (&msg->header, path_get_first_hop(t->tree, destination)); path_destroy (p); } @@ -1227,7 +1318,7 @@ send_destroy_path (struct MeshTunnel *t, GNUNET_PEER_Id destination) /** * Try to establish a new connection to this peer. * Use the best path for the given tunnel. - * If the peer doesn't have any path to it yet, try to get one. + * If the peer doesn't have any path to it yet, try to get one. * If the peer already has some path, send a CREATE PATH towards it. * * @param peer PeerInfo of the peer. @@ -1241,51 +1332,75 @@ peer_info_connect (struct MeshPeerInfo *peer, struct MeshTunnel *t) if (NULL != peer->path_head) { - p = tree_get_path_to_peer(t->tree, peer->id); + p = tree_get_path_to_peer (t->tree, peer->id); + if (NULL == p) + { + GNUNET_break (0); + return; + } + if (p->length > 1) { - send_create_path(peer, p, t); + send_create_path (peer, p, t); } else { - path_destroy(p); - send_client_peer_connected(t, myid); + path_destroy (p); + send_client_peer_connected (t, myid); } } else if (NULL == peer->dhtget) { struct GNUNET_PeerIdentity id; - GNUNET_PEER_resolve(peer->id, &id); - path_info = GNUNET_malloc(sizeof(struct MeshPathInfo)); + GNUNET_PEER_resolve (peer->id, &id); + path_info = GNUNET_malloc (sizeof (struct MeshPathInfo)); path_info->peer = peer; path_info->t = t; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Starting DHT GET for peer %s\n", - GNUNET_i2s (&id)); + "MESH: Starting DHT GET for peer %s\n", GNUNET_i2s (&id)); peer->dhtgetcls = path_info; - peer->dhtget = - GNUNET_DHT_get_start(dht_handle, /* handle */ - GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ - GNUNET_BLOCK_TYPE_TEST, /* type */ - &id.hashPubKey, /* key to search */ - 4, /* replication level */ - GNUNET_DHT_RO_RECORD_ROUTE | - GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, - NULL, /* xquery */ - 0, /* xquery bits */ - &dht_get_id_handler, - path_info); + peer->dhtget = GNUNET_DHT_get_start (dht_handle, /* handle */ + GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */ + GNUNET_BLOCK_TYPE_TEST, /* type */ + &id.hashPubKey, /* key to search */ + 4, /* replication level */ + GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, /* xquery */ + 0, /* xquery bits */ + &dht_get_id_handler, path_info); } /* Otherwise, there is no path but the DHT get is already started. */ } +/** + * Task to delay the connection of a peer + * + * @param cls Closure (path info with tunnel and peer to connect). + * Will be free'd on exection. + * @param tc TaskContext + */ +static void +peer_info_connect_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct MeshPathInfo *path_info = cls; + + if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) + { + GNUNET_free (cls); + return; + } + peer_info_connect (path_info->peer, path_info->t); + GNUNET_free (cls); +} + + /** * Destroy the peer_info and free any allocated resources linked to it - * + * * @param pi The peer_info to destroy. - * + * * @return GNUNET_OK on success */ static int @@ -1300,21 +1415,20 @@ peer_info_destroy (struct MeshPeerInfo *pi) GNUNET_PEER_change_rc (pi->id, -1); if (GNUNET_YES != - GNUNET_CONTAINER_multihashmap_remove (peers,&id.hashPubKey, pi)) + GNUNET_CONTAINER_multihashmap_remove (peers, &id.hashPubKey, pi)) { GNUNET_break (0); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "MESH: removing peer %s, not in hashmap\n", - GNUNET_i2s (&id)); + "MESH: removing peer %s, not in hashmap\n", GNUNET_i2s (&id)); } if (NULL != pi->dhtget) { - GNUNET_DHT_get_stop(pi->dhtget); + GNUNET_DHT_get_stop (pi->dhtget); GNUNET_free (pi->dhtgetcls); } for (i = 0; i < CORE_QUEUE_SIZE; i++) { - peer_info_cancel_transmission(pi, i); + peer_info_cancel_transmission (pi, i); } p = pi->path_head; while (NULL != p) @@ -1341,8 +1455,7 @@ peer_info_destroy (struct MeshPeerInfo *pi) * TODO: optimize (see below) */ static void -path_remove_from_peer (struct MeshPeerInfo *peer, - GNUNET_PEER_Id p1, +peer_info_remove_path (struct MeshPeerInfo *peer, GNUNET_PEER_Id p1, GNUNET_PEER_Id p2) { struct MeshPeerPath *p; @@ -1378,6 +1491,8 @@ path_remove_from_peer (struct MeshPeerInfo *peer, for (i = 0; i < peer->ntunnels; i++) { d = tunnel_notify_connection_broken (peer->tunnels[i], p1, p2); + if (0 == d) + continue; /* TODO * Problem: one or more peers have been deleted from the tunnel tree. * We don't know who they are to try to add them again. @@ -1385,16 +1500,16 @@ path_remove_from_peer (struct MeshPeerInfo *peer, * Some of them might already have a path to reach them that does not * involve p1 and p2. Adding all anew might render in a better tree than * the trivial immediate fix. - * + * * Trivial immiediate fix: try to reconnect to the disconnected node. All * its children will be reachable trough him. */ - peer_d = peer_info_get_short(d); + peer_d = peer_info_get_short (d); best = UINT_MAX; aux = NULL; for (p = peer_d->path_head; NULL != p; p = p->next) { - if ((cost = path_get_cost(peer->tunnels[i]->tree, p)) < best) + if ((cost = tree_get_path_cost (peer->tunnels[i]->tree, p)) < best) { best = cost; aux = p; @@ -1402,8 +1517,10 @@ path_remove_from_peer (struct MeshPeerInfo *peer, } if (NULL != aux) { - /* No callback, as peer will be already disconnected */ - tree_add_path(peer->tunnels[i]->tree, aux, NULL); + /* No callback, as peer will be already disconnected and a connection + * scheduled by tunnel_notify_connection_broken. + */ + tree_add_path (peer->tunnels[i]->tree, aux, NULL, NULL); } else { @@ -1420,22 +1537,59 @@ path_remove_from_peer (struct MeshPeerInfo *peer, * @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. * Path will be either used of freed if already known. - * - * TODO: trim the part from origin to us? Add it as path to origin? + * @param trusted Do we trust that this path is real? */ void -path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) +peer_info_add_path (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path, + int trusted) { struct MeshPeerPath *aux; unsigned int l; unsigned int l2; - if (NULL == peer_info || NULL == path) + if ((NULL == peer_info) || (NULL == path)) + { + GNUNET_break (0); + path_destroy (path); + return; + } + if (path->peers[path->length - 1] != peer_info->id) { GNUNET_break (0); + path_destroy (path); + return; + } + if (path->length <= 2 && GNUNET_NO == trusted) + { + /* Only allow CORE to tell us about direct paths */ + path_destroy (path); return; } + GNUNET_assert (peer_info->id == path->peers[path->length - 1]); + for (l = 1; l < path->length; l++) + { + if (path->peers[l] == myid) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: shortening path by %u\n", l); + for (l2 = 0; l2 < path->length - l; l2++) + { + path->peers[l2] = path->peers[l + l2]; + } + path->length -= l; + l = 1; + path->peers = + GNUNET_realloc (path->peers, path->length * sizeof (GNUNET_PEER_Id)); + } + } +#if MESH_DEBUG + { + struct GNUNET_PeerIdentity id; + GNUNET_PEER_resolve (peer_info->id, &id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: adding path [%u] to peer %s\n", + path->length, GNUNET_i2s (&id)); + } +#endif l = path_get_length (path); if (0 == l) { @@ -1443,6 +1597,7 @@ path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) return; } + GNUNET_assert (peer_info->id == path->peers[path->length - 1]); for (aux = peer_info->path_head; aux != NULL; aux = aux->next) { l2 = path_get_length (aux); @@ -1450,12 +1605,13 @@ path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) { GNUNET_CONTAINER_DLL_insert_before (peer_info->path_head, peer_info->path_tail, aux, path); + return; } else { - if (l2 == l && memcmp(path->peers, aux->peers, l) == 0) + if (l2 == l && memcmp (path->peers, aux->peers, l) == 0) { - path_destroy(path); + path_destroy (path); return; } } @@ -1474,12 +1630,14 @@ path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) * * @param peer_info Peer to add the path to, being the origin of the path. * @param path New path to add after being inversed. + * @param trusted Do we trust that this path is real? */ static void -path_add_to_origin (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) +peer_info_add_path_to_origin (struct MeshPeerInfo *peer_info, + struct MeshPeerPath *path, int trusted) { - path_invert(path); - path_add_to_peer (peer_info, path); + path_invert (path); + peer_info_add_path (peer_info, path, trusted); } @@ -1491,9 +1649,9 @@ path_add_to_origin (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path) */ static struct MeshPeerPath * path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, - unsigned int get_path_length, + unsigned int get_path_length, const struct GNUNET_PeerIdentity *put_path, - unsigned int put_path_length) + unsigned int put_path_length) { struct MeshPeerPath *p; GNUNET_PEER_Id id; @@ -1501,29 +1659,28 @@ path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, p = path_new (1); p->peers[0] = myid; - GNUNET_PEER_change_rc(myid, 1); + GNUNET_PEER_change_rc (myid, 1); i = get_path_length; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: GET has %d hops.\n", i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: GET has %d hops.\n", i); for (i--; i >= 0; i--) { id = GNUNET_PEER_intern (&get_path[i]); if (p->length > 0 && id == p->peers[p->length - 1]) { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n"); - GNUNET_PEER_change_rc(id, -1); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n"); + GNUNET_PEER_change_rc (id, -1); } else { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: Adding from GET: %s.\n", - GNUNET_i2s(&get_path[i])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Adding from GET: %s.\n", + GNUNET_i2s (&get_path[i])); p->length++; p->peers = GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * p->length); p->peers[p->length - 1] = id; } } i = put_path_length; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: PUT has %d hops.\n", i); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: PUT has %d hops.\n", i); for (i--; i >= 0; i--) { id = GNUNET_PEER_intern (&put_path[i]); @@ -1537,14 +1694,13 @@ path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, } if (p->length > 0 && id == p->peers[p->length - 1]) { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n"); - GNUNET_PEER_change_rc(id, -1); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n"); + GNUNET_PEER_change_rc (id, -1); } else { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: Adding from PUT: %s.\n", - GNUNET_i2s(&put_path[i])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Adding from PUT: %s.\n", + GNUNET_i2s (&put_path[i])); p->length++; p->peers = GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * p->length); p->peers[p->length - 1] = id; @@ -1552,31 +1708,52 @@ path_build_from_dht (const struct GNUNET_PeerIdentity *get_path, } #if MESH_DEBUG if (get_path_length > 0) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: (first of GET: %s)\n", - GNUNET_h2s_full(&get_path[0].hashPubKey)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (first of GET: %s)\n", + GNUNET_i2s (&get_path[0])); if (put_path_length > 0) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: (first of PUT: %s)\n", - GNUNET_h2s_full(&put_path[0].hashPubKey)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: In total: %d hops\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (first of PUT: %s)\n", + GNUNET_i2s (&put_path[0])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: In total: %d hops\n", p->length); for (i = 0; i < p->length; i++) { struct GNUNET_PeerIdentity peer_id; - GNUNET_PEER_resolve(p->peers[i], &peer_id); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: %u: %s\n", - p->peers[i], - GNUNET_h2s_full(&peer_id.hashPubKey)); + GNUNET_PEER_resolve (p->peers[i], &peer_id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %u: %s\n", p->peers[i], + GNUNET_i2s (&peer_id)); } #endif return p; } +/** + * Adds a path to the peer_infos of all the peers in the path + * + * @param p Path to process. + * @param confirmed Whether we know if the path works or not. FIXME use + */ +static void +path_add_to_peers (struct MeshPeerPath *p, int confirmed) +{ + unsigned int i; + + /* TODO: invert and add */ + for (i = 0; i < p->length && p->peers[i] != myid; i++) /* skip'em */ ; + for (i++; i < p->length; i++) + { + struct MeshPeerInfo *aux; + struct MeshPeerPath *copy; + + aux = peer_info_get_short (p->peers[i]); + copy = path_duplicate (p); + copy->length = i + 1; + peer_info_add_path (aux, copy, GNUNET_NO); + } +} + + /** * Send keepalive packets for a peer * @@ -1590,24 +1767,45 @@ path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); /** - * Search for a tunnel among the tunnels for a client + * Search for a tunnel among the incoming tunnels * - * @param c 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 * -tunnel_get_by_local_id (struct MeshClient *c, MESH_TunnelNumber tid) +tunnel_get_incoming (MESH_TunnelNumber tid) { GNUNET_HashCode hash; + GNUNET_assert (tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV); GNUNET_CRYPTO_hash (&tid, sizeof (MESH_TunnelNumber), &hash); + return GNUNET_CONTAINER_multihashmap_get (incoming_tunnels, &hash); +} + + +/** + * Search for a tunnel among the tunnels for a client + * + * @param c 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 * +tunnel_get_by_local_id (struct MeshClient *c, MESH_TunnelNumber tid) +{ if (tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) { - return GNUNET_CONTAINER_multihashmap_get (incoming_tunnels, &hash); + return tunnel_get_incoming (tid); + } + else + { + GNUNET_HashCode hash; + + GNUNET_CRYPTO_hash (&tid, sizeof (MESH_TunnelNumber), &hash); + return GNUNET_CONTAINER_multihashmap_get (c->tunnels, &hash); } - return GNUNET_CONTAINER_multihashmap_get (c->tunnels, &hash); } @@ -1652,27 +1850,32 @@ tunnel_get (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid) * Callback used to notify a client owner of a tunnel that a peer has * disconnected, most likely because of a path change. * - * @param n Node in the tree representing the disconnected peer - * - * FIXME: pass tunnel via cls, make param just a peer identity + * @param cls Closure (tunnel this notification is about). + * @param peer_id Short ID of disconnected peer. */ void -notify_peer_disconnected (const struct MeshTunnelTreeNode *n) +notify_peer_disconnected (void *cls, GNUNET_PEER_Id peer_id) { + struct MeshTunnel *t = cls; struct MeshPeerInfo *peer; + struct MeshPathInfo *path_info; - if (NULL != n->t->client && NULL != nc) + if (NULL != t->client && NULL != nc) { struct GNUNET_MESH_PeerControl msg; + msg.header.size = htons (sizeof (msg)); msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL); - msg.tunnel_id = htonl (n->t->local_tid); - GNUNET_PEER_resolve (n->peer, &msg.peer); - GNUNET_SERVER_notification_context_unicast (nc, n->t->client->handle, + msg.tunnel_id = htonl (t->local_tid); + GNUNET_PEER_resolve (peer_id, &msg.peer); + GNUNET_SERVER_notification_context_unicast (nc, t->client->handle, &msg.header, GNUNET_NO); } - peer = peer_info_get_short(n->peer); - peer_info_connect(peer, n->t); + peer = peer_info_get_short (peer_id); + path_info = GNUNET_malloc (sizeof (struct MeshPathInfo)); + path_info->peer = peer; + path_info->t = t; + GNUNET_SCHEDULER_add_now (&peer_info_connect_task, path_info); } @@ -1694,41 +1897,40 @@ tunnel_add_peer (struct MeshTunnel *t, struct MeshPeerInfo *peer) unsigned int best_cost; unsigned int cost; - GNUNET_PEER_resolve(peer->id, &id); + GNUNET_PEER_resolve (peer->id, &id); if (GNUNET_NO == - GNUNET_CONTAINER_multihashmap_contains(t->peers, &id.hashPubKey)) + GNUNET_CONTAINER_multihashmap_contains (t->peers, &id.hashPubKey)) { t->peers_total++; GNUNET_array_append (peer->tunnels, peer->ntunnels, t); - GNUNET_CONTAINER_multihashmap_put( - t->peers, - &id.hashPubKey, - peer, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multihashmap_put (t->peers, &id.hashPubKey, + peer, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); } if (NULL != (p = peer->path_head)) { best_p = p; - best_cost = path_get_cost(t->tree, p); + best_cost = tree_get_path_cost (t->tree, p); while (NULL != p) { - if ((cost = path_get_cost (t->tree, p)) < best_cost) + if ((cost = tree_get_path_cost (t->tree, p)) < best_cost) { best_cost = cost; best_p = p; } p = p->next; } - tree_add_path (t->tree, best_p, ¬ify_peer_disconnected); + tree_add_path (t->tree, best_p, ¬ify_peer_disconnected, t); if (GNUNET_SCHEDULER_NO_TASK == t->path_refresh_task) t->path_refresh_task = - GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t); + GNUNET_SCHEDULER_add_delayed (REFRESH_PATH_TIME, &path_refresh, t); } else { - /* Start a DHT get if necessary */ - peer_info_connect(peer, t); + /* Start a DHT get */ + peer_info_connect (peer, t); } } @@ -1743,20 +1945,17 @@ tunnel_add_peer (struct MeshTunnel *t, struct MeshPeerInfo *peer) * */ static void -tunnel_add_path (struct MeshTunnel *t, - struct MeshPeerPath *p, +tunnel_add_path (struct MeshTunnel *t, struct MeshPeerPath *p, unsigned int own_pos) { struct GNUNET_PeerIdentity id; GNUNET_assert (0 != own_pos); - tree_add_path(t->tree, p, NULL); - if (NULL == t->tree->me) - t->tree->me = tree_find_peer(t->tree->root, p->peers[own_pos]); + tree_add_path (t->tree, p, NULL, NULL); if (own_pos < p->length - 1) { GNUNET_PEER_resolve (p->peers[own_pos + 1], &id); - tree_update_first_hops(t->tree, t->tree->me, &id); + tree_update_first_hops (t->tree, myid, &id); } } @@ -1775,23 +1974,21 @@ tunnel_add_path (struct MeshTunnel *t, * 0 if the tunnel remained unaffected. */ static GNUNET_PEER_Id -tunnel_notify_connection_broken (struct MeshTunnel *t, - GNUNET_PEER_Id p1, +tunnel_notify_connection_broken (struct MeshTunnel *t, GNUNET_PEER_Id p1, GNUNET_PEER_Id p2) { GNUNET_PEER_Id pid; - pid = tree_notify_connection_broken (t->tree, - p1, - p2, - ¬ify_peer_disconnected); + pid = + tree_notify_connection_broken (t->tree, p1, p2, ¬ify_peer_disconnected, + t); if (myid != p1 && myid != p2) { return pid; } if (pid != myid) { - if (NULL != t->tree->me->parent) + if (tree_get_predecessor (t->tree) != 0) { /* We are the peer still connected, notify owner of the disconnection. */ struct GNUNET_MESH_PathBroken msg; @@ -1803,7 +2000,7 @@ tunnel_notify_connection_broken (struct MeshTunnel *t, msg.tid = htonl (t->id.tid); msg.peer1 = my_full_id; GNUNET_PEER_resolve (pid, &msg.peer2); - GNUNET_PEER_resolve (t->tree->me->parent->peer, &neighbor); + GNUNET_PEER_resolve (tree_get_predecessor (t->tree), &neighbor); send_message (&msg.header, &neighbor); } } @@ -1811,80 +2008,110 @@ tunnel_notify_connection_broken (struct MeshTunnel *t, } +/** + * Send a multicast packet to a neighbor. + * + * @param cls Closure (Info about the multicast packet) + * @param neighbor_id Short ID of the neighbor to send the packet to. + */ +static void +tunnel_send_multicast_iterator (void *cls, GNUNET_PEER_Id neighbor_id) +{ + struct MeshData *mdata = cls; + struct MeshTransmissionDescriptor *info; + struct GNUNET_PeerIdentity neighbor; + unsigned int i; + + info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor)); + + info->mesh_data = mdata; + (*(mdata->reference_counter)) ++; + info->destination = neighbor_id; + GNUNET_PEER_resolve (neighbor_id, &neighbor); +#if MESH_DEBUG + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: sending to %s...\n", + GNUNET_i2s (&neighbor)); +#endif + info->peer = peer_info_get (&neighbor); + GNUNET_assert (NULL != info->peer); + i = peer_info_transmit_slot (info->peer); + info->handler_n = i; + info->peer->infos[i] = info; + info->peer->types[i] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST; + info->peer->core_transmit[i] = + GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, + GNUNET_TIME_UNIT_FOREVER_REL, + &neighbor, info->mesh_data->data_len, + &send_core_data_multicast, info); +} + /** * Send a message in a tunnel in multicast, sending a copy to each child node * down the local one in the tunnel tree. * * @param t Tunnel in which to send the data. * @param msg Message to be sent - * - * @return Number of copies sent. */ -static int +static void tunnel_send_multicast (struct MeshTunnel *t, const struct GNUNET_MessageHeader *msg) { - struct GNUNET_PeerIdentity neighbor; - struct MeshDataDescriptor *info; - struct MeshTunnelTreeNode *n; - unsigned int *copies; - unsigned int i; - size_t size; - void *data; + struct MeshData *mdata; +#if MESH_DEBUG GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: sending a multicast packet...\n"); - size = ntohs (msg->size); - GNUNET_assert (NULL != t->tree->me); - n = t->tree->me->children_head; - if (NULL == n) +#endif + mdata = GNUNET_malloc (sizeof (struct MeshData)); + mdata->data_len = ntohs (msg->size); + mdata->reference_counter = GNUNET_malloc (sizeof (unsigned int)); + mdata->t = t; + mdata->data = GNUNET_malloc (mdata->data_len); + memcpy (mdata->data, msg, mdata->data_len); + if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_MESH_MULTICAST) + { + struct GNUNET_MESH_Multicast *mcast; + + mcast = (struct GNUNET_MESH_Multicast *) mdata->data; + mcast->ttl = htonl (ntohl (mcast->ttl) - 1); +#if MESH_DEBUG + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: data packet, ttl: %u\n", + ntohl (mcast->ttl)); + } + else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: no children in the tree, no one to send.\n"); - return 0; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: not a data packet, no ttl\n"); +#endif + } + if (NULL != t->client) + { + mdata->task = GNUNET_malloc (sizeof (GNUNET_SCHEDULER_TaskIdentifier)); + (*(mdata->task)) = + GNUNET_SCHEDULER_add_delayed (UNACKNOWLEDGED_WAIT, &client_allow_send, + mdata); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: timeout task %u\n", + *(mdata->task)); } - copies = GNUNET_malloc (sizeof (unsigned int)); - for (*copies = 0; NULL != n; n = n->next) - (*copies)++; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (%u copies)\n", *copies); - n = t->tree->me->children_head; - data = GNUNET_malloc (size); - memcpy (data, msg, size); - while (NULL != n) - { - info = GNUNET_malloc (sizeof (struct MeshDataDescriptor)); - info->data = data; - info->size = size; - info->copies = copies; - if (NULL != t->client) + + tree_iterate_children (t->tree, &tunnel_send_multicast_iterator, mdata); + if (*(mdata->reference_counter) == 0) + { + GNUNET_free (mdata->data); + GNUNET_free (mdata->reference_counter); + if (NULL != mdata->task) { - info->client = t->client->handle; - info->timeout_task = GNUNET_SCHEDULER_add_delayed (UNACKNOWLEDGED_WAIT, - &client_allow_send, - t->client->handle); + GNUNET_SCHEDULER_cancel(*(mdata->task)); + GNUNET_free (mdata->task); + GNUNET_SERVER_receive_done(t->client->handle, GNUNET_OK); } - info->destination = n->peer; - GNUNET_PEER_resolve (n->peer, &neighbor); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: sending to %s...\n", - GNUNET_i2s (&neighbor)); - info->peer = peer_info_get(&neighbor); - GNUNET_assert (NULL != info->peer); - i = peer_info_transmit_slot(info->peer); - info->handler_n = i; - info->peer->infos[i] = info; - info->peer->types[i] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST; - info->peer->core_transmit[i] = - GNUNET_CORE_notify_transmit_ready (core_handle, - 0, - 0, - GNUNET_TIME_UNIT_FOREVER_REL, - &neighbor, - size, - &send_core_data_multicast, info); - n = n->next; + // FIXME change order? + GNUNET_free (mdata); } - return *copies; +#if MESH_DEBUG + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "MESH: sending a multicast packet done\n"); +#endif + return; } @@ -1932,11 +2159,9 @@ tunnel_destroy (struct MeshTunnel *t) { struct GNUNET_PeerIdentity id; - GNUNET_PEER_resolve(t->id.oid, &id); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: destroying tunnel %s [%x]\n", - GNUNET_i2s (&id), - t->id.tid); + GNUNET_PEER_resolve (t->id.oid, &id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: destroying tunnel %s [%x]\n", + GNUNET_i2s (&id), t->id.tid); if (NULL != c) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: by client %u\n", c->id); } @@ -1958,13 +2183,13 @@ tunnel_destroy (struct MeshTunnel *t) { GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash); GNUNET_break (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t)); + GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, + t)); } - if (NULL != t->peers) { - GNUNET_CONTAINER_multihashmap_iterate(t->peers, - &peer_info_delete_tunnel, t); + GNUNET_CONTAINER_multihashmap_iterate (t->peers, &peer_info_delete_tunnel, + t); GNUNET_CONTAINER_multihashmap_destroy (t->peers); } q = t->queue_head; @@ -1977,13 +2202,13 @@ tunnel_destroy (struct MeshTunnel *t) q = qn; /* TODO cancel core transmit ready in case it was active */ } - tree_destroy(t->tree); + tree_destroy (t->tree); if (NULL != t->dht_get_type) - GNUNET_DHT_get_stop(t->dht_get_type); + GNUNET_DHT_get_stop (t->dht_get_type); if (GNUNET_SCHEDULER_NO_TASK != t->timeout_task) - GNUNET_SCHEDULER_cancel(t->timeout_task); + GNUNET_SCHEDULER_cancel (t->timeout_task); if (GNUNET_SCHEDULER_NO_TASK != t->path_refresh_task) - GNUNET_SCHEDULER_cancel(t->path_refresh_task); + GNUNET_SCHEDULER_cancel (t->path_refresh_task); GNUNET_free (t); return r; } @@ -1995,14 +2220,12 @@ tunnel_destroy (struct MeshTunnel *t) * The tunnel itself is also destoyed if results in a remote empty tunnel. * * @param t Tunnel from which to remove the path. - * @param p Peer which should be removed. + * @param peer Short id of the peer which should be removed. */ static void -tunnel_delete_peer (struct MeshTunnel *t, - GNUNET_PEER_Id peer) +tunnel_delete_peer (struct MeshTunnel *t, GNUNET_PEER_Id peer) { - GNUNET_break (GNUNET_OK == tree_del_peer (t->tree, peer, NULL)); - if (NULL == t->tree->root) + if (GNUNET_NO == tree_del_peer (t->tree, peer, NULL, NULL)) tunnel_destroy (t); } @@ -2010,11 +2233,11 @@ tunnel_delete_peer (struct MeshTunnel *t, /** * tunnel_destroy_iterator: 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 @@ -2023,10 +2246,6 @@ tunnel_destroy_iterator (void *cls, const GNUNET_HashCode * key, void *value) struct MeshTunnel *t = value; int r; - if (NULL != t->dht_get_type) - { - GNUNET_DHT_get_stop (t->dht_get_type); - } r = tunnel_destroy (t); return r; } @@ -2059,10 +2278,9 @@ tunnel_reset_timeout (struct MeshTunnel *t) { if (GNUNET_SCHEDULER_NO_TASK != t->timeout_task) GNUNET_SCHEDULER_cancel (t->timeout_task); - t->timeout_task = GNUNET_SCHEDULER_add_delayed ( - GNUNET_TIME_relative_multiply(REFRESH_PATH_TIME, 4), - &tunnel_timeout, - t); + t->timeout_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (REFRESH_PATH_TIME, 4), &tunnel_timeout, t); } @@ -2093,8 +2311,7 @@ send_core_create_path (void *cls, size_t size, void *buf) size_t size_needed; int i; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: CREATE PATH sending...\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CREATE PATH sending...\n"); size_needed = sizeof (struct GNUNET_MESH_ManipulatePath) + p->length * sizeof (struct GNUNET_PeerIdentity); @@ -2103,15 +2320,15 @@ send_core_create_path (void *cls, size_t size, void *buf) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: create path retransmit!\n"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: buf: %p\n", buf); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: size: (%u/%u)\n", - size, size_needed); - info->peer->core_transmit[info->pos] = - GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, - GNUNET_TIME_UNIT_FOREVER_REL, - path_get_first_hop (t->tree, peer->id), - size_needed, - &send_core_create_path, - info); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: size: (%u/%u)\n", size, + size_needed); + info->peer->core_transmit[info->pos] = + GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, + GNUNET_TIME_UNIT_FOREVER_REL, + tree_get_first_hop (t->tree, + peer->id), + size_needed, &send_core_create_path, + info); return 0; } info->peer->core_transmit[info->pos] = NULL; @@ -2122,8 +2339,7 @@ send_core_create_path (void *cls, size_t size, void *buf) GNUNET_PEER_resolve (peer->id, &id); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: setting core_transmit %s [%u] to NULL\n", - GNUNET_i2s (&id), - info->pos); + GNUNET_i2s (&id), info->pos); } #endif msg = (struct GNUNET_MESH_ManipulatePath *) buf; @@ -2141,8 +2357,7 @@ send_core_create_path (void *cls, size_t size, void *buf) GNUNET_free (info); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: CREATE PATH (%u bytes long) sent!\n", - size_needed); + "MESH: CREATE PATH (%u bytes long) sent!\n", size_needed); return size_needed; } @@ -2156,19 +2371,19 @@ send_core_create_path (void *cls, size_t size, void *buf) * @param cls closure (data itself) * @param size number of bytes available in buf * @param buf where the callee should write the message - * + * * @return number of bytes written to buf */ static size_t send_core_data_multicast (void *cls, size_t size, void *buf) { - struct MeshDataDescriptor *info = cls; + struct MeshTransmissionDescriptor *info = cls; size_t total_size; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Multicast callback.\n"); GNUNET_assert (NULL != info); GNUNET_assert (NULL != info->peer); - total_size = info->size; + total_size = info->mesh_data->data_len; GNUNET_assert (total_size < GNUNET_SERVER_MAX_MESSAGE_SIZE); if (total_size > size) @@ -2177,24 +2392,20 @@ send_core_data_multicast (void *cls, size_t size, void *buf) struct GNUNET_PeerIdentity id; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Multicast: retransmitting... (%u/%u)\n", - size, total_size); - GNUNET_PEER_resolve(info->peer->id, &id); + "MESH: Multicast: retransmitting... (%u/%u)\n", size, + total_size); + GNUNET_PEER_resolve (info->peer->id, &id); info->peer->core_transmit[info->handler_n] = - GNUNET_CORE_notify_transmit_ready (core_handle, - 0, - 0, - GNUNET_TIME_UNIT_FOREVER_REL, - &id, - total_size, - &send_core_data_multicast, - info); + GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0, + GNUNET_TIME_UNIT_FOREVER_REL, &id, + total_size, + &send_core_data_multicast, info); return 0; } info->peer->core_transmit[info->handler_n] = NULL; info->peer->infos[info->handler_n] = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: copying data...\n"); - memcpy (buf, info->data, total_size); + memcpy (buf, info->mesh_data->data, total_size); #if MESH_DEBUG { struct GNUNET_MESH_Multicast *mc; @@ -2206,39 +2417,18 @@ send_core_data_multicast (void *cls, size_t size, void *buf) mc = (struct GNUNET_MESH_Multicast *) mh; mh = (struct GNUNET_MessageHeader *) &mc[1]; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: multicast, payload type %u\n", - ntohs (mh->type)); + "MESH: multicast, payload type %u\n", ntohs (mh->type)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: multicast, payload size %u\n", - ntohs (mh->size)); + "MESH: multicast, payload size %u\n", ntohs (mh->size)); } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: type %u\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type %u\n", ntohs (mh->type)); } } #endif - if (0 == --(*info->copies)) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Last copy!\n"); - if (NULL != info->client) - { - if (GNUNET_SCHEDULER_NO_TASK != info->timeout_task) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: cancelling client timeout (%u)...\n", - info->timeout_task); - GNUNET_SCHEDULER_cancel(info->timeout_task); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: notifying client...\n"); - GNUNET_SERVER_receive_done (info->client, GNUNET_OK); - } - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: freeing memory...\n"); - GNUNET_free (info->data); - GNUNET_free (info->copies); - } + data_descriptor_decrement_multicast (info->mesh_data); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: freeing info...\n"); GNUNET_free (info); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: return %u\n", total_size); @@ -2252,7 +2442,7 @@ send_core_data_multicast (void *cls, size_t size, void *buf) * NULL and "size" zero if the socket was closed for * writing in the meantime. * - * @param cls closure (MeshDataDescriptor) + * @param cls closure (MeshTransmissionDescriptor) * @param size number of bytes available in buf * @param buf where the callee should write the message * @return number of bytes written to buf @@ -2260,7 +2450,7 @@ send_core_data_multicast (void *cls, size_t size, void *buf) static size_t send_core_path_ack (void *cls, size_t size, void *buf) { - struct MeshDataDescriptor *info = cls; + struct MeshTransmissionDescriptor *info = cls; struct GNUNET_MESH_PathACK *msg = buf; GNUNET_assert (NULL != info); @@ -2299,7 +2489,7 @@ send_core_path_ack (void *cls, size_t size, void *buf) * @param peer peer identity this notification is about * @param atsi performance data * @param atsi_count number of records in 'atsi' - * + * * @return GNUNET_OK to keep the connection open, * GNUNET_SYSERR to close it (signal serious error) */ @@ -2307,7 +2497,7 @@ static int handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { unsigned int own_pos; uint16_t size; @@ -2323,7 +2513,7 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Received a path create msg [%s]\n", - GNUNET_i2s(&my_full_id)); + GNUNET_i2s (&my_full_id)); size = ntohs (message->size); if (size < sizeof (struct GNUNET_MESH_ManipulatePath)) { @@ -2343,36 +2533,30 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_break_op (0); return GNUNET_OK; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: path has %u hops.\n", - size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: path has %u hops.\n", size); msg = (struct GNUNET_MESH_ManipulatePath *) message; tid = ntohl (msg->tid); pi = (struct GNUNET_PeerIdentity *) &msg[1]; - t = tunnel_get (pi, tid); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: path is for tunnel %s [%X].\n", - GNUNET_i2s(pi), - tid); + "MESH: path is for tunnel %s [%X].\n", GNUNET_i2s (pi), tid); + t = tunnel_get (pi, tid); if (NULL == t) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Creating tunnel\n"); t = GNUNET_malloc (sizeof (struct MeshTunnel)); t->id.oid = GNUNET_PEER_intern (pi); t->id.tid = tid; + while (NULL != tunnel_get_incoming (next_local_tid)) + next_local_tid = (next_local_tid + 1) | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV; t->local_tid = next_local_tid++; - /* FIXME test if taken */ - next_local_tid |= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV; - t->tree = tree_new(t, t->id.oid); + next_local_tid = next_local_tid | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV; + t->tree = tree_new (t->id.oid); GNUNET_CRYPTO_hash (&t->id, sizeof (struct MESH_TunnelID), &hash); if (GNUNET_OK != - GNUNET_CONTAINER_multihashmap_put ( - tunnels, - &hash, - t, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) + GNUNET_CONTAINER_multihashmap_put (tunnels, &hash, t, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) { tunnel_destroy (t); GNUNET_break (0); @@ -2381,11 +2565,8 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, tunnel_reset_timeout (t); GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash); if (GNUNET_OK != - GNUNET_CONTAINER_multihashmap_put ( - incoming_tunnels, - &hash, - t, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) + GNUNET_CONTAINER_multihashmap_put (incoming_tunnels, &hash, t, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) { tunnel_destroy (t); GNUNET_break (0); @@ -2419,15 +2600,13 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, own_pos = 0; for (i = 0; i < size; i++) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: ... adding %s\n", - GNUNET_i2s(&pi[i])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: ... adding %s\n", + GNUNET_i2s (&pi[i])); path->peers[i] = GNUNET_PEER_intern (&pi[i]); if (path->peers[i] == myid) own_pos = i; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Own position: %u\n", own_pos); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Own position: %u\n", own_pos); if (own_pos == 0) { /* cannot be self, must be 'not found' */ @@ -2437,28 +2616,42 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, /* FIXME error. destroy tunnel? leave for timeout? */ return 0; } + path_add_to_peers (path, GNUNET_NO); tunnel_add_path (t, path, own_pos); if (own_pos == size - 1) { /* It is for us! Send ack. */ - struct GNUNET_MESH_TunnelNotification cmsg; - struct MeshDataDescriptor *info; + struct MeshTransmissionDescriptor *info; unsigned int j; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: It's for us!\n"); - path_add_to_origin (orig_peer_info, path); - t->peers = GNUNET_CONTAINER_multihashmap_create(4); - GNUNET_break (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put ( - t->peers, - &my_full_id.hashPubKey, - peer_info_get(&my_full_id), - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); - info = GNUNET_malloc (sizeof (struct MeshDataDescriptor)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: It's for us!\n"); + peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO); + if (NULL == t->peers) + { + /* New tunnel! Notify clients! */ + struct GNUNET_MESH_TunnelNotification cmsg; + + cmsg.header.size = htons (sizeof (cmsg)); + cmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE); + GNUNET_PEER_resolve (t->id.oid, &cmsg.peer); + cmsg.tunnel_id = htonl (t->local_tid); + GNUNET_SERVER_notification_context_broadcast (nc, &cmsg.header, + GNUNET_NO); + + t->peers = GNUNET_CONTAINER_multihashmap_create (4); + } + GNUNET_break (GNUNET_OK == + GNUNET_CONTAINER_multihashmap_put (t->peers, + &my_full_id.hashPubKey, + peer_info_get + (&my_full_id), + GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE)); + /* FIXME use send_message */ + info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor)); info->origin = &t->id; info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey); GNUNET_assert (NULL != info->peer); - j = peer_info_transmit_slot(info->peer); + j = peer_info_transmit_slot (info->peer); info->handler_n = j; info->peer->types[j] = GNUNET_MESSAGE_TYPE_MESH_PATH_ACK; info->peer->infos[j] = info; @@ -2467,24 +2660,18 @@ handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_TIME_UNIT_FOREVER_REL, peer, sizeof (struct GNUNET_MESH_PathACK), &send_core_path_ack, info); - cmsg.header.size = htons(sizeof(cmsg)); - cmsg.header.type = htons(GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE); - GNUNET_PEER_resolve(t->id.oid, &cmsg.peer); - cmsg.tunnel_id = htonl(t->local_tid); - GNUNET_SERVER_notification_context_broadcast(nc, &cmsg.header, GNUNET_NO); } else { struct MeshPeerPath *path2; /* It's for somebody else! Retransmit. */ - path2 = path_duplicate(path); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Retransmitting.\n"); - path_add_to_peer(dest_peer_info, path); - path = path_duplicate(path2); - path_add_to_origin(orig_peer_info, path2); - send_create_path(dest_peer_info, path, t); + path2 = path_duplicate (path); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Retransmitting.\n"); + peer_info_add_path (dest_peer_info, path2, GNUNET_NO); + path2 = path_duplicate (path); + peer_info_add_path_to_origin (orig_peer_info, path2, GNUNET_NO); + send_create_path (dest_peer_info, path, t); } return GNUNET_OK; } @@ -2506,7 +2693,7 @@ static int handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_ManipulatePath *msg; struct GNUNET_PeerIdentity *pi; @@ -2517,8 +2704,7 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, size_t size; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Received a PATH DESTROY msg from %s\n", - GNUNET_i2s(peer)); + "MESH: Received a PATH DESTROY msg from %s\n", GNUNET_i2s (peer)); size = ntohs (message->size); if (size < sizeof (struct GNUNET_MESH_ManipulatePath)) { @@ -2538,15 +2724,12 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_break_op (0); return GNUNET_OK; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: path has %u hops.\n", - size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: path has %u hops.\n", size); msg = (struct GNUNET_MESH_ManipulatePath *) message; pi = (struct GNUNET_PeerIdentity *) &msg[1]; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: path is for tunnel %s [%X].\n", - GNUNET_i2s(pi), + "MESH: path is for tunnel %s [%X].\n", GNUNET_i2s (pi), msg->tid); t = tunnel_get (pi, ntohl (msg->tid)); if (NULL == t) @@ -2560,18 +2743,17 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, own_pos = 0; for (i = 0; i < size; i++) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: ... adding %s\n", - GNUNET_i2s(&pi[i])); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: ... adding %s\n", + GNUNET_i2s (&pi[i])); path->peers[i] = GNUNET_PEER_intern (&pi[i]); if (path->peers[i] == myid) own_pos = i; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Own position: %u\n", own_pos); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Own position: %u\n", own_pos); if (own_pos < path->length - 1) send_message (message, &pi[own_pos + 1]); tunnel_delete_peer (t, path->peers[path->length - 1]); + path_destroy (path); return GNUNET_OK; } @@ -2590,32 +2772,28 @@ handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, */ static int handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + const struct GNUNET_MessageHeader *message, + const struct GNUNET_ATS_Information *atsi, + unsigned int atsi_count) { struct GNUNET_MESH_PathBroken *msg; struct MeshTunnel *t; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Received a PATH BROKEN msg from %s\n", - GNUNET_i2s(peer)); + "MESH: Received a PATH BROKEN msg from %s\n", GNUNET_i2s (peer)); msg = (struct GNUNET_MESH_PathBroken *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: regarding %s\n", - GNUNET_i2s(&msg->peer1)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: regarding %s\n", - GNUNET_i2s(&msg->peer2)); - t = tunnel_get(&msg->oid, ntohl (msg->tid)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: regarding %s\n", + GNUNET_i2s (&msg->peer1)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: regarding %s\n", + GNUNET_i2s (&msg->peer2)); + t = tunnel_get (&msg->oid, ntohl (msg->tid)); if (NULL == t) { GNUNET_break_op (0); return GNUNET_OK; } - tunnel_notify_connection_broken(t, - GNUNET_PEER_search(&msg->peer1), - GNUNET_PEER_search(&msg->peer2)); + tunnel_notify_connection_broken (t, GNUNET_PEER_search (&msg->peer1), + GNUNET_PEER_search (&msg->peer2)); return GNUNET_OK; } @@ -2637,24 +2815,23 @@ static int handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_TunnelDestroy *msg; struct MeshTunnel *t; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Got a TUNNEL DESTROY packet from %s\n", - GNUNET_i2s (peer)); + "MESH: Got a TUNNEL DESTROY packet from %s\n", GNUNET_i2s (peer)); msg = (struct GNUNET_MESH_TunnelDestroy *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: for tunnel %s [%u]\n", - GNUNET_i2s (&msg->oid), - ntohl (msg->tid)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: for tunnel %s [%u]\n", + GNUNET_i2s (&msg->oid), ntohl (msg->tid)); t = tunnel_get (&msg->oid, ntohl (msg->tid)); if (NULL == t) { - /* TODO notify back: we don't know this tunnel */ - GNUNET_break_op (0); + /* Probably already got the message from another path, + * destroyed the tunnel and retransmitted to children. + * Safe to ignore. + */ return GNUNET_OK; } if (t->id.oid == myid) @@ -2688,15 +2865,14 @@ static int handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_Unicast *msg; struct MeshTunnel *t; GNUNET_PEER_Id pid; size_t size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: got a unicast packet from %s\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: got a unicast packet from %s\n", GNUNET_i2s (peer)); size = ntohs (message->size); if (size < @@ -2707,8 +2883,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, return GNUNET_OK; } msg = (struct GNUNET_MESH_Unicast *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: of type %u\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: of type %u\n", ntohs (msg[1].header.type)); t = tunnel_get (&msg->oid, ntohl (msg->tid)); if (NULL == t) @@ -2718,7 +2893,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, return GNUNET_OK; } tunnel_reset_timeout (t); - pid = GNUNET_PEER_search(&msg->destination); + pid = GNUNET_PEER_search (&msg->destination); if (pid == myid) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -2728,7 +2903,7 @@ handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: not for us, retransmitting...\n"); - send_message (message, path_get_first_hop(t->tree, pid)); + send_message (message, tree_get_first_hop (t->tree, pid)); return GNUNET_OK; } @@ -2750,14 +2925,13 @@ static int handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_Multicast *msg; struct MeshTunnel *t; size_t size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: got a multicast packet from %s\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: got a multicast packet from %s\n", GNUNET_i2s (peer)); size = ntohs (message->size); if (sizeof (struct GNUNET_MESH_Multicast) + @@ -2775,6 +2949,21 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_break_op (0); return GNUNET_OK; } + if (t->mid == ntohl (msg->mid)) + { + /* FIXME: already seen this packet, log dropping */ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "MESH: Already seen mid %u, DROPPING!\n", t->mid); + return GNUNET_OK; + } +#if MESH_DEBUG + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "MESH: mid %u not seen yet, forwarding\n", ntohl (msg->mid)); + } +#endif + t->mid = ntohl (msg->mid); tunnel_reset_timeout (t); /* Transmit to locally interested clients */ @@ -2783,7 +2972,16 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer, { send_subscribed_clients (message, &msg[1].header); } - tunnel_send_multicast(t, message); +#if MESH_DEBUG + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: ttl: %u\n", ntohl (msg->ttl)); +#endif + if (ntohl (msg->ttl) == 0) + { + /* FIXME: ttl is 0, log dropping */ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "MESH: TTL is 0, DROPPING!\n"); + return GNUNET_OK; + } + tunnel_send_multicast (t, message); return GNUNET_OK; } @@ -2804,7 +3002,7 @@ static int handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_ToOrigin *msg; struct GNUNET_PeerIdentity id; @@ -2812,8 +3010,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, struct MeshTunnel *t; size_t size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: got a ToOrigin packet from %s\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: got a ToOrigin packet from %s\n", GNUNET_i2s (peer)); size = ntohs (message->size); if (size < sizeof (struct GNUNET_MESH_ToOrigin) + /* Payload must be */ @@ -2823,8 +3020,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, return GNUNET_OK; } msg = (struct GNUNET_MESH_ToOrigin *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: of type %u\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: of type %u\n", ntohs (msg[1].header.type)); t = tunnel_get (&msg->oid, ntohl (msg->tid)); @@ -2845,8 +3041,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, if (NULL == t->client) { /* got data packet for ownerless tunnel */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: no clients!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: no clients!\n"); GNUNET_break_op (0); return GNUNET_OK; } @@ -2854,10 +3049,8 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, memcpy (cbuf, message, size); copy = (struct GNUNET_MESH_ToOrigin *) cbuf; copy->tid = htonl (t->local_tid); - GNUNET_SERVER_notification_context_unicast (nc, - t->client->handle, - ©->header, - GNUNET_YES); + GNUNET_SERVER_notification_context_unicast (nc, t->client->handle, + ©->header, GNUNET_YES); return GNUNET_OK; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -2870,7 +3063,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_break (0); return GNUNET_OK; } - GNUNET_PEER_resolve (t->tree->me->parent->peer, &id); + GNUNET_PEER_resolve (tree_get_predecessor (t->tree), &id); send_message (message, &id); return GNUNET_OK; @@ -2893,17 +3086,16 @@ static int handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_ATS_Information *atsi, - unsigned int atsi_count) + unsigned int atsi_count) { struct GNUNET_MESH_PathACK *msg; struct GNUNET_PeerIdentity id; - struct MeshTunnelTreeNode *n; struct MeshPeerInfo *peer_info; + struct MeshPeerPath *p; struct MeshTunnel *t; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: Received a path ACK msg [%s]\n", - GNUNET_i2s(&my_full_id)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Received a path ACK msg [%s]\n", + GNUNET_i2s (&my_full_id)); msg = (struct GNUNET_MESH_PathACK *) message; t = tunnel_get (&msg->oid, msg->tid); if (NULL == t) @@ -2912,6 +3104,20 @@ handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, return GNUNET_OK; } + peer_info = peer_info_get (&msg->peer_id); + + /* Add paths to peers? */ + p = tree_get_path_to_peer (t->tree, peer_info->id); + if (NULL != p) + { + path_add_to_peers (p, GNUNET_YES); + path_destroy (p); + } + else + { + GNUNET_break (0); + } + /* Message for us? */ if (0 == memcmp (&msg->oid, &my_full_id, sizeof (struct GNUNET_PeerIdentity))) { @@ -2926,21 +3132,17 @@ handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_DHT_get_stop (t->dht_get_type); t->dht_get_type = NULL; } - peer_info = peer_info_get (&msg->peer_id); - n = tree_find_peer(t->tree->root, peer_info->id); - if (NULL == n) + if (tree_get_status (t->tree, peer_info->id) != MESH_PEER_READY) { - GNUNET_break_op (0); - return GNUNET_OK; + tree_set_status (t->tree, peer_info->id, MESH_PEER_READY); + send_client_peer_connected (t, peer_info->id); } - n->status = MESH_PEER_READY; - send_client_peer_connected(t, peer_info->id); return GNUNET_OK; } - + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: not for us, retransmitting...\n"); - GNUNET_PEER_resolve(t->tree->me->parent->peer, &id); + GNUNET_PEER_resolve (tree_get_predecessor (t->tree), &id); peer_info = peer_info_get (&msg->oid); if (NULL == peer_info) { @@ -2960,13 +3162,13 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { {&handle_mesh_path_create, GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE, 0}, {&handle_mesh_path_destroy, GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY, 0}, {&handle_mesh_path_broken, GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN, - sizeof (struct GNUNET_MESH_PathBroken)}, + sizeof (struct GNUNET_MESH_PathBroken)}, {&handle_mesh_tunnel_destroy, GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY, 0}, {&handle_mesh_data_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0}, {&handle_mesh_data_multicast, GNUNET_MESSAGE_TYPE_MESH_MULTICAST, 0}, {&handle_mesh_data_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0}, {&handle_mesh_path_ack, GNUNET_MESSAGE_TYPE_MESH_PATH_ACK, - sizeof (struct GNUNET_MESH_PathACK)}, + sizeof (struct GNUNET_MESH_PathACK)}, {NULL, 0, 0} }; @@ -2978,18 +3180,19 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { /** * deregister_app: iterator for removing each application registered by a client - * + * * @param cls closure * @param key the hash of the application id (used to access the hashmap) * @param value the value stored at the key (client) - * + * * @return GNUNET_OK on success */ static int deregister_app (void *cls, const GNUNET_HashCode * key, void *value) { - GNUNET_break (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (applications, key, value)); + GNUNET_break (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_remove (applications, key, + value)); return GNUNET_OK; } @@ -3047,8 +3250,9 @@ path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) struct MeshTunnel *t = cls; struct GNUNET_MessageHeader *payload; struct GNUNET_MESH_Multicast *msg; - size_t size = sizeof(struct GNUNET_MESH_Multicast) + - sizeof(struct GNUNET_MessageHeader); + size_t size = + sizeof (struct GNUNET_MESH_Multicast) + + sizeof (struct GNUNET_MessageHeader); char cbuf[size]; if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) @@ -3058,21 +3262,20 @@ path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) t->path_refresh_task = GNUNET_SCHEDULER_NO_TASK; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: sending keepalive for tunnel %d\n", - t->id.tid); + "MESH: sending keepalive for tunnel %d\n", t->id.tid); msg = (struct GNUNET_MESH_Multicast *) cbuf; msg->header.size = htons (size); msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST); msg->oid = my_full_id; - msg->tid = htonl(t->id.tid); + msg->tid = htonl (t->id.tid); payload = (struct GNUNET_MessageHeader *) &msg[1]; - payload->size = htons (sizeof(struct GNUNET_MessageHeader)); + payload->size = htons (sizeof (struct GNUNET_MessageHeader)); payload->type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE); tunnel_send_multicast (t, &msg->header); t->path_refresh_task = - GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t); + GNUNET_SCHEDULER_add_delayed (REFRESH_PATH_TIME, &path_refresh, t); return; } @@ -3085,6 +3288,10 @@ path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param cls closure * @param exp when will this value expire * @param key key of the result + * @param get_path path of the get request + * @param get_path_length lenght of get_path + * @param put_path path of the put request + * @param put_path_length length of the put_path * @param type type of the result * @param size number of bytes in data * @param data pointer to the result data @@ -3097,32 +3304,27 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp, const struct GNUNET_PeerIdentity *get_path, unsigned int get_path_length, const struct GNUNET_PeerIdentity *put_path, - unsigned int put_path_length, - enum GNUNET_BLOCK_Type type, size_t size, const void *data) + unsigned int put_path_length, enum GNUNET_BLOCK_Type type, + size_t size, const void *data) { struct MeshPathInfo *path_info = cls; struct MeshPeerPath *p; struct GNUNET_PeerIdentity pi; int i; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: Got results from DHT!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Got results from DHT!\n"); GNUNET_PEER_resolve (path_info->peer->id, &pi); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "MESH: for %s\n", - GNUNET_h2s_full(&pi.hashPubKey)); -// GNUNET_DHT_get_stop(path_info->peer->dhtget); -// path_info->peer->dhtget = NULL; - - p = path_build_from_dht (get_path, get_path_length, - put_path, put_path_length); - path_add_to_peer (path_info->peer, p); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n", GNUNET_i2s (&pi)); + + p = path_build_from_dht (get_path, get_path_length, put_path, + put_path_length); + path_add_to_peers (p, GNUNET_NO); + path_destroy(p); for (i = 0; i < path_info->peer->ntunnels; i++) { tunnel_add_peer (path_info->peer->tunnels[i], path_info->peer); - peer_info_connect(path_info->peer, path_info->t); + peer_info_connect (path_info->peer, path_info->t); } -// GNUNET_free (path_info); return; } @@ -3136,6 +3338,10 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp, * @param cls closure * @param exp when will this value expire * @param key key of the result + * @param get_path path of the get request + * @param get_path_length lenght of get_path + * @param put_path path of the put request + * @param put_path_length length of the put_path * @param type type of the result * @param size number of bytes in data * @param data pointer to the result data @@ -3144,11 +3350,10 @@ static void dht_get_type_handler (void *cls, struct GNUNET_TIME_Absolute exp, const GNUNET_HashCode * key, const struct GNUNET_PeerIdentity *get_path, - unsigned int get_path_length, + unsigned int get_path_length, const struct GNUNET_PeerIdentity *put_path, - unsigned int put_path_length, - enum GNUNET_BLOCK_Type type, size_t size, - const void *data) + unsigned int put_path_length, enum GNUNET_BLOCK_Type type, + size_t size, const void *data) { const struct GNUNET_PeerIdentity *pi = data; struct MeshTunnel *t = cls; @@ -3162,16 +3367,15 @@ dht_get_type_handler (void *cls, struct GNUNET_TIME_Absolute exp, } GNUNET_assert (NULL != t->client); peer_info = peer_info_get (pi); - (void) GNUNET_CONTAINER_multihashmap_put ( - t->peers, - &pi->hashPubKey, - peer_info, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); - - p = path_build_from_dht (get_path, get_path_length, - put_path, put_path_length); - path_add_to_peer (peer_info, p); - tunnel_add_peer(t, peer_info); + (void) GNUNET_CONTAINER_multihashmap_put (t->peers, &pi->hashPubKey, + peer_info, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); + + p = path_build_from_dht (get_path, get_path_length, put_path, + put_path_length); + path_add_to_peers (p, GNUNET_NO); + path_destroy(p); + tunnel_add_peer (t, peer_info); peer_info_connect (peer_info, t); } @@ -3196,7 +3400,10 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: client disconnected\n"); if (client == NULL) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n"); + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n"); + return; + } c = clients; while (NULL != c) { @@ -3207,11 +3414,11 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) continue; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: matching client found\n"); + GNUNET_SERVER_client_drop (c->handle); if (NULL != c->tunnels) { GNUNET_CONTAINER_multihashmap_iterate (c->tunnels, - &tunnel_destroy_iterator, - c); + &tunnel_destroy_iterator, c); GNUNET_CONTAINER_multihashmap_destroy (c->tunnels); } @@ -3231,6 +3438,7 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) GNUNET_CONTAINER_multihashmap_destroy (c->types); next = c->next; GNUNET_CONTAINER_DLL_remove (clients, clients_tail, c); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT FREE at %p\n", c); GNUNET_free (c); c = next; } @@ -3278,8 +3486,11 @@ handle_local_new_client (void *cls, struct GNUNET_SERVER_Client *client, c = GNUNET_malloc (sizeof (struct MeshClient)); #if MESH_DEBUG c->id = next_client_id++; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT NEW %u at %p\n", c->id, + c); #endif c->handle = client; + GNUNET_SERVER_client_keep (client); a = (GNUNET_MESH_ApplicationType *) &cc_msg[1]; if (napps > 0) { @@ -3392,12 +3603,16 @@ handle_local_tunnel_create (void *cls, struct GNUNET_SERVER_Client *client, } t = GNUNET_malloc (sizeof (struct MeshTunnel)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CREATED TUNNEL at %p\n", t); while (NULL != tunnel_get_by_pi (myid, next_tid)) next_tid = (next_tid + 1) & ~GNUNET_MESH_LOCAL_TUNNEL_ID_CLI; t->id.tid = next_tid++; + next_tid = next_tid & ~GNUNET_MESH_LOCAL_TUNNEL_ID_CLI; t->id.oid = myid; t->local_tid = ntohl (t_msg->tunnel_id); +#if MESH_DEBUG + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CREATED TUNNEL %s [%x] (%x)\n", + GNUNET_i2s (&my_full_id), t->id.tid, t->local_tid); +#endif t->client = c; t->peers = GNUNET_CONTAINER_multihashmap_create (32); @@ -3420,10 +3635,7 @@ handle_local_tunnel_create (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - t->tree = tree_new (t, myid); - t->tree->refresh = REFRESH_PATH_TIME; - t->tree->root->status = MESH_PEER_READY; - t->tree->me = t->tree->root; + t->tree = tree_new (myid); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; @@ -3475,11 +3687,12 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client, /* 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); + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_remove (c->tunnels, &hash, t)); t->client = NULL; tunnel_send_destroy (t); - tunnel_destroy(t); + tunnel_destroy (t); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } @@ -3502,7 +3715,7 @@ handle_local_connect_add (void *cls, struct GNUNET_SERVER_Client *client, struct MeshTunnel *t; MESH_TunnelNumber tid; - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Got connection request\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Got connection request\n"); /* Sanity check for client registration */ if (NULL == (c = client_get (client))) { @@ -3537,12 +3750,12 @@ handle_local_connect_add (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n", - GNUNET_h2s_full(&peer_msg->peer.hashPubKey)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n", + GNUNET_i2s (&peer_msg->peer)); peer_info = peer_info_get (&peer_msg->peer); - tunnel_add_peer(t, peer_info); - peer_info_connect(peer_info, t); + tunnel_add_peer (t, peer_info); + peer_info_connect (peer_info, t); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; @@ -3602,12 +3815,11 @@ handle_local_connect_del (void *cls, struct GNUNET_SERVER_Client *client, return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "MESH: for peer %s\n", - GNUNET_i2s(&peer_msg->peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: for peer %s\n", + GNUNET_i2s (&peer_msg->peer)); /* Is the peer in the tunnel? */ - peer_info = GNUNET_CONTAINER_multihashmap_get(t->peers, - &peer_msg->peer.hashPubKey); + peer_info = + GNUNET_CONTAINER_multihashmap_get (t->peers, &peer_msg->peer.hashPubKey); if (NULL == peer_info) { GNUNET_break (0); @@ -3620,7 +3832,7 @@ handle_local_connect_del (void *cls, struct GNUNET_SERVER_Client *client, &peer_msg->peer.hashPubKey); send_destroy_path (t, peer_info->id); - tunnel_delete_peer(t, peer_info->id); + tunnel_delete_peer (t, peer_info->id); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } @@ -3688,17 +3900,35 @@ handle_local_connect_by_type (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_YES) { /* Yes! Fast forward, add ourselves to the tunnel and send the - * good news to the client + * good news to the client, and alert the destination client of + * an incoming tunnel. */ + struct GNUNET_MESH_TunnelNotification cmsg; + struct MeshClient *c; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: available locally\n"); GNUNET_CONTAINER_multihashmap_put (t->peers, &my_full_id.hashPubKey, peer_info_get (&my_full_id), GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: notifying client\n"); - send_client_peer_connected(t, myid); + send_client_peer_connected (t, myid); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Done\n"); GNUNET_SERVER_receive_done (client, GNUNET_OK); + + /* FIXME implement a proper handling of this case, + a client differentiation mechanism */ + cmsg.header.size = htons (sizeof (cmsg)); + cmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE); + cmsg.peer = my_full_id; + t->local_tid_dest = next_local_tid++; + cmsg.tunnel_id = htonl (t->local_tid_dest); + c = (struct MeshClient *) GNUNET_CONTAINER_multihashmap_get(applications, + &hash); + GNUNET_SERVER_notification_context_unicast (nc, c->handle, &cmsg.header, + GNUNET_NO); + + return; } /* Ok, lets find a peer offering the service */ @@ -3707,16 +3937,12 @@ handle_local_connect_by_type (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_DHT_get_stop (t->dht_get_type); } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: looking in DHT for %s\n", - GNUNET_h2s_full (&hash)); + GNUNET_h2s (&hash)); t->dht_get_type = - GNUNET_DHT_get_start (dht_handle, - GNUNET_TIME_UNIT_FOREVER_REL, - GNUNET_BLOCK_TYPE_TEST, - &hash, - 10U, + GNUNET_DHT_get_start (dht_handle, GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_BLOCK_TYPE_TEST, &hash, 10U, GNUNET_DHT_RO_RECORD_ROUTE | - GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, - NULL, 0, + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, 0, &dht_get_type_handler, t); GNUNET_SERVER_receive_done (client, GNUNET_OK); @@ -3774,8 +4000,7 @@ handle_local_unicast (void *cls, struct GNUNET_SERVER_Client *client, } /* Is it a local tunnel? Then, does client own the tunnel? */ - if (NULL != t->client && - NULL != t->client->handle && + if (NULL != t->client && NULL != t->client->handle && t->client->handle != client) { GNUNET_break (0); @@ -3876,7 +4101,7 @@ handle_local_to_origin (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - GNUNET_PEER_resolve(t->id.oid, &id); + GNUNET_PEER_resolve (t->id.oid, &id); /* Ok, everything is correct, send the message * (pretend we got it from a mesh peer) @@ -3955,16 +4180,18 @@ handle_local_multicast (void *cls, struct GNUNET_SERVER_Client *client, } { - char buf[ntohs(message->size)]; + char buf[ntohs (message->size)]; struct GNUNET_MESH_Multicast *copy; - copy = (struct GNUNET_MESH_Multicast *)buf; - memcpy(buf, message, ntohs(message->size)); + copy = (struct GNUNET_MESH_Multicast *) buf; + memcpy (buf, message, ntohs (message->size)); copy->oid = my_full_id; - copy->tid = htonl(t->id.tid); + copy->tid = htonl (t->id.tid); + copy->ttl = htonl (DEFAULT_TTL); + copy->mid = htonl (t->mid + 1); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: calling generic handler...\n"); - handle_mesh_data_multicast(client, &my_full_id, ©->header, NULL, 0); + handle_mesh_data_multicast (client, &my_full_id, ©->header, NULL, 0); } /* receive done gets called when last copy is sent to a neighbor */ @@ -4015,10 +4242,11 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Core init\n"); core_handle = server; - if (0 != memcmp(identity, &my_full_id, sizeof(my_full_id)) || NULL == server) + if (0 != memcmp (identity, &my_full_id, sizeof (my_full_id)) || + NULL == server) { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, _("MESH: Wrong CORE service\n")); - GNUNET_SCHEDULER_shutdown(); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("MESH: Wrong CORE service\n")); + GNUNET_SCHEDULER_shutdown (); } return; } @@ -4042,7 +4270,7 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, #if MESH_DEBUG_CONNECTION GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", - GNUNET_h2s(&my_full_id.hashPubKey)); + GNUNET_i2s (&my_full_id)); #endif peer_info = peer_info_get (peer); if (myid == peer_info->id) @@ -4055,16 +4283,15 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer, #if MESH_DEBUG_CONNECTION else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", - GNUNET_h2s(&peer->hashPubKey)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", GNUNET_i2s (peer)); } #endif path = path_new (2); path->peers[0] = myid; path->peers[1] = peer_info->id; - GNUNET_PEER_change_rc(myid, 1); - GNUNET_PEER_change_rc(peer_info->id, 1); - path_add_to_peer (peer_info, path); + GNUNET_PEER_change_rc (myid, 1); + GNUNET_PEER_change_rc (peer_info->id, 1); + peer_info_add_path (peer_info, path, GNUNET_YES); return; } @@ -4092,9 +4319,9 @@ core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) for (i = 0; i < CORE_QUEUE_SIZE; i++) { /* TODO: notify that the transmission failed */ - peer_info_cancel_transmission(pi, i); + peer_info_cancel_transmission (pi, i); } - path_remove_from_peer (pi, pi->id, myid); + peer_info_remove_path (pi, pi->id, myid); #if MESH_DEBUG_CONNECTION if (myid == pi->id) { @@ -4122,7 +4349,8 @@ static int shutdown_tunnel (void *cls, const GNUNET_HashCode * key, void *value) { struct MeshTunnel *t = value; - tunnel_destroy(t); + + tunnel_destroy (t); return GNUNET_YES; } @@ -4139,6 +4367,7 @@ static int shutdown_peer (void *cls, const GNUNET_HashCode * key, void *value) { struct MeshPeerInfo *p = value; + peer_info_destroy (p); return GNUNET_YES; } @@ -4153,14 +4382,14 @@ static void shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: shutting down\n"); - /* TODO: destroy tunnels? */ + if (core_handle != NULL) { GNUNET_CORE_disconnect (core_handle); core_handle = NULL; } - GNUNET_CONTAINER_multihashmap_iterate(tunnels, &shutdown_tunnel, NULL); - GNUNET_CONTAINER_multihashmap_iterate(peers, &shutdown_peer, NULL); + GNUNET_CONTAINER_multihashmap_iterate (tunnels, &shutdown_tunnel, NULL); + GNUNET_CONTAINER_multihashmap_iterate (peers, &shutdown_peer, NULL); if (dht_handle != NULL) { GNUNET_DHT_disconnect (dht_handle); @@ -4207,6 +4436,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, 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); @@ -4215,8 +4445,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY", - &keyfile)) + GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY", + &keyfile)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ @@ -4238,6 +4468,13 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, &my_full_id.hashPubKey); myid = GNUNET_PEER_intern (&my_full_id); +// // transport_handle = GNUNET_TRANSPORT_connect(c, +// // &my_full_id, +// // NULL, +// // NULL, +// // NULL, +// // NULL); + dht_handle = GNUNET_DHT_connect (c, 64); if (dht_handle == NULL) { @@ -4257,8 +4494,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, nc = GNUNET_SERVER_notification_context_create (server_handle, LOCAL_QUEUE_SIZE); GNUNET_SERVER_disconnect_notify (server_handle, - &handle_local_client_disconnect, - NULL); + &handle_local_client_disconnect, NULL); clients = NULL; @@ -4271,10 +4507,11 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, announce_id_task = GNUNET_SCHEDULER_add_now (&announce_id, cls); /* Create a peer_info for the local peer */ - peer = peer_info_get(&my_full_id); + peer = peer_info_get (&my_full_id); p = path_new (1); p->peers[0] = myid; - path_add_to_peer(peer, p); + GNUNET_PEER_change_rc (myid, 1); + peer_info_add_path (peer, p, GNUNET_YES); /* Scheduled the task to clean up when shutdown is called */ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,