/*
This file is part of GNUnet.
- (C) 2001-2012 Christian Grothoff (and other contributing authors)
+ (C) 2001-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
/**
- * @file mesh/gnunet-service-mesh.c
+ * @file mesh/gnunet-service-mesh-new.c
* @brief GNUnet MESH service
* @author Bartlomiej Polot
*
- * STRUCTURE:
- * - DATA STRUCTURES
- * - GLOBAL VARIABLES
- * - GENERAL HELPERS
- * - PERIODIC FUNCTIONS
- * - MESH NETWORK HANDLER HELPERS
- * - MESH NETWORK HANDLES
- * - MESH LOCAL HANDLER HELPERS
- * - MESH LOCAL HANDLES
- * - MAIN FUNCTIONS (main & run)
- *
* TODO:
- * - error reporting (CREATE/CHANGE/ADD/DEL?) -- new message!
- * - partial disconnect reporting -- same as error reporting?
- * - add ping message
* - relay corking down to core
- * - set ttl relative to tree depth
- * - Add data ACK count in path ACK
- * - Make common GNUNET_MESH_Data header for unicast, to_orig, multicast
+ * - set ttl relative to path length
+ * - add signatures
+ * - add encryption
+ * - keep queues until receiving ACK
* TODO END
*/
#include "platform.h"
#include "mesh2.h"
#include "mesh2_protocol.h"
-#include "mesh_tunnel_tree.h"
+#include "mesh_path.h"
#include "block_mesh.h"
#include "gnunet_dht_service.h"
#include "gnunet_statistics_service.h"
};
-/**
- * Struct containing all info possibly needed to build a package when called
- * back by core.
- */
-struct MeshTransmissionDescriptor
-{
- /** ID of the tunnel this packet travels in */
- struct MESH_TunnelID *origin;
-
- /** Who was this message being sent to */
- struct MeshPeerInfo *peer;
-
- /** Ultimate destination of the packet */
- GNUNET_PEER_Id destination;
-
- /** Tunnel it belongs to. */
- struct MeshTunnel *t;
-
- /** Size of the data. */
- size_t data_len;
-
- /** Data itself */
- void *data;
-};
-
-
/**
* Struct containing all information regarding a given peer
*/
unsigned int queue_n;
/**
- * Handle to for queued transmissions
+ * Handle for queued transmissions
*/
struct GNUNET_CORE_TransmitHandle *core_transmit;
};
*/
struct MESH_TunnelID id;
+ /**
+ * Port of the tunnel.
+ */
+ uint32_t port;
+
+ /**
+ * State of the tunnel.
+ */
+ enum MeshTunnelState state;
+
/**
* Local tunnel number ( >= GNUNET_MESH_LOCAL_TUNNEL_ID_CLI or 0 )
*/
GNUNET_PEER_Id dest;
/**
- * Next hop in the tunnel.
+ * Next hop in the tunnel. If 0, @c client must be set.
*/
GNUNET_PEER_Id next_hop;
/**
- * Previous hop in the tunnel.
+ * Previous hop in the tunnel. If 0, @c owner must be set.
*/
GNUNET_PEER_Id prev_hop;
/**
- * Flow control information about @c next_hop.
+ * Flow control information about @c next_hop or @c client.
*/
struct MeshFlowControl next_fc;
/**
- * Flow control information about @c prev_hop.
+ * Flow control information about @c prev_hop or @c owner.
*/
struct MeshFlowControl prev_fc;
struct MeshClient *owner;
/**
- * Task to keep the used paths alive at the owner,
- * time tunnel out on all the other peers.
- */
- GNUNET_SCHEDULER_TaskIdentifier maintenance_task;
-
- /**
- * Clients that have been informed about and want to stay in the tunnel.
- */
- struct MeshClient **clients;
-
- /**
- * Flow control info for each client.
- */
- struct MeshTunnelClientInfo *clients_fc;
-
- /**
- * Number of elements in clients/clients_fc
- */
- unsigned int nclients;
-
- /**
- * Clients that have been informed but requested to leave the tunnel.
+ * Client destination of the tunnel, if any.
*/
- struct MeshClient **ignore;
+ struct MeshClient *client;
/**
- * Number of elements in clients
+ * Task to keep the used paths alive at the owner,
+ * time tunnel out on all the other peers.
*/
- unsigned int nignore;
+ GNUNET_SCHEDULER_TaskIdentifier maintenance_task;
/**
* Path being used for the tunnel.
* 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;
-};
-
-
-/**
- * Info about a leaf client of a tunnel, needed to perform flow control.
- */
-struct MeshTunnelClientInfo
-{
- /**
- * PID of the last packet sent to the client (FWD).
- */
- uint32_t fwd_pid;
-
- /**
- * PID of the last packet received from the client (BCK).
- */
- uint32_t bck_pid;
-
- /**
- * Maximum PID allowed (FWD ACK received).
- */
- uint32_t fwd_ack;
-
- /**
- * Last ACK sent to that child (BCK ACK).
- */
- uint32_t bck_ack;
};
/**
* Struct containing information about a client of the service
+ *
+ * TODO: add a list of 'waiting' ports
*/
struct MeshClient
{
*/
struct GNUNET_CONTAINER_MultiHashMap *incoming_tunnels;
- /**
- * Tunnels this client has rejected, indexed by incoming local id
- */
- struct GNUNET_CONTAINER_MultiHashMap *ignore_tunnels;
/**
* Handle to communicate with the client
*/
struct GNUNET_SERVER_Client *handle;
/**
- * Messages that this client has declared interest in
+ * Ports that this client has declared interest in.
+ * Indexed by a GMC_hash32 (type), contains *Client.
*/
- struct GNUNET_CONTAINER_MultiHashMap *types;
+ struct GNUNET_CONTAINER_MultiHashMap *ports;
/**
* Whether the client is active or shutting down (don't send confirmations
}
#endif
+/* FIXME */
unsigned int debug_fwd_ack;
unsigned int debug_bck_ack;
static MESH_TunnelNumber next_local_tid;
/**
- * All message types clients of this peer are interested in.
+ * All ports clients of this peer have opened.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *types;
+static struct GNUNET_CONTAINER_MultiHashMap *ports;
/**
* Task to periodically announce itself in the network.
tunnel_get (const struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid);
-/**
- * Delete an active client from the tunnel.
- *
- * @param t Tunnel.
- * @param c Client.
- */
-static void
-tunnel_delete_active_client (struct MeshTunnel *t, const struct MeshClient *c);
-
/**
* Notify a tunnel that a connection has broken that affects at least
* some of its peers.
/**
- * Get the current ack value for a tunnel, for data going from root to leaves,
- * taking in account the tunnel mode and the status of all children and clients.
- *
- * @param t Tunnel.
- *
- * @return Maximum PID allowed.
- */
-static uint32_t
-tunnel_get_fwd_ack (struct MeshTunnel *t);
-
-
-/**
- * Add a client to a tunnel, initializing all needed data structures.
- *
- * @param t Tunnel to which add the client.
- * @param c Client which to add to the tunnel.
- */
-static void
-tunnel_add_client (struct MeshTunnel *t, struct MeshClient *c);
-
-
-/**
- * Use the given path for the tunnel.
+ * @brief Use the given path for the tunnel.
+ * Update the next and prev hops (and RCs).
+ * (Re)start the path refresh in case the tunnel is locally owned.
*
* @param t Tunnel to update.
* @param p Path to use.
}
-/**
- * Checks if a given client has subscribed to certain message type
- *
- * @param message_type Type of message to check
- * @param c Client to check
- *
- * @return GNUNET_YES or GNUNET_NO, depending on subscription status
- *
- * FIXME: use of crypto_hash slows it down
- * The hash function alone takes 8-10us out of the ~55us for the whole
- * process of retransmitting the message from one local client to another.
- * Find faster implementation!
- */
-static int
-client_is_subscribed (uint16_t message_type, struct MeshClient *c)
-{
- struct GNUNET_HashCode hc;
-
- if (NULL == c->types)
- return GNUNET_NO;
-
- GNUNET_CRYPTO_hash (&message_type, sizeof (uint16_t), &hc);
- return GNUNET_CONTAINER_multihashmap_contains (c->types, &hc);
-}
-
-
-/**
- * Check whether client wants traffic from a tunnel.
- *
- * @param c Client to check.
- * @param t Tunnel to be found.
- *
- * @return GNUNET_YES if client knows tunnel.
- *
- * TODO look in client hashmap
- */
-static int
-client_wants_tunnel (struct MeshClient *c, struct MeshTunnel *t)
-{
- unsigned int i;
-
- for (i = 0; i < t->nclients; i++)
- if (t->clients[i] == c)
- return GNUNET_YES;
- return GNUNET_NO;
-}
-
-
-/**
- * Check whether client has been informed about a tunnel.
- *
- * @param c Client to check.
- * @param t Tunnel to be found.
- *
- * @return GNUNET_YES if client knows tunnel.
- *
- * TODO look in client hashmap
- */
-static int
-client_knows_tunnel (struct MeshClient *c, struct MeshTunnel *t)
-{
- unsigned int i;
-
- for (i = 0; i < t->nignore; i++)
- if (t->ignore[i] == c)
- return GNUNET_YES;
- return client_wants_tunnel(c, t);
-}
-
-
-/**
- * Marks a client as uninterested in traffic from the tunnel, updating both
- * client and tunnel to reflect this.
- *
- * @param c Client that doesn't want traffic anymore.
- * @param t Tunnel which should be ignored.
- *
- * FIXME when to delete an incoming tunnel?
- */
-static void
-client_ignore_tunnel (struct MeshClient *c, struct MeshTunnel *t)
-{
- struct GNUNET_HashCode hash;
-
- GNUNET_CRYPTO_hash (&t->local_tid_dest, sizeof (MESH_TunnelNumber), &hash);
- GNUNET_break (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (c->incoming_tunnels,
- &hash, t));
- GNUNET_break (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (c->ignore_tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- tunnel_delete_active_client (t, c);
- GNUNET_array_append (t->ignore, t->nignore, c);
-}
-
-
/**
* Deletes a tunnel from a client (either owner or destination). To be used on
- * tunnel destroy, otherwise, use client_ignore_tunnel.
+ * tunnel destroy.
*
* @param c Client whose tunnel to delete.
* @param t Tunnel which should be deleted.
if (c == t->owner)
{
- GNUNET_CRYPTO_hash(&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
+ GMC_hash32 (t->local_tid, &hash);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (c->own_tunnels,
&hash,
t));
}
- else
+ else if (c == t->client)
{
- GNUNET_CRYPTO_hash(&t->local_tid_dest, sizeof (MESH_TunnelNumber), &hash);
- // FIXME XOR?
+ GMC_hash32 (t->local_tid_dest, &hash);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (c->incoming_tunnels,
- &hash,
- t) ||
- GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (c->ignore_tunnels,
&hash,
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.
- * @param t The tunnel to whose clients this message goes.
- *
- * @return number of clients this message was sent to
- */
-static unsigned int
-send_subscribed_clients (const struct GNUNET_MessageHeader *msg,
- const struct GNUNET_MessageHeader *payload,
- struct MeshTunnel *t)
-{
- struct MeshClient *c;
- MESH_TunnelNumber *tid;
- unsigned int count;
- uint16_t type;
- char cbuf[htons (msg->size)];
-
- type = ntohs (payload->type);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending to clients...\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "message of type %s\n",
- GNUNET_MESH_DEBUG_M2S (type));
-
- memcpy (cbuf, msg, sizeof (cbuf));
- switch (htons (msg->type))
- {
- struct GNUNET_MESH_Unicast *uc;
- struct GNUNET_MESH_ToOrigin *to;
-
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- uc = (struct GNUNET_MESH_Unicast *) cbuf;
- tid = &uc->tid;
- break;
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- to = (struct GNUNET_MESH_ToOrigin *) cbuf;
- tid = &to->tid;
- break;
- default:
- GNUNET_break (0);
- return 0;
- }
-
- for (count = 0, c = clients_head; c != NULL; c = c->next)
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client %u\n", c->id);
- if (client_is_subscribed (type, c))
- {
- if (htons (msg->type) == GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN)
- {
- if (c != t->owner)
- continue;
- *tid = htonl (t->local_tid);
- }
- else
- {
- if (GNUNET_NO == client_knows_tunnel (c, t))
- {
- /* This client doesn't know the tunnel */
- struct GNUNET_MESH_TunnelNotification tmsg;
- struct GNUNET_HashCode hash;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " sending tunnel create\n");
- tmsg.header.size = htons (sizeof (tmsg));
- tmsg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
- GNUNET_PEER_resolve (t->id.oid, &tmsg.peer);
- tmsg.tunnel_id = htonl (t->local_tid_dest);
- tmsg.opt = 0;
- if (GNUNET_YES == t->nobuffer)
- tmsg.opt |= MESH_TUNNEL_OPT_NOBUFFER;
- GNUNET_SERVER_notification_context_unicast (nc, c->handle,
- &tmsg.header, GNUNET_NO);
- tunnel_add_client (t, c);
- GNUNET_CRYPTO_hash (&t->local_tid_dest, sizeof (MESH_TunnelNumber),
- &hash);
- GNUNET_break (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (
- c->incoming_tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
- }
- *tid = htonl (t->local_tid_dest);
- }
-
- /* Check if the client wants to get traffic from the tunnel */
- if (GNUNET_NO == client_wants_tunnel(c, t))
- continue;
- count++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " sending\n");
- GNUNET_SERVER_notification_context_unicast (nc, c->handle,
- (struct GNUNET_MessageHeader
- *) cbuf, GNUNET_NO);
- }
+ GNUNET_break (0);
}
-
- return count;
}
-
/**
- * Notify all clients (not depending on registration status) that the incoming
- * tunnel is no longer valid.
+ * Notify the appropiate client that a new incoming tunnel was created.
*
- * @param t Tunnel that was destroyed.
+ * @param t Tunnel that was created.
*/
static void
-send_clients_tunnel_destroy (struct MeshTunnel *t)
+send_client_tunnel_create (struct MeshTunnel *t)
{
struct GNUNET_MESH_TunnelMessage msg;
+ if (NULL == t->client)
+ return;
msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
msg.tunnel_id = htonl (t->local_tid_dest);
- GNUNET_SERVER_notification_context_broadcast (nc, &msg.header, GNUNET_NO);
+ msg.port = htonl (t->port);
+ GNUNET_PEER_resolve (t->id.oid, &msg.peer);
+ GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
+ &msg.header, GNUNET_NO);
}
/**
- * Notify clients of tunnel disconnections, if needed.
- * In case the origin disconnects, the destination clients get a tunnel destroy
- * notification. If the last destination disconnects (only one remaining client
- * in tunnel), the origin gets a (local ID) peer disconnected.
- * Note that the function must be called BEFORE removing the client from
- * the tunnel.
+ * Notify dest client that the incoming tunnel is no longer valid.
*
* @param t Tunnel that was destroyed.
- * @param c Client that disconnected.
*/
static void
-send_client_tunnel_disconnect (struct MeshTunnel *t, struct MeshClient *c)
+send_client_tunnel_destroy (struct MeshTunnel *t)
{
- unsigned int i;
-
- if (c == t->owner)
- {
- 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_dest);
- for (i = 0; i < t->nclients; i++)
- GNUNET_SERVER_notification_context_unicast (nc, t->clients[i]->handle,
- &msg.header, GNUNET_NO);
- }
- // FIXME when to disconnect an incoming tunnel?
+ if (NULL == t->client)
+ return;
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
+ msg.tunnel_id = htonl (t->local_tid_dest);
+ GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
+ &msg.header, GNUNET_NO);
}
static size_t
send_core_data_raw (void *cls, size_t size, void *buf)
{
- struct MeshTransmissionDescriptor *info = cls;
- struct GNUNET_MessageHeader *msg;
+ struct GNUNET_MessageHeader *msg = cls;
size_t total_size;
- GNUNET_assert (NULL != info);
- msg = (struct GNUNET_MessageHeader *) info->data;
+ GNUNET_assert (NULL != msg);
total_size = ntohs (msg->size);
if (total_size > size)
return 0;
}
memcpy (buf, msg, total_size);
- GNUNET_free (info->data);
- GNUNET_free (info);
+ GNUNET_free (cls);
return total_size;
}
GNUNET_PEER_Id peer,
struct MeshTunnel *t)
{
- struct MeshTransmissionDescriptor *info;
struct GNUNET_PeerIdentity id;
struct MeshPeerInfo *neighbor;
struct MeshPeerPath *p;
+ void *data;
size_t size;
uint16_t type;
return;
size = ntohs (message->size);
- info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor));
- info->data = GNUNET_malloc (size);
- memcpy (info->data, message, size);
+ data = GNUNET_malloc (size);
+ memcpy (data, message, size);
type = ntohs(message->type);
switch (type)
{
- struct GNUNET_MESH_Unicast *m;
- struct GNUNET_MESH_ToOrigin *to;
+ struct GNUNET_MESH_Unicast *u;
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- m = (struct GNUNET_MESH_Unicast *) info->data;
- m->ttl = htonl (ntohl (m->ttl) - 1);
+ u = (struct GNUNET_MESH_Unicast *) data;
+ u->ttl = htonl (ntohl (u->ttl) - 1);
break;
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- to = (struct GNUNET_MESH_ToOrigin *) info->data;
- t->prev_fc.last_pid_sent++; /* FIXME per hop? */
- to->pid = htonl (t->prev_fc.last_pid_sent);
}
- info->data_len = size;
GNUNET_PEER_resolve (peer, &id);
neighbor = peer_get (&id);
for (p = neighbor->path_head; NULL != p; p = p->next)
}
#endif
GNUNET_break (0); // FIXME sometimes fails (testing disconnect?)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
" no direct connection to %s\n",
GNUNET_i2s (&id));
- GNUNET_free (info->data);
- GNUNET_free (info);
+ GNUNET_free (data);
return;
}
- info->peer = neighbor;
if (GNUNET_MESSAGE_TYPE_MESH_PATH_ACK == type)
type = 0;
- queue_add (info,
+ queue_add (data,
type,
size,
neighbor,
* 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,
- struct MeshTunnel *t)
+send_create_path (struct MeshTunnel *t)
{
struct MeshPeerInfo *neighbor;
- if (NULL == p)
- {
- GNUNET_break (0);
- return;
- }
-
neighbor = peer_get_short (t->next_hop);
queue_add (t,
GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE,
- sizeof (struct GNUNET_MESH_ManipulatePath) +
- (p->length * sizeof (struct GNUNET_PeerIdentity)),
+ sizeof (struct GNUNET_MESH_CreateTunnel) +
+ (t->path->length * sizeof (struct GNUNET_PeerIdentity)),
neighbor,
t);
+ t->state = MESH_TUNNEL_WAITING;
}
static void
send_path_ack (struct MeshTunnel *t)
{
- struct MeshTransmissionDescriptor *info;
- struct GNUNET_PeerIdentity id;
+ struct MeshPeerInfo *peer;
- GNUNET_PEER_resolve (t->prev_hop, &id);
- info = GNUNET_malloc (sizeof (struct MeshTransmissionDescriptor));
- info->origin = &t->id;
- info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &id.hashPubKey);
- GNUNET_assert (NULL != info->peer);
+ peer = peer_get_short (t->prev_hop);
- queue_add (info,
+ queue_add (t,
GNUNET_MESSAGE_TYPE_MESH_PATH_ACK,
sizeof (struct GNUNET_MESH_PathACK),
- info->peer,
+ peer,
t);
}
/**
- * Try to establish a new connection to this peer in the fiven tunnel.
+ * Try to establish a new connection to this peer in the given tunnel.
* 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.
*
{
p = peer_get_best_path (peer, t);
tunnel_use_path (t, p);
- send_create_path (peer, p, t);
+ send_create_path (t);
}
else if (NULL == peer->dhtget)
{
NULL, /* xquery */
0, /* xquery bits */
&dht_get_id_handler, peer);
+ t->state = MESH_TUNNEL_SEARCHING;
}
/* Otherwise, there is no path but the DHT get is already started. */
}
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)
*
* @param peer_info Peer to add the path to, being the origin of the path.
* @param path New path to add after being inversed.
+ * Path will be either used or freed.
* @param trusted Do we trust that this path is real?
*/
static void
}
+
+/**
+ * Remove a tunnel from the list of tunnels a peer participates in.
+ *
+ * @param p Peer to clean.
+ * @param t Tunnel to remove.
+ */
+static void
+peer_info_remove_tunnel (struct MeshPeerInfo *p, struct MeshTunnel *t)
+{
+ unsigned int i;
+
+ for (i = 0; i < p->ntunnels; i++)
+ {
+ if (p->tunnels[i] == t)
+ {
+ p->tunnels[i] = p->tunnels[p->ntunnels - 1];
+ GNUNET_array_grow (p->tunnels, p->ntunnels, p->ntunnels - 1);
+ return;
+ }
+ }
+}
+
+
/**
* Function called if the connection to the peer has been stalled for a while,
* possibly due to a missed ACK. Poll the peer about its ACK status.
msg.header.size = htons (sizeof (msg));
msg.tid = htonl (t->id.tid);
GNUNET_PEER_resolve (t->id.oid, &msg.oid);
- msg.last_ack = htonl (fc->last_ack_recv);
if (fc == &t->prev_fc)
{
peer = t->prev_hop;
}
- else
+ else if (fc == &t->next_fc)
{
peer = t->next_hop;
}
+ else
+ {
+ GNUNET_break (0);
+ return;
+ }
send_prebuilt_message (&msg.header, peer, t);
fc->poll_time = GNUNET_TIME_STD_BACKOFF (fc->poll_time);
fc->poll_task = GNUNET_SCHEDULER_add_delayed (fc->poll_time,
aux = peer_get_short (p->peers[i]);
copy = path_duplicate (p);
copy->length = i + 1;
- peer_info_add_path (aux, copy, GNUNET_NO);
+ peer_info_add_path (aux, copy, p->length < 3 ? GNUNET_NO : confirmed);
}
}
struct GNUNET_HashCode hash;
GNUNET_assert (tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV);
- GNUNET_CRYPTO_hash (&tid, sizeof (MESH_TunnelNumber), &hash);
+ GMC_hash32 (tid, &hash);
return GNUNET_CONTAINER_multihashmap_get (incoming_tunnels, &hash);
}
{
struct GNUNET_HashCode hash;
- GNUNET_CRYPTO_hash (&tid, sizeof (MESH_TunnelNumber), &hash);
+ GMC_hash32 (tid, &hash);
return GNUNET_CONTAINER_multihashmap_get (c->own_tunnels, &hash);
}
}
/**
- * Delete an active client from the tunnel.
+ * Add a client to a tunnel, initializing all needed data structures.
*
- * @param t Tunnel.
- * @param c Client.
+ * @param t Tunnel to which add the client.
+ * @param c Client which to add to the tunnel.
*/
static void
-tunnel_delete_active_client (struct MeshTunnel *t, const struct MeshClient *c)
+tunnel_add_client (struct MeshTunnel *t, struct MeshClient *c)
{
- unsigned int i;
+ struct GNUNET_HashCode hash;
- for (i = 0; i < t->nclients; i++)
+ if (NULL != t->client)
{
- if (t->clients[i] == c)
- {
- t->clients[i] = t->clients[t->nclients - 1];
- t->clients_fc[i] = t->clients_fc[t->nclients - 1];
- GNUNET_array_grow (t->clients, t->nclients, t->nclients - 1);
- t->nclients++;
- GNUNET_array_grow (t->clients_fc, t->nclients, t->nclients - 1);
- break;
- }
+ GNUNET_break(0);
+ return;
+ }
+ GMC_hash32 (t->local_tid_dest, &hash);
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multihashmap_put (c->incoming_tunnels, &hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multihashmap_put (incoming_tunnels, &hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+ {
+ GNUNET_break (0);
+ return;
}
+ t->client = c;
}
-/**
- * Delete an ignored client from the tunnel.
- *
- * @param t Tunnel.
- * @param c Client.
- */
static void
-tunnel_delete_ignored_client (struct MeshTunnel *t, const struct MeshClient *c)
+tunnel_use_path (struct MeshTunnel *t, struct MeshPeerPath *p)
{
- unsigned int i;
+ unsigned int own_pos;
- for (i = 0; i < t->nignore; i++)
+ for (own_pos = 0; own_pos < p->length; own_pos++)
{
- if (t->ignore[i] == c)
- {
- t->ignore[i] = t->ignore[t->nignore - 1];
- GNUNET_array_grow (t->ignore, t->nignore, t->nignore - 1);
+ if (p->peers[own_pos] == myid)
break;
- }
+ }
+ if (own_pos > p->length - 1)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ if (own_pos < p->length - 1)
+ t->next_hop = p->peers[own_pos + 1];
+ else
+ t->next_hop = p->peers[own_pos];
+ GNUNET_PEER_change_rc (t->next_hop, 1);
+ if (0 < own_pos)
+ t->prev_hop = p->peers[own_pos - 1];
+ else
+ t->prev_hop = p->peers[0];
+ GNUNET_PEER_change_rc (t->prev_hop, 1);
+
+ if (NULL != t->path)
+ path_destroy (t->path);
+ t->path = path_duplicate (p);
+ if (0 == own_pos)
+ {
+ if (GNUNET_SCHEDULER_NO_TASK != t->maintenance_task)
+ GNUNET_SCHEDULER_cancel (t->maintenance_task);
+ t->maintenance_task = GNUNET_SCHEDULER_add_delayed (refresh_path_time,
+ &path_refresh, t);
}
}
-/**
- * Delete a client from the tunnel. It should be only done on
- * client disconnection, otherwise use client_ignore_tunnel.
- *
- * @param t Tunnel.
- * @param c Client.
- */
-static void
-tunnel_delete_client (struct MeshTunnel *t, const struct MeshClient *c)
-{
- tunnel_delete_ignored_client (t, c);
- tunnel_delete_active_client (t, c);
-}
-
-/* FIXME check initial values */
-static void
-tunnel_add_client (struct MeshTunnel *t, struct MeshClient *c)
-{
- struct MeshTunnelClientInfo clinfo;
-
- GNUNET_array_append (t->clients, t->nclients, c);
- clinfo.fwd_ack = t->prev_fc.last_pid_recv + 1;
- clinfo.fwd_pid = t->prev_fc.last_pid_recv;
- clinfo.bck_ack = t->nobuffer ? 1 : INITIAL_WINDOW_SIZE - 1;
- clinfo.bck_pid = (uint32_t) -1; /* Expected next: 0 */
- t->nclients--; /* Double append */
- GNUNET_array_append (t->clients_fc, t->nclients, clinfo);
-}
-
-
-static void
-tunnel_use_path (struct MeshTunnel *t, struct MeshPeerPath *p)
-{
- unsigned int i;
-
- for (i = 0; i < p->length; i++)
- {
- if (p->peers[i] == myid)
- break;
- }
- if (i > p->length - 1)
- {
- GNUNET_break (0);
- return;
- }
-
- if (i < p->length - 1)
- t->next_hop = p->peers[i + 1];
- else
- t->next_hop = 0;
- if (0 < i)
- t->prev_hop = p->peers[i - 1];
- else
- t->prev_hop = 0;
-
- if (NULL != t->path)
- path_destroy (t->path);
- t->path = path_duplicate (p);
- if (GNUNET_SCHEDULER_NO_TASK == t->maintenance_task)
- t->maintenance_task =
- GNUNET_SCHEDULER_add_delayed (refresh_path_time, &path_refresh, t);
-}
-
-
/**
* Notifies a tunnel that a connection has broken that affects at least
* some of its peers. Sends a notification towards the root of the tree.
}
-/**
- * Get the Flow Control info of a client.
- *
- * @param t Tunnel on which to look.
- * @param c Client whose ACK to get.
- *
- * @return ACK value.
- */
-static struct MeshTunnelClientInfo *
-tunnel_get_client_fc (struct MeshTunnel *t,
- struct MeshClient *c)
-{
- unsigned int i;
-
- for (i = 0; i < t->nclients; i++)
- {
- if (t->clients[i] != c)
- continue;
- return &t->clients_fc[i];
- }
- GNUNET_assert (0);
- return NULL; // avoid compiler / coverity complaints
-}
-
-
-/**
- * Set the FWD ACK value of a client in a particular tunnel.
- *
- * @param t Tunnel affected.
- * @param c Client whose ACK to set.
- * @param ack ACK value.
- */
-static void
-tunnel_set_client_fwd_ack (struct MeshTunnel *t,
- struct MeshClient *c,
- uint32_t ack)
-{
- unsigned int i;
-
- for (i = 0; i < t->nclients; i++)
- {
- if (t->clients[i] != c)
- continue;
- t->clients_fc[i].fwd_ack = ack;
- return;
- }
- GNUNET_break (0);
-}
-
-
-/**
- * Get the highest ACK value of all clients in a particular tunnel,
- * according to the buffering/speed settings.
- *
- * @param t Tunnel on which to look.
- *
- * @return Corresponding ACK value (max uint32_t).
- * If no clients are suscribed, -1LL.
- */
-static int64_t
-tunnel_get_clients_fwd_ack (struct MeshTunnel *t)
-{
- unsigned int i;
- int64_t ack;
-
- if (0 == t->nclients)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " tunnel has no clients, no FWD ACK\n");
- return -1LL;
- }
-
- for (ack = -1LL, i = 0; i < t->nclients; i++)
- {
- if (-1LL == ack ||
- GNUNET_YES == GMC_is_pid_bigger (ack, t->clients_fc[i].fwd_ack))
- {
- ack = t->clients_fc[i].fwd_ack;
- }
- }
-
- if (GNUNET_YES == t->nobuffer &&
- GMC_is_pid_bigger(ack, t->prev_fc.last_pid_recv))
- ack = (uint32_t) t->prev_fc.last_pid_recv + 1; // Might overflow, it's ok.
-
- return (uint32_t) ack;
-}
-
-
-/** FIXME
- * Get the current fwd ack value for a tunnel, taking in account the tunnel
- * mode and the status of all children nodes.
- *
- * @param t Tunnel.
- *
- * @return Maximum PID allowed.
- */
-static uint32_t
-tunnel_get_fwd_ack (struct MeshTunnel *t)
-{
- uint32_t ack;
- uint32_t buffer_free;
- int64_t client_ack;
-
- buffer_free = t->queue_max - t->next_fc.queue_n;
- client_ack = tunnel_get_clients_fwd_ack (t);
- if (GNUNET_YES == t->nobuffer)
- {
- ack = t->prev_fc.last_ack_sent;
- }
- else
- {
- ack = t->prev_fc.last_ack_sent + buffer_free; // Overflow? OK!
- }
- if (-1LL == client_ack)
- {
- client_ack = ack;
- }
- /* FIXME check */
- ack = GMC_max_pid ((uint32_t) client_ack, ack);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "c %u, bf %u, cl %lld, ACK: %u\n",
- t->prev_fc.last_ack_sent, buffer_free, client_ack, ack);
- return ack;
-}
-
-
/**
* Build a local ACK message and send it to a local client.
*
}
-/**
- * Notify a the owner of a tunnel about how many more
- * payload packages will we accept on a given tunnel.
- *
- * @param t Tunnel on which to send the ACK.
- */
-static void
-tunnel_send_client_fwd_ack (struct MeshTunnel *t)
-{
- uint32_t ack;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending client FWD ACK on tunnel %X\n",
- t->local_tid);
-
- ack = tunnel_get_fwd_ack (t);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ack %u\n", ack);
- if (t->prev_fc.last_ack_sent == ack)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " same as last, not sending!\n");
- return;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " sending!\n");
- t->prev_fc.last_ack_sent = ack;
- send_local_ack (t, t->owner, ack);
-}
-
-
/**
* Send an ACK informing the predecessor about the available buffer space.
* In case there is no predecessor, inform the owning client.
{
uint32_t ack;
- if (NULL != t->owner)
- {
- tunnel_send_client_fwd_ack (t);
- return;
- }
/* Is it after unicast retransmission? */
switch (type)
{
case GNUNET_MESSAGE_TYPE_MESH_ACK:
case GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK:
break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_ACK:
case GNUNET_MESSAGE_TYPE_MESH_POLL:
t->force_ack = GNUNET_YES;
break;
}
/* Ok, ACK might be necessary, what PID to ACK? */
- ack = tunnel_get_fwd_ack (t);
+ ack = t->prev_fc.last_pid_recv + t->queue_max - t->next_fc.queue_n;
if (ack == t->prev_fc.last_ack_sent && GNUNET_NO == t->force_ack)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not sending FWD ACK, not ready\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not sending FWD ACK, not needed\n");
return;
}
t->prev_fc.last_ack_sent = ack;
- send_ack (t, t->prev_hop, ack);
+ if (NULL != t->owner)
+ send_local_ack (t, t->owner, ack);
+ else if (0 != t->prev_hop)
+ send_ack (t, t->prev_hop, ack);
+ else
+ GNUNET_break (0);
debug_fwd_ack++;
t->force_ack = GNUNET_NO;
}
/**
- * Send a child node a BCK ACK to allow him to send more to_origin data.
- *
- * @param t Tunnel.
- * @param id Id of the child node.
+ * Send an ACK informing the children node/client about the available
+ * buffer space.
+ * If buffering is off, send only on behalf of root (can be self).
+ * If buffering is on, send when sent to predecessor and buffer space is free.
+ * Note that although the name is bck_ack, the BCK mean backwards *traffic*,
+ * the ACK itself goes "forward" (towards children/clients).
+ *
+ * @param t Tunnel on which to send the ACK.
+ * @param type Type of message that triggered the ACK transmission.
*/
static void
-tunnel_send_mesh_bck_ack (struct MeshTunnel *t,
- GNUNET_PEER_Id peer)
+tunnel_send_bck_ack (struct MeshTunnel *t, uint16_t type)
{
- uint32_t ack = 0; // FIXME
+ uint32_t ack;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending BCK ACK on tunnel %u [%u] due to %s\n",
+ t->id.oid, t->id.tid, GNUNET_MESH_DEBUG_M2S(type));
+ /* Is it after data to_origin retransmission? */
+ switch (type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ if (GNUNET_YES == t->nobuffer)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " Not sending ACK, nobuffer + traffic\n");
+ return;
+ }
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK:
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_POLL:
+ t->force_ack = GNUNET_YES;
+ break;
+ default:
+ GNUNET_break (0);
+ }
+
+ /* TODO: Check if we need to transmit the ACK (as in fwd) */
ack = t->next_fc.last_pid_recv + t->queue_max - t->prev_fc.queue_n;
ack, t->next_fc.last_ack_sent);
t->next_fc.last_ack_sent = ack;
- send_ack (t, peer, ack);
+ if (NULL != t->client)
+ send_local_ack (t, t->client, ack);
+ else if (0 != t->next_hop)
+ send_ack (t, t->next_hop, ack);
+ else
+ GNUNET_break (0);
+ t->force_ack = GNUNET_NO;
}
/**
- * @brief Send BCK ACKs to clients to allow them more to_origin traffic
+ * Modify the unicast message TID from global to local and send to client.
*
- * Iterates over all clients and sends BCK ACKs to the ones that need it.
- *
- * FIXME fc: what happens if we have 2 clients but q_size is 1?
- * - implement a size 1 buffer in each client_fc AND children_fc
- * to hold at least 1 message per "child".
- * problem: violates no buffer policy
- * - ack 0 and make "children" poll for transmission slots
- * problem: big overhead, extra latency even in low traffic
- * settings
- *
- * @param t Tunnel on which to send the BCK ACKs.
+ * @param t Tunnel on which to send the message.
+ * @param msg Message to modify and send.
*/
static void
-tunnel_send_clients_bck_ack (struct MeshTunnel *t)
+tunnel_send_client_ucast (struct MeshTunnel *t,
+ const struct GNUNET_MESH_Unicast *msg)
{
- unsigned int i;
- unsigned int tunnel_delta;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Sending BCK ACK to clients\n");
-
- tunnel_delta = t->queue_max - t->next_fc.queue_n;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " tunnel delta: %u\n", tunnel_delta);
+ struct GNUNET_MESH_Unicast *copy;
+ uint16_t size = ntohs (msg->header.size);
+ char cbuf[size];
- /* Find client whom to allow to send to origin (with lowest buffer space) */
- for (i = 0; i < t->nclients; i++)
+ if (size < sizeof (struct GNUNET_MESH_Unicast) +
+ sizeof (struct GNUNET_MessageHeader))
{
- struct MeshTunnelClientInfo *clinfo;
- unsigned int delta;
-
- clinfo = &t->clients_fc[i];
- delta = clinfo->bck_ack - clinfo->bck_pid;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client %u delta: %u\n",
- t->clients[i]->id, delta);
-
- if ((GNUNET_NO == t->nobuffer && tunnel_delta > delta) ||
- (GNUNET_YES == t->nobuffer && 0 == delta))
- {
- uint32_t ack;
-
- ack = clinfo->bck_pid;
- ack += t->nobuffer ? 1 : tunnel_delta;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " sending ack to client %u: %u\n",
- t->clients[i]->id, ack);
- send_local_ack (t, t->clients[i], ack);
- clinfo->bck_ack = ack;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " not sending ack to client %u (td %u, d %u)\n",
- t->clients[i]->id, tunnel_delta, delta);
- }
+ GNUNET_break_op (0);
+ return;
}
+ if (NULL == t->client)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ copy = (struct GNUNET_MESH_Unicast *) cbuf;
+ memcpy (copy, msg, size);
+ copy->tid = htonl (t->local_tid_dest);
+ GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
+ ©->header, GNUNET_NO);
}
/**
- * Send an ACK informing the children nodes and destination clients about
- * the available buffer space.
- * If buffering is off, send only on behalf of root (can be self).
- * If buffering is on, send when sent to predecessor and buffer space is free.
- * Note that although the name is bck_ack, the BCK mean backwards *traffic*,
- * the ACK itself goes "forward" (towards children/clients).
+ * Modify the to_origin message TID from global to local and send to client.
*
- * @param t Tunnel on which to send the ACK.
- * @param type Type of message that triggered the ACK transmission.
+ * @param t Tunnel on which to send the message.
+ * @param msg Message to modify and send.
*/
static void
-tunnel_send_bck_ack (struct MeshTunnel *t, uint16_t type)
+tunnel_send_client_to_orig (struct MeshTunnel *t,
+ const struct GNUNET_MESH_ToOrigin *msg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending BCK ACK on tunnel %u [%u] due to %s\n",
- t->id.oid, t->id.tid, GNUNET_MESH_DEBUG_M2S(type));
- /* Is it after data to_origin retransmission? */
- switch (type)
+ struct GNUNET_MESH_ToOrigin *copy;
+ uint16_t size = ntohs (msg->header.size);
+ char cbuf[size];
+
+ if (size < sizeof (struct GNUNET_MESH_ToOrigin) +
+ sizeof (struct GNUNET_MessageHeader))
{
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- if (GNUNET_YES == t->nobuffer)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " Not sending ACK, nobuffer\n");
- return;
- }
- break;
- case GNUNET_MESSAGE_TYPE_MESH_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK:
- break;
- case GNUNET_MESSAGE_TYPE_MESH_POLL:
- t->force_ack = GNUNET_YES;
- break;
- default:
- GNUNET_break (0);
+ GNUNET_break_op (0);
+ return;
}
-
- tunnel_send_clients_bck_ack (t);
- tunnel_send_mesh_bck_ack (t, t->next_hop);
- t->force_ack = GNUNET_NO;
+ if (NULL == t->owner)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ copy = (struct GNUNET_MESH_ToOrigin *) cbuf;
+ memcpy (cbuf, msg, size);
+ copy->tid = htonl (t->local_tid);
+ GNUNET_SERVER_notification_context_unicast (nc, t->owner->handle,
+ ©->header, GNUNET_NO);
}
" sending tunnel destroy for tunnel: %s [%X]\n",
GNUNET_i2s (&msg.oid), t->id.tid);
- if (0 != t->next_hop)
+ if (NULL == t->client && 0 != t->next_hop)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " child: %u\n", t->next_hop);
GNUNET_PEER_resolve (t->next_hop, &id);
GNUNET_i2s (&id));
send_prebuilt_message (&msg.header, t->next_hop, t);
}
- if (0 != t->prev_hop)
+ if (NULL == t->owner && 0 != t->prev_hop)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " parent: %u\n", t->prev_hop);
GNUNET_PEER_resolve (t->prev_hop, &id);
struct MeshPeerQueue *pq;
struct MeshPeerQueue *next;
+ if (0 == neighbor)
+ return; /* Was local peer, 0'ed in tunnel_destroy_iterator */
peer_info = peer_get_short (neighbor);
for (pq = peer_info->queue_head; NULL != pq; pq = next)
{
if (GNUNET_MESSAGE_TYPE_MESH_UNICAST == pq->type ||
GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN == pq->type)
{
- // Should have been removed on destroy children
+ /* Should have been removed on destroy children */
GNUNET_break (0);
}
queue_destroy (pq, GNUNET_YES);
{
struct MeshClient *c;
struct GNUNET_HashCode hash;
- unsigned int i;
int r;
if (NULL == t)
if (NULL != c)
{
- GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
+ GMC_hash32 (t->local_tid, &hash);
if (GNUNET_YES !=
GNUNET_CONTAINER_multihashmap_remove (c->own_tunnels, &hash, t))
{
}
}
- GNUNET_CRYPTO_hash (&t->local_tid_dest, sizeof (MESH_TunnelNumber), &hash);
- for (i = 0; i < t->nclients; i++)
+ if (NULL != t->client)
{
- c = t->clients[i];
+ c = t->client;
+ GMC_hash32 (t->local_tid_dest, &hash);
if (GNUNET_YES !=
GNUNET_CONTAINER_multihashmap_remove (c->incoming_tunnels, &hash, t))
{
GNUNET_break (0);
r = GNUNET_SYSERR;
}
- }
- for (i = 0; i < t->nignore; i++)
- {
- c = t->ignore[i];
- if (GNUNET_YES !=
- GNUNET_CONTAINER_multihashmap_remove (c->ignore_tunnels, &hash, t))
+ if (GNUNET_YES !=
+ GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t))
{
GNUNET_break (0);
r = GNUNET_SYSERR;
}
}
- (void) GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t);
- GNUNET_free_non_null (t->clients);
- GNUNET_free_non_null (t->ignore);
- GNUNET_free_non_null (t->clients_fc);
-
peer_cancel_queues (t->next_hop, t);
peer_cancel_queues (t->prev_hop, t);
+ GNUNET_PEER_change_rc(t->next_hop, -1);
+ GNUNET_PEER_change_rc(t->prev_hop, -1);
if (GNUNET_SCHEDULER_NO_TASK != t->maintenance_task)
GNUNET_SCHEDULER_cancel (t->maintenance_task);
n_tunnels--;
GNUNET_STATISTICS_update (stats, "# tunnels", -1, GNUNET_NO);
+ path_destroy (t->path);
GNUNET_free (t);
return r;
}
-#define TUNNEL_DESTROY_EMPTY_TIME GNUNET_TIME_UNIT_MILLISECONDS
-
/**
* Tunnel is empty: destroy it.
*
- * @param cls Closure (Tunnel).
- * @param tc TaskContext.
+ * @param t Tunnel to destroy.
*/
static void
-tunnel_destroy_empty_delayed (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+tunnel_destroy_empty (struct MeshTunnel *t)
{
- struct MeshTunnel *t = cls;
-
- t->delayed_destroy = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
- if (0 != t->nclients)
- return;
-
#if MESH_DEBUG
{
struct GNUNET_PeerIdentity id;
}
#endif
- tunnel_send_destroy (t);
+ if (GNUNET_NO == t->destroy)
+ tunnel_send_destroy (t);
if (0 == t->pending_messages)
tunnel_destroy (t);
else
t->destroy = GNUNET_YES;
}
-
/**
- * Schedule tunnel destruction if is empty and no new traffic comes in a time.
+ * Initialize a Flow Control structure to the initial state.
*
- * @param t Tunnel to destroy if empty.
+ * @param fc Flow Control structure to initialize.
*/
static void
-tunnel_destroy_empty (struct MeshTunnel *t)
+fc_init (struct MeshFlowControl *fc)
{
- if (GNUNET_SCHEDULER_NO_TASK != t->delayed_destroy ||
- 0 != t->nclients)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u %u\n",
- t->delayed_destroy, t->nclients);
- 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);
+ fc->last_pid_sent = (uint32_t) -1; /* Next (expected) = 0 */
+ fc->last_pid_recv = (uint32_t) -1;
+ fc->last_ack_sent = (uint32_t) -1; /* No traffic allowed yet */
+ fc->last_ack_recv = (uint32_t) -1;
+ fc->poll_task = GNUNET_SCHEDULER_NO_TASK;
+ fc->poll_time = GNUNET_TIME_UNIT_SECONDS;
+ fc->queue_n = 0;
}
-
/**
* Create a new tunnel
*
t->id.tid = tid;
t->queue_max = (max_msgs_queue / max_tunnels) + 1;
t->owner = client;
- t->next_fc.last_pid_sent = (uint32_t) -1; /* Next (expected) = 0 */
- t->next_fc.last_pid_recv = (uint32_t) -1;
- t->prev_fc.last_pid_sent = (uint32_t) -1;
- t->prev_fc.last_pid_recv = (uint32_t) -1;
- t->next_fc.last_ack_sent = INITIAL_WINDOW_SIZE - 1;
- t->next_fc.last_ack_recv = INITIAL_WINDOW_SIZE - 1;
- t->prev_fc.last_ack_sent = INITIAL_WINDOW_SIZE - 1;
- t->prev_fc.last_ack_recv = INITIAL_WINDOW_SIZE - 1;
+ fc_init (&t->next_fc);
+ fc_init (&t->prev_fc);
t->local_tid = local;
n_tunnels++;
GNUNET_STATISTICS_update (stats, "# tunnels", 1, GNUNET_NO);
if (NULL != client)
{
- GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
+ GMC_hash32 (t->local_tid, &hash);
if (GNUNET_OK !=
GNUNET_CONTAINER_multihashmap_put (client->own_tunnels, &hash, t,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
struct MeshTunnel *t = value;
struct MeshClient *c = cls;
- send_client_tunnel_disconnect (t, c);
- if (c != t->owner)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " Tunnel %X / %X destroy, due to client %u shutdown.\n",
+ t->local_tid, t->local_tid_dest, c->id);
+ if (GNUNET_NO == c->shutting_down)
+ send_client_tunnel_destroy (t);
+ client_delete_tunnel (c, t);
+ if (c == t->client)
{
- 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;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Client %u is destination.\n", c->id);
+ t->client = NULL;
+ t->next_hop = 0;
}
- tunnel_send_destroy (t);
- t->owner = NULL;
- t->destroy = GNUNET_YES;
+ else if (c == t->owner)
+ {
+ struct MeshPeerInfo *p;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Client %u is owner.\n", c->id);
+ t->owner = NULL;
+ t->prev_hop = 0;
+ p = peer_get_short(t->dest);
+ peer_info_remove_tunnel (p, t);
+ }
+ else
+ {
+ GNUNET_break (0);
+ }
+ tunnel_destroy_empty (t);
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Tunnel %s [%X] timed out. Destroying.\n",
GNUNET_i2s(&id), t->id.tid);
- send_clients_tunnel_destroy (t);
+ send_client_tunnel_destroy (t);
tunnel_destroy (t);
}
+
/**
* Resets the tunnel timeout. Starts it if no timeout was running.
*
static void
tunnel_reset_timeout (struct MeshTunnel *t)
{
+ if (NULL != t->owner || 0 != t->local_tid || 0 == t->prev_hop)
+ return;
if (GNUNET_SCHEDULER_NO_TASK != t->maintenance_task)
GNUNET_SCHEDULER_cancel (t->maintenance_task);
t->maintenance_task =
send_core_path_create (void *cls, size_t size, void *buf)
{
struct MeshTunnel *t = cls;
- struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_MESH_CreateTunnel *msg;
struct GNUNET_PeerIdentity *peer_ptr;
struct MeshPeerPath *p = t->path;
size_t size_needed;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATE PATH sending...\n");
size_needed =
- sizeof (struct GNUNET_MESH_ManipulatePath) +
+ sizeof (struct GNUNET_MESH_CreateTunnel) +
p->length * sizeof (struct GNUNET_PeerIdentity);
if (size < size_needed || NULL == buf)
GNUNET_break (0);
return 0;
}
- msg = (struct GNUNET_MESH_ManipulatePath *) buf;
+ msg = (struct GNUNET_MESH_CreateTunnel *) buf;
msg->header.size = htons (size_needed);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE);
msg->tid = ntohl (t->id.tid);
opt = 0;
if (GNUNET_YES == t->nobuffer)
opt |= MESH_TUNNEL_OPT_NOBUFFER;
- msg->opt = htonl(opt);
- msg->reserved = 0;
+ msg->opt = htonl (opt);
+ msg->port = htonl (t->port);
peer_ptr = (struct GNUNET_PeerIdentity *) &msg[1];
for (i = 0; i < p->length; i++)
static size_t
send_core_path_ack (void *cls, size_t size, void *buf)
{
- struct MeshTransmissionDescriptor *info = cls;
+ struct MeshTunnel *t = cls;
struct GNUNET_MESH_PathACK *msg = buf;
- GNUNET_assert (NULL != info);
+ GNUNET_assert (NULL != t);
if (sizeof (struct GNUNET_MESH_PathACK) > size)
{
GNUNET_break (0);
return 0;
}
+ t->prev_fc.last_ack_sent = t->nobuffer ? 0 : t->queue_max - 1;
msg->header.size = htons (sizeof (struct GNUNET_MESH_PathACK));
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_ACK);
- GNUNET_PEER_resolve (info->origin->oid, &msg->oid);
- msg->tid = htonl (info->origin->tid);
+ GNUNET_PEER_resolve (t->id.oid, &msg->oid);
+ msg->tid = htonl (t->id.tid);
msg->peer_id = my_full_id;
+ msg->ack = htonl (t->prev_fc.last_ack_sent);
- GNUNET_free (info);
/* TODO add signature */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "PATH ACK sent!\n");
static void
queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
{
- struct MeshTransmissionDescriptor *dd;
-// unsigned int max;
+ struct MeshFlowControl *fc;
if (GNUNET_YES == clear_cls)
{
" prebuilt message\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" type %s\n",
- GNUNET_MESH_DEBUG_M2S(queue->type));
- dd = queue->cls;
- GNUNET_free (dd->data);
+ GNUNET_MESH_DEBUG_M2S (queue->type));
break;
case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " type create path\n");
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
" type %s unknown!\n",
- GNUNET_MESH_DEBUG_M2S(queue->type));
+ GNUNET_MESH_DEBUG_M2S (queue->type));
}
GNUNET_free_non_null (queue->cls);
}
queue->peer->queue_tail,
queue);
- /* Delete from child_fc in the appropiate tunnel */
-// max = queue->tunnel->fwd_queue_max;
-// GNUNET_PEER_resolve (queue->peer->id, &id);
-// if (NULL != cinfo)
-// { FIXME
-// for (i = 0; i < cinfo->send_buffer_n; i++)
-// {
-// i2 = (cinfo->send_buffer_start + i) % max;
-// if (cinfo->send_buffer[i2] == queue)
-// {
-// /* Found corresponding entry in the send_buffer. Move all others back. */
-// unsigned int j;
-//
-//
-// for (j = i, j2 = 0, j3 = 0; j < cinfo->send_buffer_n - 1; j++)
-// {
-// j2 = (cinfo->send_buffer_start + j) % max;
-// j3 = (cinfo->send_buffer_start + j + 1) % max;
-// cinfo->send_buffer[j2] = cinfo->send_buffer[j3];
-// }
-//
-// cinfo->send_buffer[j3] = NULL;
-// cinfo->send_buffer_n--;
-// }
-// }
-// }
-
+ /* Delete from appropiate fc in the tunnel */
+ if (queue->peer->id == queue->tunnel->next_hop)
+ fc = &queue->tunnel->next_fc;
+ else if (queue->peer->id == queue->tunnel->next_hop)
+ fc = &queue->tunnel->next_fc;
+ else
+ {
+ GNUNET_break (0);
+ return;
+ }
+ fc->queue_n--;
GNUNET_free (queue);
}
{
struct MeshPeerQueue *q;
- struct MeshTransmissionDescriptor *info;
-// struct GNUNET_MESH_Unicast *ucast;
-// struct GNUNET_MESH_ToOrigin *to_orig;
- struct GNUNET_PeerIdentity id;
-// uint32_t pid;
-// uint32_t ack; FIXME
+ struct GNUNET_MESH_Unicast *ucast;
+ struct GNUNET_MESH_ToOrigin *to_orig;
+ struct MeshTunnel* t;
+ uint32_t pid;
+ uint32_t ack;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* selecting message\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* selecting message\n");
for (q = peer->queue_head; NULL != q; q = q->next)
{
-// t = q->tunnel;
- info = q->cls;
+ t = q->tunnel;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* %s\n",
+ "* %s\n",
GNUNET_MESH_DEBUG_M2S(q->type));
switch (q->type)
{
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
-// ucast = (struct GNUNET_MESH_Unicast *) info->mesh_data->data;
-// pid = ntohl (ucast->pid);
- GNUNET_PEER_resolve (info->peer->id, &id);
-// ack = cinfo->fwd_ack;
+ ucast = (struct GNUNET_MESH_Unicast *) q->cls;
+ pid = ntohl (ucast->pid);
+ ack = t->next_fc.last_ack_recv;
break;
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
-// to_orig = (struct GNUNET_MESH_ToOrigin *) info->mesh_data->data;
-// pid = ntohl (to_orig->pid);
-// ack = t->bck_ack;
+ to_orig = (struct GNUNET_MESH_ToOrigin *) q->cls;
+ pid = ntohl (to_orig->pid);
+ ack = t->prev_fc.last_ack_recv;
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* OK!\n");
+ "* OK!\n");
return q;
}
-// GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-// "********* ACK: %u, PID: %u\n",
-// ack, pid);
-// if (GNUNET_NO == GMC_is_pid_bigger(pid, ack))
-// {
-// GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-// "********* OK!\n");
-// return q;
-// }
-// else
-// {
-// GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-// "********* NEXT!\n");
-// }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* ACK: %u, PID: %u\n",
+ ack, pid);
+ if (GNUNET_NO == GMC_is_pid_bigger (pid, ack))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* OK!\n");
+ return q;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* NEXT!\n");
+ }
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* nothing found\n");
+ "* nothing found\n");
return NULL;
}
static size_t
queue_send (void *cls, size_t size, void *buf)
{
- struct MeshPeerInfo *peer = cls;
- struct GNUNET_MessageHeader *msg;
- struct MeshPeerQueue *queue;
- struct MeshTunnel *t;
- struct GNUNET_PeerIdentity dst_id;
- struct MeshFlowControl *fc;
- size_t data_size;
+ struct MeshPeerInfo *peer = cls;
+ struct GNUNET_MessageHeader *msg;
+ struct MeshPeerQueue *queue;
+ struct MeshTunnel *t;
+ struct GNUNET_PeerIdentity dst_id;
+ struct MeshFlowControl *fc;
+ size_t data_size;
+ uint16_t type;
- peer->core_transmit = NULL;
+ peer->core_transmit = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* Queue send\n");
- queue = queue_get_next (peer);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Queue send\n");
+ queue = queue_get_next (peer);
- /* Queue has no internal mesh traffic nor sendable payload */
- if (NULL == queue)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* not ready, return\n");
- if (NULL == peer->queue_head)
- GNUNET_break (0); /* Core tmt_rdy should've been canceled */
+ /* Queue has no internal mesh traffic nor sendable payload */
+ if (NULL == queue)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* not ready, return\n");
+ if (NULL == peer->queue_head)
+ GNUNET_break (0); /* Core tmt_rdy should've been canceled */
+ return 0;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* not empty\n");
+
+ GNUNET_PEER_resolve (peer->id, &dst_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* towards %s\n",
+ GNUNET_i2s (&dst_id));
+ /* Check if buffer size is enough for the message */
+ if (queue->size > size)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "* not enough room, reissue\n");
+ peer->core_transmit =
+ GNUNET_CORE_notify_transmit_ready (core_handle,
+ GNUNET_NO,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &dst_id,
+ queue->size,
+ &queue_send,
+ peer);
return 0;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* not empty\n");
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* size ok\n");
- GNUNET_PEER_resolve (peer->id, &dst_id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* towards %s\n",
- GNUNET_i2s(&dst_id));
- /* Check if buffer size is enough for the message */
- if (queue->size > size)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* not enough room, reissue\n");
- peer->core_transmit =
- GNUNET_CORE_notify_transmit_ready (core_handle,
- 0,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &dst_id,
- queue->size,
- &queue_send,
- peer);
- return 0;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* size ok\n");
+ t = queue->tunnel;
+ GNUNET_assert (0 < t->pending_messages);
+ t->pending_messages--;
+ type = 0;
- t = queue->tunnel;
- GNUNET_assert (0 < t->pending_messages);
- t->pending_messages--;
- if (GNUNET_MESSAGE_TYPE_MESH_UNICAST == queue->type)
- {
- t->next_fc.queue_n--;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* unicast: t->q (%u/%u)\n",
- t->next_fc.queue_n, t->queue_max);
- }
- else if (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN == queue->type)
- {
- t->prev_fc.queue_n--;
+ /* Fill buf */
+ switch (queue->type)
+ {
+ case 0:
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_POLL:
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN:
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* to orig: t->q (%u/%u)\n",
- t->prev_fc.queue_n, t->queue_max);
- }
+ "* raw: %s\n",
+ GNUNET_MESH_DEBUG_M2S (queue->type));
+ /* Fall through */
+ case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ data_size = send_core_data_raw (queue->cls, size, buf);
+ msg = (struct GNUNET_MessageHeader *) buf;
+ type = ntohs (msg->type);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* path create\n");
+ data_size = send_core_path_create (queue->cls, size, buf);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_ACK:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* path ack\n");
+ data_size = send_core_path_ack (queue->cls, size, buf);
+ break;
+ default:
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "* type unknown: %u\n",
+ queue->type);
+ data_size = 0;
+ }
- /* Fill buf */
- switch (queue->type)
- {
- case 0:
- case GNUNET_MESSAGE_TYPE_MESH_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_POLL:
- case GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN:
- case GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY:
- case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
- case GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "********* raw: %s\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
- /* Fall through */
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- data_size = send_core_data_raw (queue->cls, size, buf);
- msg = (struct GNUNET_MessageHeader *) buf;
- switch (ntohs (msg->type)) // Type of preconstructed message
- {
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_UNICAST);
- break;
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
- tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
- break;
- default:
- break;
- }
- break;
- case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* path create\n");
- data_size = send_core_path_create (queue->cls, size, buf);
- break;
- case GNUNET_MESSAGE_TYPE_MESH_PATH_ACK:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* path ack\n");
- data_size = send_core_path_ack (queue->cls, size, buf);
- break;
- default:
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "********* type unknown: %u\n",
- queue->type);
- data_size = 0;
- }
- switch (queue->type)
- {
- case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
- case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
-// if (cinfo->send_buffer[cinfo->send_buffer_start] != queue)
-// { FIXME
-// GNUNET_break (0);
-// GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-// "at pos %u (%p) != %p\n",
-// cinfo->send_buffer_start,
-// cinfo->send_buffer[cinfo->send_buffer_start],
-// queue);
-// }
-// if (cinfo->send_buffer_n > 0)
-// {
-// cinfo->send_buffer[cinfo->send_buffer_start] = NULL;
-// cinfo->send_buffer_n--;
-// cinfo->send_buffer_start++;
-// cinfo->send_buffer_start %= t->fwd_queue_max;
-// }
-// else
-// {
-// GNUNET_break (0);
-// }
- break;
- default:
- break;
- }
+ /* Free queue, but cls was freed by send_core_* */
+ queue_destroy (queue, GNUNET_NO);
+
+ /* Send ACK if needed, after accounting for sent ID in fc->queue_n */
+ switch (type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ t->next_fc.last_pid_sent = ((struct GNUNET_MESH_Unicast *) buf)->pid;
+ tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_UNICAST);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ t->prev_fc.last_pid_sent = ((struct GNUNET_MESH_ToOrigin *) buf)->pid;
+ tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
+ break;
+ default:
+ break;
+ }
- /* Free queue, but cls was freed by send_core_* */
- queue_destroy (queue, GNUNET_NO);
+ if (GNUNET_YES == t->destroy && 0 == t->pending_messages)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* destroying tunnel!\n");
+ tunnel_destroy (t);
+ }
- if (GNUNET_YES == t->destroy && 0 == t->pending_messages)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* destroying tunnel!\n");
- tunnel_destroy (t);
- }
+ /* If more data in queue, send next */
+ queue = queue_get_next (peer);
+ if (NULL != queue)
+ {
+ struct GNUNET_PeerIdentity id;
- /* If more data in queue, send next */
- queue = queue_get_next (peer);
- if (NULL != queue)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* more data!\n");
+ GNUNET_PEER_resolve (peer->id, &id);
+ peer->core_transmit =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ queue->size,
+ &queue_send,
+ peer);
+ }
+ else if (NULL != peer->queue_head)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "* %s stalled\n",
+ GNUNET_i2s (&my_full_id));
+ if (peer->id == t->next_hop)
+ fc = &t->next_fc;
+ else if (peer->id == t->prev_hop)
+ fc = &t->prev_fc;
+ else
{
- struct GNUNET_PeerIdentity id;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* more data!\n");
- GNUNET_PEER_resolve (peer->id, &id);
- peer->core_transmit =
- GNUNET_CORE_notify_transmit_ready(core_handle,
- 0,
- 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &id,
- queue->size,
- &queue_send,
- peer);
+ GNUNET_break (0);
+ fc = NULL;
}
- else
+ if (NULL != fc && GNUNET_SCHEDULER_NO_TASK == fc->poll_task)
{
- if (NULL != peer->queue_head)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "********* %s stalled\n",
- GNUNET_i2s(&my_full_id));
- if (peer->id == t->next_hop)
- fc = &t->next_fc;
- else
- fc = &t->prev_fc;
- if (GNUNET_SCHEDULER_NO_TASK == fc->poll_task)
- {
- fc->t = t;
- fc->poll_task = GNUNET_SCHEDULER_add_delayed (fc->poll_time,
- &tunnel_poll, fc);
- }
- }
+ fc->t = t;
+ fc->poll_task = GNUNET_SCHEDULER_add_delayed (fc->poll_time,
+ &tunnel_poll, fc);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size);
- return data_size;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Return %d\n", data_size);
+ return data_size;
}
GNUNET_STATISTICS_update(stats,
"# messages dropped (buffer full)",
1, GNUNET_NO);
- return; // Drop message
+ return; /* Drop message */
}
(*n)++;
}
uint16_t size;
uint16_t i;
MESH_TunnelNumber tid;
- struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_MESH_CreateTunnel *msg;
struct GNUNET_PeerIdentity *pi;
- struct GNUNET_HashCode hash;
struct MeshPeerPath *path;
struct MeshPeerInfo *dest_peer_info;
struct MeshPeerInfo *orig_peer_info;
"Received a path create msg [%s]\n",
GNUNET_i2s (&my_full_id));
size = ntohs (message->size);
- if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
+ if (size < sizeof (struct GNUNET_MESH_CreateTunnel))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
- size -= sizeof (struct GNUNET_MESH_ManipulatePath);
+ size -= sizeof (struct GNUNET_MESH_CreateTunnel);
if (size % sizeof (struct GNUNET_PeerIdentity))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
size /= sizeof (struct GNUNET_PeerIdentity);
- if (size < 2)
+ if (size < 1)
{
GNUNET_break_op (0);
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " path has %u hops.\n", size);
- msg = (struct GNUNET_MESH_ManipulatePath *) message;
+ msg = (struct GNUNET_MESH_CreateTunnel *) message;
tid = ntohl (msg->tid);
pi = (struct GNUNET_PeerIdentity *) &msg[1];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " path is for tunnel %s [%X].\n", GNUNET_i2s (pi), tid);
+ " path is for tunnel %s[%X].\n", GNUNET_i2s (pi), tid);
t = tunnel_get (pi, tid);
- if (NULL == t) // FIXME only for INCOMING tunnels?
+ if (NULL == t) /* might be a local tunnel */
{
uint32_t opt;
t = tunnel_new (GNUNET_PEER_intern (pi), tid, NULL, 0);
if (NULL == t)
{
- // FIXME notify failure
+ GNUNET_break (0);
return GNUNET_OK;
}
+ t->port = ntohl (msg->port);
opt = ntohl (msg->opt);
if (0 != (opt & MESH_TUNNEL_OPT_NOBUFFER))
{
t->nobuffer = GNUNET_YES;
t->prev_fc.last_ack_sent = t->prev_fc.last_pid_recv + 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " nobuffer:%d\n", t->nobuffer);
-
- if (GNUNET_YES == t->nobuffer)
- {
+ t->next_fc.last_ack_sent = t->next_fc.last_pid_recv + 1;
t->queue_max = 1;
}
-
- // FIXME only assign a local tid if a local client is interested (on demand)
- while (NULL != tunnel_get_incoming (next_local_tid))
- next_local_tid = (next_local_tid + 1) | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
- t->local_tid_dest = next_local_tid++;
- next_local_tid = next_local_tid | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
- // FIXME end
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " nobuffer:%d\n", t->nobuffer);
tunnel_reset_timeout (t);
- GNUNET_CRYPTO_hash (&t->local_tid_dest, sizeof (MESH_TunnelNumber), &hash);
- if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_put (incoming_tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
- {
- tunnel_destroy (t);
- GNUNET_break (0);
- return GNUNET_OK;
- }
}
+ t->state = MESH_TUNNEL_WAITING;
dest_peer_info =
GNUNET_CONTAINER_multihashmap_get (peers, &pi[size - 1].hashPubKey);
if (NULL == dest_peer_info)
own_pos = i;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Own position: %u\n", own_pos);
- if (own_pos == 0)
+ if (own_pos == 0 && path->peers[own_pos] != myid)
{
- /* cannot be self, must be 'not found' */
/* create path: self not found in path through self */
GNUNET_break_op (0);
path_destroy (path);
return GNUNET_OK;
}
path_add_to_peers (path, GNUNET_NO);
- t->prev_hop = path->peers[own_pos - 1];
- GNUNET_PEER_change_rc (t->prev_hop, 1);
+ tunnel_use_path (t, path);
+
if (own_pos == size - 1)
{
- /* It is for us! Send ack. */
+ struct MeshClient *c;
+ struct GNUNET_HashCode hc;
+
+ /* Find target client */
+ GMC_hash32 (t->port, &hc);
+ c = GNUNET_CONTAINER_multihashmap_get (ports, &hc);
+ if (NULL == c)
+ {
+ /* TODO send reject */
+ return GNUNET_OK;
+ }
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " It's for us!\n");
- peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO);
+ peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_YES);
t->dest = myid;
+
+ /* Assign local 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_dest = next_local_tid++;
+ next_local_tid = next_local_tid | GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
+
+ tunnel_add_client (t, c);
+ send_client_tunnel_create (t);
send_path_ack (t);
}
else
GNUNET_PEER_change_rc(t->next_hop, 1);
/* It's for somebody else! Retransmit. */
- path2 = path_duplicate (path);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " 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);
+ peer_info_add_path (dest_peer_info, path2, GNUNET_NO);
+ peer_info_add_path_to_origin (orig_peer_info, path, GNUNET_NO);
+ send_create_path (t);
}
return GNUNET_OK;
}
+
/**
- * Core handler for path destruction
+ * Core handler for path ACKs
*
* @param cls closure
* @param message message
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_MESH_ManipulatePath *msg;
- struct GNUNET_PeerIdentity *pi;
- struct MeshPeerPath *path;
+ struct GNUNET_MESH_PathACK *msg;
+ struct MeshPeerInfo *peer_info;
+ struct MeshPeerPath *p;
struct MeshTunnel *t;
- unsigned int own_pos;
- unsigned int i;
- size_t size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received a PATH DESTROY msg from %s\n", GNUNET_i2s (peer));
- size = ntohs (message->size);
- if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received a path ACK msg [%s]\n",
+ GNUNET_i2s (&my_full_id));
+ msg = (struct GNUNET_MESH_PathACK *) message;
+ t = tunnel_get (&msg->oid, ntohl(msg->tid));
+ if (NULL == t)
{
- GNUNET_break_op (0);
+ /* TODO notify that we don't know the tunnel */
+ GNUNET_STATISTICS_update (stats, "# control on unknown tunnel", 1, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " don't know the tunnel %s [%X]!\n",
+ GNUNET_i2s (&msg->oid), ntohl(msg->tid));
return GNUNET_OK;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %s [%X]\n",
+ GNUNET_i2s (&msg->oid), ntohl(msg->tid));
- size -= sizeof (struct GNUNET_MESH_ManipulatePath);
- if (size % sizeof (struct GNUNET_PeerIdentity))
+ peer_info = peer_get (&msg->peer_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " by peer %s\n",
+ GNUNET_i2s (&msg->peer_id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " via peer %s\n",
+ GNUNET_i2s (peer));
+
+ /* Add path to peers? */
+ p = t->path;
+ if (NULL != p)
{
- GNUNET_break_op (0);
- return GNUNET_OK;
+ path_add_to_peers (p, GNUNET_YES);
}
- size /= sizeof (struct GNUNET_PeerIdentity);
- if (size < 2)
- {
- GNUNET_break_op (0);
- return GNUNET_OK;
+ else
+ {
+ GNUNET_break (0);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " path has %u hops.\n", size);
+ t->state = MESH_TUNNEL_READY;
+ t->next_fc.last_ack_recv = ntohl (msg->ack);
+ t->prev_fc.last_ack_sent = ntohl (msg->ack);
- msg = (struct GNUNET_MESH_ManipulatePath *) message;
- pi = (struct GNUNET_PeerIdentity *) &msg[1];
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " path is for tunnel %s [%X].\n", GNUNET_i2s (pi),
- msg->tid);
- t = tunnel_get (pi, ntohl (msg->tid));
- if (NULL == t)
+ /* Message for us? */
+ if (0 == memcmp (&msg->oid, &my_full_id, sizeof (struct GNUNET_PeerIdentity)))
{
- /* TODO notify back: we don't know this tunnel */
- GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " It's for us!\n");
+ if (NULL == t->owner)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ if (NULL != peer_info->dhtget)
+ {
+ GNUNET_DHT_get_stop (peer_info->dhtget);
+ peer_info->dhtget = NULL;
+ }
+ tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_PATH_ACK);
+ tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_PATH_ACK);
return GNUNET_OK;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Creating path...\n");
- path = path_new (size);
- own_pos = 0;
- for (i = 0; i < size; i++)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ... 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, " Own position: %u\n", own_pos);
- if (own_pos < path->length - 1)
- send_prebuilt_message (message, path->peers[own_pos + 1], t);
- else
- send_client_tunnel_disconnect(t, NULL);
-// tunnel_delete_peer (t, path->peers[path->length - 1]); FIXME
- path_destroy (path);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ " not for us, retransmitting...\n");
+ peer_info = peer_get (&msg->oid);
+ send_prebuilt_message (message, t->prev_hop, t);
return GNUNET_OK;
}
{
struct GNUNET_MESH_TunnelDestroy *msg;
struct MeshTunnel *t;
- GNUNET_PEER_Id pid;
msg = (struct GNUNET_MESH_TunnelDestroy *) message;
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));
- /* Check signature */
if (NULL == t)
{
/* Probably already got the message from another path,
1, GNUNET_NO);
return GNUNET_OK;
}
- pid = GNUNET_PEER_search (peer);
- if (pid != t->prev_hop && 0 < t->nclients)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "still in use by %u clients\n",
- t->nclients);
- return GNUNET_OK;
- }
+ // TODO check owner's signature
if (t->local_tid_dest >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
{
/* Tunnel was incoming, notify clients */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "INCOMING TUNNEL %X %X\n",
t->local_tid, t->local_tid_dest);
- send_clients_tunnel_destroy (t);
+ send_client_tunnel_destroy (t);
}
tunnel_send_destroy (t);
t->destroy = GNUNET_YES;
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
+handle_mesh_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_Unicast *msg;
" pid %u not seen yet, forwarding\n", pid);
}
- t->prev_fc.last_pid_recv = pid;
-
if (GMC_is_pid_bigger (pid, t->prev_fc.last_ack_sent))
{
GNUNET_STATISTICS_update (stats, "# unsolicited unicast", 1, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received PID %u, ACK %u\n",
pid, t->prev_fc.last_ack_sent);
+ tunnel_send_fwd_ack(t, GNUNET_MESSAGE_TYPE_MESH_POLL);
return GNUNET_OK;
}
+ t->prev_fc.last_pid_recv = pid;
tunnel_reset_timeout (t);
if (t->dest == myid)
{
+ /* TODO signature verification */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" it's for us! sending to clients...\n");
GNUNET_STATISTICS_update (stats, "# unicast received", 1, GNUNET_NO);
- send_subscribed_clients (message, &msg[1].header, t);
+ tunnel_send_client_ucast (t, msg);
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_UNICAST);
return GNUNET_OK;
}
+ if (0 == t->next_hop)
+ {
+ GNUNET_break (0);
+ return GNUNET_OK;
+ }
ttl = ntohl (msg->ttl);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ttl: %u\n", ttl);
if (ttl == 0)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" not for us, retransmitting...\n");
- if (GNUNET_YES == t->nobuffer &&
- GNUNET_YES == GMC_is_pid_bigger (pid, t->next_fc.last_ack_recv))
- {
- GNUNET_STATISTICS_update (stats, "# unsolicited unicast", 1, GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u > %u\n",
- pid, t->next_fc.last_ack_recv);
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
send_prebuilt_message (message, t->next_hop, t);
GNUNET_STATISTICS_update (stats, "# unicast forwarded", 1, GNUNET_NO);
return GNUNET_OK;
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
+handle_mesh_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_ToOrigin *msg;
- struct MeshPeerInfo *peer_info;
struct MeshTunnel *t;
size_t size;
uint32_t pid;
return GNUNET_OK;
}
-
if (t->next_fc.last_pid_recv == pid)
{
/* already seen this packet, drop */
return GNUNET_OK;
}
+ if (GMC_is_pid_bigger (pid, t->next_fc.last_ack_sent))
+ {
+ GNUNET_STATISTICS_update (stats, "# unsolicited to_orig", 1, GNUNET_NO);
+ GNUNET_break_op (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received PID %u, ACK %u\n",
+ pid, t->next_fc.last_ack_sent);
+ tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
+ return GNUNET_OK;
+ }
+ t->next_fc.last_pid_recv = pid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" pid %u not seen yet, forwarding\n", pid);
- t->next_fc.last_pid_recv = pid;
- if (NULL != t->owner)
+ if (myid == t->id.oid)
{
- char cbuf[size];
- struct GNUNET_MESH_ToOrigin *copy;
-
+ /* TODO signature verification */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" it's for us! sending to clients...\n");
- /* TODO signature verification */
- memcpy (cbuf, message, size);
- copy = (struct GNUNET_MESH_ToOrigin *) cbuf;
- copy->tid = htonl (t->local_tid);
GNUNET_STATISTICS_update (stats, "# to origin received", 1, GNUNET_NO);
- GNUNET_SERVER_notification_context_unicast (nc, t->owner->handle,
- ©->header, GNUNET_NO);
+ tunnel_send_client_to_orig (t, msg);
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN);
return GNUNET_OK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" not for us, retransmitting...\n");
- peer_info = peer_get (&msg->oid);
- if (NULL == peer_info)
- {
- /* unknown origin of tunnel */
- GNUNET_break (0);
- return GNUNET_OK;
- }
if (0 == t->prev_hop) /* No owner AND no prev hop */
{
if (GNUNET_YES == t->destroy)
"from peer %s\n",
GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "for tunnel %s [%X]\n",
+ "on tunnel %s [%X]\n",
GNUNET_i2s (&msg->oid), ntohl(msg->tid));
return GNUNET_OK;
}
{
struct GNUNET_MESH_ACK *msg;
struct MeshTunnel *t;
+ GNUNET_PEER_Id id;
uint32_t ack;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got an ACK packet from %s!\n",
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ACK %u\n", ack);
/* Is this a forward or backward ACK? */
- if (t->prev_hop != GNUNET_PEER_search (peer))
+ id = GNUNET_PEER_search (peer);
+ if (t->next_hop == id)
{
- debug_bck_ack++;
+ debug_fwd_ack++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " FWD ACK\n");
if (GNUNET_SCHEDULER_NO_TASK != t->next_fc.poll_task &&
GMC_is_pid_bigger (ack, t->next_fc.last_ack_recv))
peer_unlock_queue (t->next_hop);
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_ACK);
}
- else
+ else if (t->prev_hop == id)
{
+ debug_bck_ack++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " BCK ACK\n");
if (GNUNET_SCHEDULER_NO_TASK != t->prev_fc.poll_task &&
GMC_is_pid_bigger (ack, t->prev_fc.last_ack_recv))
peer_unlock_queue (t->prev_hop);
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_ACK);
}
+ else
+ GNUNET_break_op (0);
return GNUNET_OK;
}
{
struct GNUNET_MESH_Poll *msg;
struct MeshTunnel *t;
+ GNUNET_PEER_Id id;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got an POLL packet from %s!\n",
GNUNET_i2s (peer));
}
/* Is this a forward or backward ACK? */
- if (t->prev_hop != GNUNET_PEER_search(peer))
+ id = GNUNET_PEER_search(peer);
+ if (t->next_hop == id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " from FWD\n");
- /* FIXME cinfo->bck_ack = cinfo->fwd_pid; // mark as ready to send */
tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
}
- else
+ else if (t->prev_hop == id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " from BCK\n");
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_POLL);
}
-
- return GNUNET_OK;
-}
-
-/**
- * Core handler for path ACKs
- *
- * @param cls closure
- * @param message message
- * @param peer peer identity this notification is about
- *
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
-{
- struct GNUNET_MESH_PathACK *msg;
- struct MeshPeerInfo *peer_info;
- struct MeshPeerPath *p;
- struct MeshTunnel *t;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received a path ACK msg [%s]\n",
- GNUNET_i2s (&my_full_id));
- msg = (struct GNUNET_MESH_PathACK *) message;
- t = tunnel_get (&msg->oid, ntohl(msg->tid));
- if (NULL == t)
- {
- /* TODO notify that we don't know the tunnel */
- GNUNET_STATISTICS_update (stats, "# control on unknown tunnel", 1, GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " don't know the tunnel %s [%X]!\n",
- GNUNET_i2s (&msg->oid), ntohl(msg->tid));
- return GNUNET_OK;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %s [%X]\n",
- GNUNET_i2s (&msg->oid), ntohl(msg->tid));
-
- peer_info = peer_get (&msg->peer_id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " by peer %s\n",
- GNUNET_i2s (&msg->peer_id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " via peer %s\n",
- GNUNET_i2s (peer));
-
- /* Add path to peers? */
- p = t->path;
- if (NULL != p)
- {
- path_add_to_peers (p, GNUNET_YES);
- }
else
- {
GNUNET_break (0);
- }
-
- /* Message for us? */
- if (0 == memcmp (&msg->oid, &my_full_id, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " It's for us!\n");
- if (NULL == t->owner)
- {
- GNUNET_break_op (0);
- return GNUNET_OK;
- }
- if (NULL != peer_info->dhtget)
- {
- GNUNET_DHT_get_stop (peer_info->dhtget);
- peer_info->dhtget = NULL;
- }
- return GNUNET_OK;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- " not for us, retransmitting...\n");
- peer_info = peer_get (&msg->oid);
- send_prebuilt_message (message, t->prev_hop, t);
return GNUNET_OK;
}
*/
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)},
{&handle_mesh_tunnel_destroy, GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY,
sizeof (struct GNUNET_MESH_TunnelDestroy)},
- {&handle_mesh_data_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
+ {&handle_mesh_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
{&handle_mesh_keepalive, GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE,
sizeof (struct GNUNET_MESH_TunnelKeepAlive)},
- {&handle_mesh_data_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
+ {&handle_mesh_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
{&handle_mesh_ack, GNUNET_MESSAGE_TYPE_MESH_ACK,
sizeof (struct GNUNET_MESH_ACK)},
{&handle_mesh_poll, GNUNET_MESSAGE_TYPE_MESH_POLL,
char cbuf[size];
t->maintenance_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) ||
+ NULL == t->owner || 0 == t->local_tid || 0 != t->prev_hop)
{
return;
}
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
- *
- * TODO: re-issue the request after certain time? cancel after X results?
*/
static void
dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
path_destroy (p);
for (i = 0; i < peer->ntunnels; i++)
{
- peer_connect (peer, peer->tunnels[i]); // FIXME add if
+ if (peer->tunnels[i]->state == MESH_TUNNEL_SEARCHING)
+ peer_connect (peer, peer->tunnels[i]);
}
return;
&tunnel_destroy_iterator, c);
GNUNET_CONTAINER_multihashmap_iterate (c->incoming_tunnels,
&tunnel_destroy_iterator, c);
- GNUNET_CONTAINER_multihashmap_iterate (c->ignore_tunnels,
- &tunnel_destroy_iterator, c);
GNUNET_CONTAINER_multihashmap_destroy (c->own_tunnels);
GNUNET_CONTAINER_multihashmap_destroy (c->incoming_tunnels);
- GNUNET_CONTAINER_multihashmap_destroy (c->ignore_tunnels);
- if (NULL != c->types)
- GNUNET_CONTAINER_multihashmap_destroy (c->types);
+ if (NULL != c->ports)
+ GNUNET_CONTAINER_multihashmap_destroy (c->ports);
next = c->next;
GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " CLIENT FREE at %p\n", c);
struct GNUNET_MESH_ClientConnect *cc_msg;
struct MeshClient *c;
unsigned int size;
- uint16_t ntypes;
- uint16_t *t;
- uint16_t i;
+ uint32_t *p;
+ unsigned int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "new client connected\n");
/* Check data sanity */
size = ntohs (message->size) - sizeof (struct GNUNET_MESH_ClientConnect);
cc_msg = (struct GNUNET_MESH_ClientConnect *) message;
- ntypes = ntohs (cc_msg->types);
- if (size != ntypes * sizeof (uint16_t))
+ if (0 != (size % sizeof (uint32_t)))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ size /= sizeof (uint32_t);
/* Create new client structure */
c = GNUNET_malloc (sizeof (struct MeshClient));
- c->id = next_client_id++; // overflow not important: just for debug
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " CLIENT NEW %u\n", c->id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client has %u types\n", ntypes);
+ c->id = next_client_id++; /* overflow not important: just for debug */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client id %u\n", c->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " client has %u ports\n", size);
c->handle = client;
GNUNET_SERVER_client_keep (client);
- if (ntypes > 0)
+ if (size > 0)
{
- uint16_t u16;
+ uint32_t u32;
struct GNUNET_HashCode hc;
- t = (uint16_t *) &cc_msg[1];
- c->types = GNUNET_CONTAINER_multihashmap_create (ntypes, GNUNET_NO);
- for (i = 0; i < ntypes; i++)
+ p = (uint32_t *) &cc_msg[1];
+ c->ports = GNUNET_CONTAINER_multihashmap_create (size, GNUNET_NO);
+ for (i = 0; i < size; i++)
{
- u16 = ntohs (t[i]);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " msg type: %u\n", u16);
- GNUNET_CRYPTO_hash (&u16, sizeof (u16), &hc); // FIXME pseudo hash
+ u32 = ntohl (p[i]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " port: %u\n", u32);
+ GMC_hash32 (u32, &hc);
- /* store in clients hashmap */
- GNUNET_CONTAINER_multihashmap_put (c->types, &hc, c,
+ /* store in client's hashmap */
+ GNUNET_CONTAINER_multihashmap_put (c->ports, &hc, c,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
/* store in global hashmap */
- GNUNET_CONTAINER_multihashmap_put (types, &hc, c,
+ /* FIXME only allow one client to have the port open,
+ * have a backup hashmap with waiting clients */
+ GNUNET_CONTAINER_multihashmap_put (ports, &hc, c,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
}
GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, c);
c->own_tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
c->incoming_tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
- c->ignore_tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
GNUNET_SERVER_notification_context_add (nc, client);
GNUNET_STATISTICS_update (stats, "# clients", 1, GNUNET_NO);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s [%x] (%x)\n",
- GNUNET_i2s (&my_full_id), t->id.tid, t->local_tid);
+ t->port = ntohl (t_msg->port);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s[%x]:%u (%x)\n",
+ GNUNET_i2s (&my_full_id), t->id.tid, t->port, t->local_tid);
peer_info = peer_get (&t_msg->peer);
GNUNET_array_append (peer_info->tunnels, peer_info->ntunnels, t);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- if (c != t->owner || tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ if (c == t->client)
{
- client_ignore_tunnel (c, t);
tunnel_destroy_empty (t);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- send_client_tunnel_disconnect (t, c);
+ send_client_tunnel_destroy (t);
client_delete_tunnel (c, t);
/* Don't try to ACK the client about the tunnel_destroy multicast packet */
copy->ttl = htonl (default_ttl);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" calling generic handler...\n");
- handle_mesh_data_unicast (NULL, &my_full_id, ©->header);
+ handle_mesh_unicast (NULL, &my_full_id, ©->header);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "receive done OK\n");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_ToOrigin *data_msg;
- struct MeshTunnelClientInfo *clinfo;
+ struct MeshFlowControl *fc;
struct MeshClient *c;
struct MeshTunnel *t;
MESH_TunnelNumber tid;
}
/* It should be sent by someone who has this as incoming tunnel. */
- if (GNUNET_NO == client_knows_tunnel (c, t))
+ if (t->client != c)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
}
/* PID should be as expected */
- clinfo = tunnel_get_client_fc (t, c);
- if (ntohl (data_msg->pid) != clinfo->bck_pid + 1)
+ fc = &t->next_fc;
+ if (ntohl (data_msg->pid) != fc->last_pid_recv + 1)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"To Origin PID, expected %u, got %u\n",
- clinfo->bck_pid + 1,
+ fc->last_pid_recv + 1,
ntohl (data_msg->pid));
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- clinfo->bck_pid++;
/* Ok, everything is correct, send the message
* (pretend we got it from a mesh peer)
struct GNUNET_MESH_ToOrigin *copy;
/* Work around 'const' limitation */
- copy = (struct GNUNET_MESH_ToOrigin *) buf;
memcpy (buf, data_msg, size);
+ copy = (struct GNUNET_MESH_ToOrigin *) buf;
GNUNET_PEER_resolve (t->id.oid, ©->oid);
copy->tid = htonl (t->id.tid);
copy->ttl = htonl (default_ttl);
- copy->pid = htonl (t->prev_fc.last_pid_sent + 1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" calling generic handler...\n");
- handle_mesh_data_to_orig (NULL, &my_full_id, ©->header);
+ handle_mesh_to_orig (NULL, &my_full_id, ©->header);
}
GNUNET_SERVER_receive_done (client, GNUNET_OK);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ack %u\n", ack);
/* Does client own tunnel? I.E: Is this an ACK for BCK traffic? */
- if (NULL != t->owner && t->owner->handle == client)
+ if (t->owner == c)
{
/* The client owns the tunnel, ACK is for data to_origin, send BCK ACK. */
- t->next_fc.last_ack_sent = ack;
- tunnel_send_bck_ack(t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
+ t->prev_fc.last_ack_recv = ack;
+ tunnel_send_bck_ack (t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
}
else
{
/* The client doesn't own the tunnel, this ACK is for FWD traffic. */
- tunnel_set_client_fwd_ack (t, c, ack);
+ t->next_fc.last_ack_recv = ack;
tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK);
}
};
-/**
- * To be called on core init/fail.
- *
- * @param cls service closure
- * @param server handle to the server for this service
- * @param identity the public identity of this peer
- */
-static void
-core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity)
-{
- static int i = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core init\n");
- core_handle = server;
- if (0 != memcmp (identity, &my_full_id, sizeof (my_full_id)) ||
- 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
- }
- return;
-}
-
-
/**
* Method called whenever a given peer connects.
*
}
+/**
+ * Install server (service) handlers and start listening to clients.
+ */
+static void
+server_init (void)
+{
+ GNUNET_SERVER_add_handlers (server_handle, client_handlers);
+ GNUNET_SERVER_disconnect_notify (server_handle,
+ &handle_local_client_disconnect, NULL);
+ nc = GNUNET_SERVER_notification_context_create (server_handle, 1);
+
+ clients_head = NULL;
+ clients_tail = NULL;
+ next_client_id = 0;
+ GNUNET_SERVER_resume (server_handle);
+}
+
+
+/**
+ * To be called on core init/fail.
+ *
+ * @param cls Closure (config)
+ * @param server handle to the server for this service
+ * @param identity the public identity of this peer
+ */
+static void
+core_init (void *cls, struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *identity)
+{
+ const struct GNUNET_CONFIGURATION_Handle *c = cls;
+ static int i = 0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Core init\n");
+ GNUNET_break (core_handle == server);
+ if (0 != memcmp (identity, &my_full_id, sizeof (my_full_id)) ||
+ 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_CORE_disconnect (core_handle);
+ 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 (10 < i++)
+ GNUNET_abort();
+ }
+ server_init ();
+ return;
+}
+
+
/******************************************************************************/
/************************ MAIN FUNCTIONS ****************************/
/******************************************************************************/
struct MeshPeerInfo *peer;
struct MeshPeerPath *p;
- keygen = NULL;
+ keygen = NULL;
if (NULL == pk)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Mesh service could not access hostkey: %s. Exiting.\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Could not access hostkey: %s. Exiting.\n"),
emsg);
GNUNET_SCHEDULER_shutdown ();
return;
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);
next_tid = 0;
next_local_tid = GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
-
- GNUNET_SERVER_add_handlers (server_handle, client_handlers);
- nc = GNUNET_SERVER_notification_context_create (server_handle, 1);
- GNUNET_SERVER_disconnect_notify (server_handle,
- &handle_local_client_disconnect, NULL);
-
-
- clients_head = NULL;
- clients_tail = NULL;
- next_client_id = 0;
-
announce_id_task = GNUNET_SCHEDULER_add_now (&announce_id, cls);
/* Create a peer_info for the local peer */
p->peers[0] = myid;
GNUNET_PEER_change_rc (myid, 1);
peer_info_add_path (peer, p, GNUNET_YES);
- GNUNET_SERVER_resume (server_handle);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh service running\n");
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting to run\n");
server_handle = server;
+ GNUNET_SERVER_suspend (server_handle);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (c, "PEER", "PRIVATE_KEY",
tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
incoming_tunnels = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
peers = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
- types = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
+ ports = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO);
dht_handle = GNUNET_DHT_connect (c, 64);
if (NULL == dht_handle)
}
stats = GNUNET_STATISTICS_create ("mesh", c);
- GNUNET_SERVER_suspend (server_handle);
/* Scheduled the task to clean up when shutdown is called */
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
projects / oweals / gnunet.git / blobdiff