X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fgnunet-service-mesh.c;h=f0a42f118f32942b94172e7eb783c8c1f999ed99;hb=60b22d16687c7cf4e9af0641448e1c182ad262e2;hp=01f30156e08e9551abbec0a220e8d8a1c07d494e;hpb=74e7bb910aef410888f92fdff592ebc592757c12;p=oweals%2Fgnunet.git diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 01f30156e..f0a42f118 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -523,6 +523,11 @@ struct MeshTunnel * Total messages pending for this tunnels, payload or not. */ unsigned int pending_messages; + + /** + * If the tunnel is empty, destoy it. + */ + GNUNET_SCHEDULER_TaskIdentifier delayed_destroy; }; @@ -743,6 +748,11 @@ struct MeshClient */ GNUNET_SCHEDULER_TaskIdentifier regex_announce_task; + /** + * Tmp store for partially retrieved regex. + */ + char *partial_regex; + }; @@ -923,6 +933,11 @@ static unsigned long long max_tunnels; */ static unsigned long long max_msgs_queue; +/** + * How many peers do we want to remember? + */ +static unsigned long long max_peers; + /*************************** Static global variables **************************/ @@ -2258,6 +2273,9 @@ send_client_peer_connected (const struct MeshTunnel *t, const GNUNET_PEER_Id id) { struct GNUNET_MESH_PeerControl pc; + if (NULL == t->owner || GNUNET_YES == t->destroy) + return; + pc.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_ADD); pc.header.size = htons (sizeof (struct GNUNET_MESH_PeerControl)); pc.tunnel_id = htonl (t->local_tid); @@ -2327,6 +2345,23 @@ send_client_tunnel_disconnect (struct MeshTunnel *t, struct MeshClient *c) } +/** + * Iterator over all the peers to remove the oldest not-used entry. + * + * @param cls Closure (unsued). + * @param key ID of the peer. + * @param value Peer_Info of the peer. + * + * FIXME implement + */ +static int +peer_info_timeout (void *cls, + const struct GNUNET_HashCode *key, + void *value) +{ + return GNUNET_YES; +} + /** * Retrieve the MeshPeerInfo stucture associated with the peer, create one * and insert it in the appropiate structures if the peer is not known yet. @@ -2345,10 +2380,17 @@ peer_info_get (const struct GNUNET_PeerIdentity *peer) { peer_info = (struct MeshPeerInfo *) GNUNET_malloc (sizeof (struct MeshPeerInfo)); + if (GNUNET_CONTAINER_multihashmap_size (peers) > max_peers) + { + GNUNET_CONTAINER_multihashmap_iterate (peers, + &peer_info_timeout, + NULL); + } GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, peer_info, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); peer_info->id = GNUNET_PEER_intern (peer); } + peer_info->last_contact = GNUNET_TIME_absolute_get(); return peer_info; } @@ -4336,17 +4378,30 @@ tunnel_unlock_bck_queue (struct MeshTunnel *t) * valid. * * @param t The tunnel whose peers to notify. + * @param send_back Do we need to notify our parent node? */ static void -tunnel_send_destroy (struct MeshTunnel *t) +tunnel_send_destroy (struct MeshTunnel *t, int send_back) { struct GNUNET_MESH_TunnelDestroy msg; + struct GNUNET_PeerIdentity id; + GNUNET_PEER_Id parent; + + if (tree_count_children(t->tree) > 0) + { + msg.header.size = htons (sizeof (msg)); + msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY); + GNUNET_PEER_resolve (t->id.oid, &msg.oid); + msg.tid = htonl (t->id.tid); + tunnel_send_multicast (t, &msg.header); + } + parent = tree_get_predecessor(t->tree); + if (GNUNET_NO == send_back || 0 == parent) + return; msg.header.size = htons (sizeof (msg)); msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY); - GNUNET_PEER_resolve (t->id.oid, &msg.oid); - msg.tid = htonl (t->id.tid); - tunnel_send_multicast (t, &msg.header); + send_prebuilt_message(&msg.header, &id, t); } @@ -4459,17 +4514,9 @@ tunnel_destroy (struct MeshTunnel *t) } } - if (t->nclients > 0) - { - if (GNUNET_YES != - GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t)) - { - GNUNET_break (0); - r = GNUNET_SYSERR; - } - GNUNET_free (t->clients); - GNUNET_free (t->clients_fc); - } + (void) GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t); + GNUNET_free_non_null (t->clients); + GNUNET_free_non_null (t->clients_fc); if (NULL != t->peers) { @@ -4502,6 +4549,78 @@ tunnel_destroy (struct MeshTunnel *t) return r; } +#define TUNNEL_DESTROY_EMPTY_TIME GNUNET_TIME_UNIT_MILLISECONDS + +/** + * Tunnel is empty: destroy it. + * + * @param cls Closure (Tunnel). + * @param tc TaskContext. + */ +static void +tunnel_destroy_empty_delayed (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + struct MeshTunnel *t = cls; + + t->delayed_destroy = GNUNET_SCHEDULER_NO_TASK; + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) + return; + + if (0 != t->nclients || + 0 != tree_count_children (t->tree)) + return; + + #if MESH_DEBUG + { + struct GNUNET_PeerIdentity id; + + GNUNET_PEER_resolve (t->id.oid, &id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "executing destruction of empty tunnel %s [%X]\n", + GNUNET_i2s (&id), t->id.tid); + } + #endif + + tunnel_destroy (t); +} + + +/** + * Schedule tunnel destruction if is empty and no new traffic comes in a time. + * + * @param t Tunnel to destroy if empty. + */ +static void +tunnel_destroy_empty (struct MeshTunnel *t) +{ + if (GNUNET_SCHEDULER_NO_TASK != t->delayed_destroy || + 0 != t->nclients || + 0 != tree_count_children (t->tree)) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u %u %u\n", + t->delayed_destroy, t->nclients, tree_count_children(t->tree)); + return; + } + + #if MESH_DEBUG + { + struct GNUNET_PeerIdentity id; + + GNUNET_PEER_resolve (t->id.oid, &id); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "scheduling destruction of empty tunnel %s [%X]\n", + GNUNET_i2s (&id), t->id.tid); + } + #endif + + t->delayed_destroy = + GNUNET_SCHEDULER_add_delayed (TUNNEL_DESTROY_EMPTY_TIME, + &tunnel_destroy_empty_delayed, + t); +} + /** * Create a new tunnel @@ -4610,21 +4729,23 @@ tunnel_delete_peer (struct MeshTunnel *t, GNUNET_PEER_Id peer) * @return GNUNET_OK, keep iterating. */ static int -tunnel_destroy_iterator (void *cls, const struct GNUNET_HashCode * key, void *value) +tunnel_destroy_iterator (void *cls, + const struct GNUNET_HashCode * key, + void *value) { struct MeshTunnel *t = value; struct MeshClient *c = cls; - send_client_tunnel_disconnect(t, c); + send_client_tunnel_disconnect (t, c); if (c != t->owner) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Client %u is destination, keeping the tunnel alive.\n", c->id); - tunnel_delete_client(t, c); - client_delete_tunnel(c, t); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %u is destination.\n", c->id); + tunnel_delete_client (t, c); + client_delete_tunnel (c, t); + tunnel_destroy_empty (t); return GNUNET_OK; } - tunnel_send_destroy(t); + tunnel_send_destroy (t, GNUNET_YES); t->owner = NULL; t->destroy = GNUNET_YES; @@ -5666,10 +5787,12 @@ handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, struct GNUNET_MESH_TunnelDestroy *msg; struct MeshTunnel *t; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Got a TUNNEL DESTROY packet from %s\n", GNUNET_i2s (peer)); msg = (struct GNUNET_MESH_TunnelDestroy *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " for tunnel %s [%u]\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got a TUNNEL DESTROY packet from %s\n", + GNUNET_i2s (peer)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " for tunnel %s [%u]\n", GNUNET_i2s (&msg->oid), ntohl (msg->tid)); t = tunnel_get (&msg->oid, ntohl (msg->tid)); if (NULL == t) @@ -5678,7 +5801,8 @@ handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, * destroyed the tunnel and retransmitted to children. * Safe to ignore. */ - GNUNET_STATISTICS_update (stats, "# control on unknown tunnel", 1, GNUNET_NO); + GNUNET_STATISTICS_update (stats, "# control on unknown tunnel", + 1, GNUNET_NO); return GNUNET_OK; } if (t->id.oid == myid) @@ -5693,7 +5817,7 @@ handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer, t->local_tid, t->local_tid_dest); send_clients_tunnel_destroy (t); } - tunnel_send_destroy (t); + tunnel_send_destroy (t, GNUNET_YES); t->destroy = GNUNET_YES; // TODO: add timeout to destroy the tunnel anyway return GNUNET_OK; @@ -5926,6 +6050,7 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, struct MeshPeerInfo *peer_info; struct MeshTunnel *t; struct MeshTunnelChildInfo *cinfo; + GNUNET_PEER_Id predecessor; size_t size; uint32_t pid; @@ -5948,10 +6073,9 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, { /* TODO notify that we dont know this tunnel (whom)? */ GNUNET_STATISTICS_update (stats, "# data on unknown tunnel", 1, GNUNET_NO); - GNUNET_break_op (0); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received to_origin with PID %u on unknown tunnel\n", - pid); + "Received to_origin with PID %u on unknown tunnel %s [%u]\n", + pid, GNUNET_i2s (&msg->oid), ntohl (msg->tid)); return GNUNET_OK; } @@ -6005,7 +6129,31 @@ handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, GNUNET_break (0); return GNUNET_OK; } - GNUNET_PEER_resolve (tree_get_predecessor (t->tree), &id); + predecessor = tree_get_predecessor (t->tree); + if (0 == predecessor) + { + if (GNUNET_YES == t->destroy) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "to orig received on a dying tunnel %s [%X]\n", + GNUNET_i2s (&msg->oid), ntohl(msg->tid)); + return GNUNET_OK; + } + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "unknown to origin at %s\n", + GNUNET_i2s (&my_full_id)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "from peer %s\n", + GNUNET_i2s (peer)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "for tunnel %s [%X]\n", + GNUNET_i2s (&msg->oid), ntohl(msg->tid)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "current tree:\n"); + tree_debug (t->tree); + return GNUNET_OK; + } + GNUNET_PEER_resolve (predecessor, &id); send_prebuilt_message (message, &id, t); GNUNET_STATISTICS_update (stats, "# to origin forwarded", 1, GNUNET_NO); @@ -6682,7 +6830,6 @@ handle_local_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) return; } -// return; uncomment for regex_profiler c = clients; while (NULL != c) { @@ -6859,6 +7006,7 @@ handle_local_announce_regex (void *cls, struct GNUNET_SERVER_Client *client, struct MeshClient *c; char *regex; size_t len; + size_t offset; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "announce regex started\n"); @@ -6872,10 +7020,34 @@ handle_local_announce_regex (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " by client %u\n", c->id); msg = (const struct GNUNET_MESH_RegexAnnounce *) message; + len = ntohs (message->size) - sizeof(struct GNUNET_MESH_RegexAnnounce); - regex = GNUNET_malloc (len + 1); - memcpy (regex, &msg[1], len); - regex[len] = '\0'; + if (NULL != c->partial_regex) + { + regex = c->partial_regex; + offset = strlen (c->partial_regex); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " continuation, already have %u bytes\n", + offset); + } + else + { + regex = NULL; + offset = 0; + } + + regex = GNUNET_realloc (regex, offset + len + 1); + memcpy (®ex[offset], &msg[1], len); + regex[offset + len] = '\0'; + if (0 == ntohs (msg->last)) + { + c->partial_regex = regex; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " not ended, stored %u bytes for later\n", + len); + GNUNET_SERVER_receive_done (client, GNUNET_OK); + return; + } rd.regex = regex; rd.compression = ntohs (msg->compression_characters); rd.dfa = NULL; @@ -6883,6 +7055,7 @@ handle_local_announce_regex (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " regex %s\n", regex); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " cm %u\n", ntohs(rd.compression)); GNUNET_array_append (c->regexes, c->n_regex, rd); + c->partial_regex = NULL; if (GNUNET_SCHEDULER_NO_TASK == c->regex_announce_task) { c->regex_announce_task = GNUNET_SCHEDULER_add_now(&announce_regex, c); @@ -7020,19 +7193,7 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client, if (c != t->owner || tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV) { client_ignore_tunnel (c, t); -#if 0 - // TODO: when to destroy incoming tunnel? - if (t->nclients == 0) - { - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, - &hash, t)); - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (t->peers, - &my_full_id.hashPubKey, - t)); - } -#endif + tunnel_destroy_empty (t); GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } @@ -7041,7 +7202,7 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client, /* Don't try to ACK the client about the tunnel_destroy multicast packet */ t->owner = NULL; - tunnel_send_destroy (t); + tunnel_send_destroy (t, GNUNET_YES); t->destroy = GNUNET_YES; // The tunnel will be destroyed when the last message is transmitted. GNUNET_SERVER_receive_done (client, GNUNET_OK); @@ -8093,7 +8254,7 @@ monitor_all_tunnels_iterator (void *cls, msg->tunnel_id = htonl (t->id.tid); msg->header.size = htons (sizeof (struct GNUNET_MESH_LocalMonitor) + npeers * sizeof (struct GNUNET_PeerIdentity)); - msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_MONITOR); + msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS); msg->npeers = 0; (void) GNUNET_CONTAINER_multihashmap_iterate (t->peers, monitor_peers_iterator, @@ -8106,14 +8267,14 @@ monitor_all_tunnels_iterator (void *cls, if (msg->npeers != npeers) { GNUNET_break (0); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Monitor fail: size %u - iter %u\n", + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Get tunnels fail: size %u - iter %u\n", npeers, msg->npeers); } msg->npeers = htonl (npeers); GNUNET_SERVER_notification_context_unicast (nc, client, - &msg->header, - GNUNET_NO); + &msg->header, GNUNET_NO); return GNUNET_YES; } @@ -8126,8 +8287,8 @@ monitor_all_tunnels_iterator (void *cls, * @param message The actual message. */ static void -handle_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +handle_local_get_tunnels (void *cls, struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) { struct MeshClient *c; @@ -8140,13 +8301,13 @@ handle_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Received monitor request from client %u\n", + "Received get tunnels request from client %u\n", c->id); GNUNET_CONTAINER_multihashmap_iterate (tunnels, monitor_all_tunnels_iterator, client); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Monitor request from client %u completed\n", + "Get tunnels request from client %u completed\n", c->id); GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -8154,9 +8315,6 @@ handle_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, /** * Data needed to build a Monitor_Tunnel message. - * - * Both arrays can be combined to look up the position of the parent of - * a peer: lookup[parent[peer]]. */ struct MeshMonitorTunnelContext { @@ -8166,19 +8324,20 @@ struct MeshMonitorTunnelContext struct GNUNET_MESH_LocalMonitor *msg; /** - * Array with parents: peer->parent. + * Hashmap with positions: peer->position. */ - GNUNET_PEER_Id *parents; + struct GNUNET_CONTAINER_MultiHashMap *lookup; /** - * Array with positions: peer->position. + * Index of the parent of each peer in the message, realtive to the absolute + * order in the array (can be in a previous message). */ - uint32_t *lookup; + uint32_t parents[1024]; /** - * Size of the message so far. + * Peers visited so far in the tree, aka position of the current peer. */ - size_t size; + unsigned int npeers; /** * Client requesting the info. @@ -8188,15 +8347,17 @@ struct MeshMonitorTunnelContext /** - * Send a client a message about + * Send a client a message about the structure of a tunnel. + * + * @param ctx Context of the tunnel iteration, with info regarding the state + * of the execution and the number of peers visited for this message. */ static void -send_client_monitor_tunnel (struct MeshMonitorTunnelContext *ctx) +send_client_tunnel_info (struct MeshMonitorTunnelContext *ctx) { struct GNUNET_MESH_LocalMonitor *resp = ctx->msg; struct GNUNET_PeerIdentity *pid; unsigned int *parent; - unsigned int i; size_t size; size = sizeof (struct GNUNET_MESH_LocalMonitor); @@ -8204,8 +8365,7 @@ send_client_monitor_tunnel (struct MeshMonitorTunnelContext *ctx) resp->header.size = htons (size); pid = (struct GNUNET_PeerIdentity *) &resp[1]; parent = (unsigned int *) &pid[resp->npeers]; - for (i = 0; i < resp->npeers; i++) - parent[i] = htonl (ctx->lookup[ctx->parents[i]]); + memcpy (parent, ctx->parents, sizeof(uint32_t) * resp->npeers); GNUNET_SERVER_notification_context_unicast (nc, ctx->c->handle, &resp->header, GNUNET_NO); } @@ -8217,32 +8377,39 @@ send_client_monitor_tunnel (struct MeshMonitorTunnelContext *ctx) * @param cls Closure (pointer to pointer of message being built). * @param peer Short ID of a peer. * @param parent Short ID of the @c peer 's parent. - * - * FIXME: limit iterating to a message size / split if necessary */ static void -monitor_tunnel_iterator (void *cls, - GNUNET_PEER_Id peer, - GNUNET_PEER_Id parent) +tunnel_tree_iterator (void *cls, + GNUNET_PEER_Id peer, + GNUNET_PEER_Id parent) { struct MeshMonitorTunnelContext *ctx = cls; - struct GNUNET_MESH_LocalMonitor *msg = ctx->msg; + struct GNUNET_MESH_LocalMonitor *msg; struct GNUNET_PeerIdentity *pid; + struct GNUNET_PeerIdentity ppid; msg = ctx->msg; pid = (struct GNUNET_PeerIdentity *) &msg[1]; - GNUNET_PEER_resolve(peer, &pid[msg->npeers]); - ctx->parents[msg->npeers] = parent; - ctx->lookup[peer] = msg->npeers; - ctx->size += sizeof (struct GNUNET_PeerIdentity) * sizeof (uint32_t); + GNUNET_PEER_resolve (peer, &pid[msg->npeers]); + GNUNET_CONTAINER_multihashmap_put (ctx->lookup, + &pid[msg->npeers].hashPubKey, + (void *) (long) ctx->npeers, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + GNUNET_PEER_resolve (parent, &ppid); + ctx->parents[msg->npeers] = + htonl ((long) GNUNET_CONTAINER_multihashmap_get (ctx->lookup, + &ppid.hashPubKey)); + + ctx->npeers++; msg->npeers++; - if ( (ctx->size + sizeof (struct GNUNET_PeerIdentity) * sizeof (uint32_t)) - > USHRT_MAX ) + if (sizeof (struct GNUNET_MESH_LocalMonitor) + + (msg->npeers + 1) * + (sizeof (struct GNUNET_PeerIdentity) + sizeof (uint32_t)) + > USHRT_MAX) { - send_client_monitor_tunnel (ctx); - ctx->size = sizeof (struct GNUNET_MESH_LocalMonitor); - ctx->msg->npeers = 0; + send_client_tunnel_info (ctx); + msg->npeers = 0; } } @@ -8255,8 +8422,8 @@ monitor_tunnel_iterator (void *cls, * @param message The actual message. */ static void -handle_local_monitor_tunnel (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +handle_local_show_tunnel (void *cls, struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) { const struct GNUNET_MESH_LocalMonitor *msg; struct GNUNET_MESH_LocalMonitor *resp; @@ -8274,8 +8441,10 @@ handle_local_monitor_tunnel (void *cls, struct GNUNET_SERVER_Client *client, msg = (struct GNUNET_MESH_LocalMonitor *) message; GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Received monitor tunnel request from client %u\n", - c->id); + "Received tunnel info request from client %u for tunnel %s[%X]\n", + c->id, + &msg->owner, + ntohl (msg->tunnel_id)); t = tunnel_get (&msg->owner, ntohl (msg->tunnel_id)); if (NULL == t) { @@ -8291,22 +8460,21 @@ handle_local_monitor_tunnel (void *cls, struct GNUNET_SERVER_Client *client, return; } + /* Initialize context */ resp = GNUNET_malloc (USHRT_MAX); /* avoid realloc'ing on each step */ *resp = *msg; resp->npeers = 0; ctx.msg = resp; - ctx.parents = GNUNET_malloc (sizeof (GNUNET_PEER_Id) * 1024); /* hard limit anyway */ - ctx.lookup = GNUNET_malloc (sizeof (int) * 1024); - ctx.size = sizeof (struct GNUNET_MESH_LocalMonitor); + ctx.lookup = GNUNET_CONTAINER_multihashmap_create (4 * t->peers_total, + GNUNET_YES); ctx.c = c; - tree_iterate_all (t->tree, - monitor_tunnel_iterator, - &ctx); - send_client_monitor_tunnel (&ctx); + /* Collect and send information */ + tree_iterate_all (t->tree, &tunnel_tree_iterator, &ctx); + send_client_tunnel_info (&ctx); - GNUNET_free (ctx.parents); - GNUNET_free (ctx.lookup); + /* Free context */ + GNUNET_CONTAINER_multihashmap_destroy (ctx.lookup); GNUNET_free (resp); GNUNET_log (GNUNET_ERROR_TYPE_INFO, @@ -8368,11 +8536,11 @@ static struct GNUNET_SERVER_MessageHandler client_handlers[] = { {&handle_local_ack, NULL, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK, sizeof (struct GNUNET_MESH_LocalAck)}, - {&handle_local_monitor, NULL, - GNUNET_MESSAGE_TYPE_MESH_LOCAL_MONITOR, + {&handle_local_get_tunnels, NULL, + GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS, sizeof (struct GNUNET_MessageHeader)}, - {&handle_local_monitor_tunnel, NULL, - GNUNET_MESSAGE_TYPE_MESH_LOCAL_MONITOR_TUNNEL, + {&handle_local_show_tunnel, NULL, + GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL, sizeof (struct GNUNET_MESH_LocalMonitor)}, {NULL, NULL, 0, 0} }; @@ -8396,6 +8564,12 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server, NULL == server) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n")); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + " core id %s\n", + GNUNET_i2s (identity)); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + " my id %s\n", + GNUNET_i2s (&my_full_id)); GNUNET_SCHEDULER_shutdown (); // Try gracefully if (10 < i++) GNUNET_abort(); // Try harder @@ -8555,7 +8729,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CORE_disconnect (core_handle); core_handle = NULL; } - if (NULL != keygen) + if (NULL != keygen) { GNUNET_CRYPTO_rsa_key_create_stop (keygen); keygen = NULL; @@ -8577,6 +8751,11 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_cancel (announce_id_task); announce_id_task = GNUNET_SCHEDULER_NO_TASK; } + if (GNUNET_SCHEDULER_NO_TASK != announce_applications_task) + { + GNUNET_SCHEDULER_cancel (announce_applications_task); + announce_applications_task = GNUNET_SCHEDULER_NO_TASK; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shut down\n"); } @@ -8584,7 +8763,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** * Callback for hostkey read/generation * - * @param cls NULL + * @param cls Closure (Configuration handle). * @param pk the private key * @param emsg error message */ @@ -8593,6 +8772,7 @@ key_generation_cb (void *cls, struct GNUNET_CRYPTO_RsaPrivateKey *pk, const char *emsg) { + const struct GNUNET_CONFIGURATION_Handle *c = cls; struct MeshPeerInfo *peer; struct MeshPeerPath *p; @@ -8600,7 +8780,8 @@ key_generation_cb (void *cls, if (NULL == pk) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Mesh service could not access hostkey. Exiting.\n")); + _("Mesh service could not access hostkey: %s. Exiting.\n"), + emsg); GNUNET_SCHEDULER_shutdown (); return; } @@ -8620,7 +8801,23 @@ key_generation_cb (void *cls, // NULL, // NULL); - + core_handle = GNUNET_CORE_connect (c, /* Main configuration */ + NULL, /* Closure passed to MESH functions */ + &core_init, /* Call core_init once connected */ + &core_connect, /* Handle connects */ + &core_disconnect, /* remove peers on disconnects */ + NULL, /* Don't notify about all incoming messages */ + GNUNET_NO, /* For header only in notification */ + 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); + GNUNET_SCHEDULER_shutdown (); + return; + } next_tid = 0; next_local_tid = GNUNET_MESH_LOCAL_TUNNEL_ID_SERV; @@ -8665,23 +8862,6 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting to run\n"); server_handle = server; - core_handle = GNUNET_CORE_connect (c, /* Main configuration */ - NULL, /* Closure passed to MESH functions */ - &core_init, /* Call core_init once connected */ - &core_connect, /* Handle connects */ - &core_disconnect, /* remove peers on disconnects */ - NULL, /* Don't notify about all incoming messages */ - GNUNET_NO, /* For header only in notification */ - 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); - GNUNET_SCHEDULER_shutdown (); - return; - } if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY", @@ -8780,6 +8960,16 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, default_ttl = 64; } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_PEERS", + &max_peers)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("%s service is lacking key configuration settings (%s). Using default (%u).\n"), + "mesh", "max peers", 1000); + max_peers = 1000; + } + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (c, "MESH", "DHT_REPLICATION_LEVEL", &dht_replication_level)) @@ -8808,7 +8998,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, /* Scheduled the task to clean up when shutdown is called */ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); - keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, &key_generation_cb, NULL); + keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, + &key_generation_cb, + (void *) c); GNUNET_free (keyfile); }