* - add vs create? change vs. keep-alive? same msg or different ones? -- thinking...
* - speed requirement specification (change?) in mesh API -- API call
* - add ping message
- * - add connection confirmation message
- * - handle trnsmt_rdy return values
+ * - relay corking down to core
*/
#include "platform.h"
5)
#define ID_ANNOUNCE_TIME GNUNET_TIME_relative_multiply(\
+ GNUNET_TIME_UNIT_SECONDS,\
+ 10)
+
+#define GET_RESTART_TIME GNUNET_TIME_relative_multiply(\
GNUNET_TIME_UNIT_SECONDS,\
5)
+#define UNACKNOWLEDGED_WAIT GNUNET_TIME_relative_multiply(\
+ GNUNET_TIME_UNIT_SECONDS,\
+ 2)
/******************************************************************************/
/************************ DATA STRUCTURES ****************************/
/** ID of the tunnel this packet travels in */
struct MESH_TunnelID *origin;
- /** Ultimate destination of the packet */
- GNUNET_PEER_Id destination;
-
- /** Number of identical messages sent to different hops (multicast) */
- unsigned int copies;
-
- /** Size of the data */
- size_t size;
+ /** Data itself */
+ void *data;
/** Client that asked for the transmission, if any */
struct GNUNET_SERVER_Client *client;
- /** Who was is message being sent to */
+ /** Who was this message being sent to */
struct MeshPeerInfo *peer;
+ /** Ultimate destination of the packet */
+ GNUNET_PEER_Id destination;
+
+ /** Number of identical messages sent to different hops (multicast) */
+ unsigned int *copies;
+
/** Which handler was used to request the transmission */
unsigned int handler_n;
- /* Data at the end */
+ /** Size of the data */
+ size_t size;
+
+ /** Used to allow a client send more traffic to the service after a
+ * previous packet was tried to be sent to a neighbor and couldn't */
+ GNUNET_SCHEDULER_TaskIdentifier *timeout_task;
};
*/
struct GNUNET_DHT_GetHandle *dhtget;
+ /**
+ * Closure given to the DHT GET
+ */
+ struct MeshPathInfo *dhtgetcls;
+
/**
* Handles to stop queued transmissions for this peer
*/
/**
* Pointer to info stuctures used as cls for queued transmissions
*/
- struct MeshDataDescriptor *infos[CORE_QUEUE_SIZE];
+ void *infos[CORE_QUEUE_SIZE];
+
+ /**
+ * Type of message being in each transmission
+ */
+ uint16_t types[CORE_QUEUE_SIZE];
/**
* Array of tunnels this peer participates in
struct MeshTunnel **tunnels;
/**
- * Number of tunnels above
+ * Number of tunnels this peers participates in
*/
unsigned int ntunnels;
};
/**
* Peers in the tunnel, indexed by PeerIdentity -> (MeshPeerInfo)
+ * containing peers added by id or by type, not intermediate peers.
*/
struct GNUNET_CONTAINER_MultiHashMap *peers;
*/
struct MeshTunnelTree *tree;
+ /**
+ * Application type we are looking for in this tunnel
+ */
+ GNUNET_MESH_ApplicationType type;
+
+ /**
+ * Used to search peers offering a service
+ */
+ struct GNUNET_DHT_GetHandle *dht_get_type;
+
/**
* Task to keep the used paths alive
*/
GNUNET_SCHEDULER_TaskIdentifier path_refresh_task;
+
+ /**
+ * Task to destroy the tunnel after timeout
+ *
+ * FIXME: merge the two? a tunnel will have either
+ * a path refresh OR a timeout, never both!
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
};
struct MeshTunnel *t;
/**
- * Destination peer
+ * Neighbouring peer to whom we send the packet to
*/
struct MeshPeerInfo *peer;
* Path itself
*/
struct MeshPeerPath *path;
+
+ /**
+ * Position in peer's transmit queue
+ */
+ unsigned int pos;
};
*/
struct GNUNET_CONTAINER_MultiHashMap *types;
- /**
- * Used to search peers offering a service
- */
- struct GNUNET_DHT_GetHandle *dht_get_type;
-
#if MESH_DEBUG
/**
* ID of the client, for debug messages
/************************ DEBUG FUNCTIONS ****************************/
/******************************************************************************/
-#if MESH_DEBUG
+
/**
* GNUNET_SCHEDULER_Task for printing a message after some operation is done
* @param cls string to print
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n", s);
}
-#endif
/******************************************************************************/
*/
static struct GNUNET_CONTAINER_MultiHashMap *tunnels;
+/**
+ * Tunnels incoming, indexed by MESH_TunnelNumber
+ * (which is greater than GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ */
+static struct GNUNET_CONTAINER_MultiHashMap *incoming_tunnels;
+
/**
* Peers known, indexed by PeerIdentity (MeshPeerInfo)
*/
*/
static MESH_TunnelNumber next_tid;
+/**
+ * Tunnel ID for the next incoming tunnel (local tunnel number)
+ */
+static MESH_TunnelNumber next_local_tid;
+
/**
* All application types provided by this peer
*/
/************************ ITERATORS ****************************/
/******************************************************************************/
-
-/**
- * Iterator over hash map peer entries collect all neighbors who to resend the
- * data to.
- *
- * @param cls closure (**GNUNET_PEER_Id to store hops to send packet)
- * @param key current key code (peer id hash)
- * @param value value in the hash map (peer_info)
- * @return GNUNET_YES if we should continue to iterate, GNUNET_NO if not.
- */
-static int
-iterate_collect_neighbors (void *cls, const GNUNET_HashCode * key, void *value)
-{
- struct MeshPeerInfo *peer_info = value;
- struct MeshPathInfo *neighbors = cls;
- struct GNUNET_PeerIdentity *id;
- GNUNET_PEER_Id peer_id;
- unsigned int i;
-
- if (peer_info->id == myid)
- {
- return GNUNET_YES;
- }
- id = path_get_first_hop (neighbors->t->tree, peer_info->id);
- peer_id = GNUNET_PEER_search(id);
- for (i = 0; i < neighbors->path->length; i++)
- {
- if (neighbors->path->peers[i] == peer_id)
- return GNUNET_YES;
- }
- GNUNET_array_append (neighbors->path->peers, neighbors->path->length,
- peer_id);
-
- return GNUNET_YES;
-}
+/* FIXME move iterators here */
/******************************************************************************/
announce_application (void *cls, const GNUNET_HashCode * key, void *value)
{
/* FIXME are hashes in multihash map equal on all aquitectures? */
- GNUNET_DHT_put (dht_handle, key, 10U, GNUNET_DHT_RO_RECORD_ROUTE,
- GNUNET_BLOCK_TYPE_TEST, sizeof (struct GNUNET_PeerIdentity),
+ GNUNET_DHT_put (dht_handle,
+ key,
+ 10U,
+ GNUNET_DHT_RO_RECORD_ROUTE |
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ GNUNET_BLOCK_TYPE_TEST,
+ sizeof (struct GNUNET_PeerIdentity),
(const char *) &my_full_id,
#if MESH_DEBUG
GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_TIME_UNIT_FOREVER_REL,
* - Set data expiration in function of X
* - Adapt X to churn
*/
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n",
+ GNUNET_i2s (&my_full_id));
GNUNET_DHT_put (dht_handle, /* DHT handle */
&my_full_id.hashPubKey, /* Key to use */
10U, /* Replication level */
- GNUNET_DHT_RO_RECORD_ROUTE, /* DHT options */
+ GNUNET_DHT_RO_RECORD_ROUTE |
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, /* DHT options */
GNUNET_BLOCK_TYPE_TEST, /* Block type */
- 0, /* Size of the data */
- NULL, /* Data itself */
+ sizeof(my_full_id), /* Size of the data */
+ (char *)&my_full_id, /* Data itself */
GNUNET_TIME_absolute_get_forever (), /* Data expiration */
GNUNET_TIME_UNIT_FOREVER_REL, /* Retry time */
#if MESH_DEBUG
* @param cls closure
* @param exp when will this value expire
* @param key key of the result
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
static void
dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *const *get_path,
- const struct GNUNET_PeerIdentity *const *put_path,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
enum GNUNET_BLOCK_Type type, size_t size, const void *data);
/******************************************************************************/
/**
- * Retrieve the MeshPeerInfo stucture associated with the peer, create one
- * and insert it in the appropiate structures if the peer is not known yet.
+ * Check if client has registered with the service and has not disconnected
*
- * @param peer Identity of the peer
+ * @param client the client to check
*
- * @return Existing or newly created peer info
+ * @return non-NULL if client exists in the global DLL
*/
-static struct MeshPeerInfo *
-peer_info_get (const struct GNUNET_PeerIdentity *peer)
+static struct MeshClient *
+client_get (struct GNUNET_SERVER_Client *client)
{
- struct MeshPeerInfo *peer_info;
+ struct MeshClient *c;
- peer_info = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
- if (NULL == peer_info)
+ c = clients;
+ while (NULL != c)
{
- peer_info =
- (struct MeshPeerInfo *) GNUNET_malloc (sizeof (struct MeshPeerInfo));
- GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, peer_info,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- peer_info->id = GNUNET_PEER_intern (peer);
+ if (c->handle == client)
+ return c;
+ c = c->next;
}
-
- return peer_info;
+ return NULL;
}
-#if LATER
/**
- * Destroy the peer_info and free any allocated resources linked to it
- * @param t tunnel the path belongs to
- * @param pi the peer_info to destroy
- * @return GNUNET_OK on success
+ * 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
+ *
+ * TODO inline?
*/
static int
-peer_info_destroy (struct MeshPeerInfo *pi)
+client_is_subscribed (uint16_t message_type, struct MeshClient *c)
{
- GNUNET_HashCode hash;
- struct GNUNET_PeerIdentity id;
-
- GNUNET_PEER_resolve (pi->id, &id);
- GNUNET_PEER_change_rc (pi->id, -1);
- GNUNET_CRYPTO_hash (&id, sizeof (struct GNUNET_PeerIdentity), &hash);
+ GNUNET_HashCode hc;
- GNUNET_CONTAINER_multihashmap_remove (peers, &hash, pi);
- GNUNET_SCHEDULER_cancel (pi->path_refresh_task);
- GNUNET_free (pi);
- return GNUNET_OK;
+ GNUNET_CRYPTO_hash (&message_type, sizeof (uint16_t), &hc);
+ return GNUNET_CONTAINER_multihashmap_contains (c->types, &hc);
}
+
+
+/**
+ * Allow a client to send more data after transmitting a multicast message
+ * which some neighbor has not yet accepted altough a reasonable time has
+ * passed.
+ *
+ * @param cls Closure (DataDescriptor containing the task identifier)
+ * @param tc Task Context
+ */
+static void
+client_allow_send(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct MeshDataDescriptor *info = cls;
+
+ if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
+ return;
+#if MESH_DEBUG
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: CLIENT ALLOW SEND DESPITE %u COPIES PENDING\n",
+ *(info->copies));
#endif
+ *(info->timeout_task) = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SERVER_receive_done(info->client, GNUNET_OK);
+}
+
+
+/**
+ * Search for a tunnel by global ID using full PeerIdentities
+ *
+ * @param oid owner of the tunnel
+ * @param tid global tunnel number
+ *
+ * @return tunnel handler, NULL if doesn't exist
+ */
+static struct MeshTunnel *
+tunnel_get (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid);
/**
* some of its peers.
*
* @param t Tunnel affected.
- * @param peer Peer that (at least) has been affected by the disconnection.
* @param p1 Peer that got disconnected from p2.
* @param p2 Peer that got disconnected from p1.
*
*/
static GNUNET_PEER_Id
tunnel_notify_connection_broken (struct MeshTunnel *t,
- struct MeshPeerInfo *peer, GNUNET_PEER_Id p1,
+ GNUNET_PEER_Id p1,
GNUNET_PEER_Id p2);
+
/**
- * Remove all paths that rely on a direct connection between p1 and p2
- * from the peer itself and notify all tunnels about it.
- *
- * @param peer PeerInfo of affected peer.
- * @param p1 GNUNET_PEER_Id of one peer.
- * @param p2 GNUNET_PEER_Id of another peer that was connected to the first and
- * no longer is.
+ * Send the message to all clients that have subscribed to its type
*
- * TODO: optimize (see below)
+ * @param msg Pointer to the message itself
+ * @return number of clients this message was sent to
*/
-static void
-path_remove_from_peer (struct MeshPeerInfo *peer,
- GNUNET_PEER_Id p1,
- GNUNET_PEER_Id p2)
+static unsigned int
+send_subscribed_clients (const struct GNUNET_MessageHeader *msg,
+ const struct GNUNET_MessageHeader *payload)
{
- struct GNUNET_PeerIdentity id;
- struct MeshPeerPath *p;
- struct MeshPeerPath *aux;
- struct MeshPeerInfo *peer_d;
- GNUNET_PEER_Id d;
- unsigned int destroyed;
- unsigned int best;
- unsigned int cost;
- unsigned int i;
+ struct GNUNET_PeerIdentity *oid;
+ struct MeshClient *c;
+ struct MeshTunnel *t;
+ MESH_TunnelNumber *tid;
+ unsigned int count;
+ uint16_t type;
+ char cbuf[htons(msg->size)];
- destroyed = 0;
- p = peer->path_head;
- while (NULL != p)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Sending to clients...\n");
+ type = ntohs (payload->type);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: message of type %u\n", type);
+
+ memcpy (cbuf, msg, sizeof(cbuf));
+ switch (htons(msg->type))
{
- aux = p->next;
- for (i = 0; i < (p->length - 1); i++)
- {
- if ((p->peers[i] == p1 && p->peers[i + 1] == p2) ||
- (p->peers[i] == p2 && p->peers[i + 1] == p1))
- {
- path_destroy (p);
- destroyed++;
- break;
- }
- }
- p = aux;
+ struct GNUNET_MESH_Unicast *uc;
+ struct GNUNET_MESH_Multicast *mc;
+ struct GNUNET_MESH_ToOrigin *to;
+
+ case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ uc = (struct GNUNET_MESH_Unicast *) cbuf;
+ tid = &uc->tid;
+ oid = &uc->oid;
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
+ mc = (struct GNUNET_MESH_Multicast *) cbuf;
+ tid = &mc->tid;
+ oid = &mc->oid;
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ to = (struct GNUNET_MESH_ToOrigin *) cbuf;
+ tid = &to->tid;
+ oid = &to->oid;
+ break;
+ default:
+ GNUNET_break (0);
+ return 0;
}
- if (0 == destroyed)
- return;
-
- for (i = 0; i < peer->ntunnels; i++)
+ t = tunnel_get (oid, ntohl(*tid));
+ if (NULL == t)
{
- d = tunnel_notify_connection_broken (peer->tunnels[i], peer, p1, p2);
- /* TODO
- * Problem: one or more peers have been deleted from the tunnel tree.
- * We don't know who they are to try to add them again.
- * We need to try to find a new path for each of the disconnected peers.
- * Some of them might already have a path to reach them that does not
- * involve p1 and p2. Adding all anew might render in a better tree than
- * the trivial immediate fix.
- *
- * Trivial immiediate fix: try to reconnect to the disconnected node. All
- * its children will be reachable trough him.
- */
- GNUNET_PEER_resolve(d, &id);
- peer_d = peer_info_get(&id);
- best = UINT_MAX;
- aux = NULL;
- for (p = peer_d->path_head; NULL != p; p = p->next)
- {
- if ((cost = path_get_cost(peer->tunnels[i]->tree, p)) < best)
- {
- best = cost;
- aux = p;
- }
- }
- if (NULL != aux)
- {
- /* No callback, as peer will be already disconnected */
- tree_add_path(peer->tunnels[i]->tree, aux, NULL);
- }
- else
+ GNUNET_break (0);
+ return 0;
+ }
+ *tid = htonl (t->local_tid);
+ for (count = 0, c = clients; c != NULL; c = c->next)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: client %u\n", c->id);
+ if (client_is_subscribed (type, c))
{
- struct MeshPathInfo *path_info;
-
- if (NULL != peer_d->dhtget)
- return;
- path_info = GNUNET_malloc(sizeof(struct MeshPathInfo));
- path_info->path = p;
- path_info->peer = peer_d;
- path_info->t = peer->tunnels[i];
- peer_d->dhtget = GNUNET_DHT_get_start(dht_handle, /* handle */
- GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
- GNUNET_BLOCK_TYPE_TEST, /* type */
- &id.hashPubKey, /*key to search */
- 4, /* replication level */
- GNUNET_DHT_RO_RECORD_ROUTE,
- NULL, /* bloom filter */
- 0, /* mutator */
- NULL, /* xquery */
- 0, /* xquery bits */
- dht_get_id_handler,
- (void *) path_info);
+ count++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: sending\n");
+ GNUNET_SERVER_notification_context_unicast (
+ nc,
+ c->handle,
+ (struct GNUNET_MessageHeader *) cbuf,
+ GNUNET_YES);
}
}
+ return count;
}
/**
- * Add the path to the peer and update the path used to reach it in case this
- * is the shortest.
- *
- * @param peer_info Destination peer to add the path to.
- * @param path New path to add. Last peer must be the peer in arg 1.
- * Path will be either used of freed if already known.
- *
- * TODO: trim the part from origin to us? Add it as path to origin?
+ * Notify the client that owns the tunnel that a peer has connected to it
+ * (the requested path to it has been confirmed).
+ *
+ * @param t Tunnel whose owner to notify
+ * @param id Short id of the peer that has connected
*/
-void
-path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path)
+static void
+send_client_peer_connected (const struct MeshTunnel *t, const GNUNET_PEER_Id id)
{
- struct MeshPeerPath *aux;
- unsigned int l;
- unsigned int l2;
+ struct GNUNET_MESH_PeerControl pc;
- if (NULL == peer_info || NULL == path)
- {
- GNUNET_break (0);
- 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);
+ GNUNET_PEER_resolve (id, &pc.peer);
+ GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
+ &pc.header, GNUNET_NO);
+}
+
+
+/**
+ * Notify all clients (not depending on registration status) that the incoming
+ * tunnel is no longer valid.
+ *
+ * @param t Tunnel that was destroyed.
+ */
+static void
+send_clients_tunnel_destroy (struct MeshTunnel *t)
+{
+ struct GNUNET_MESH_TunnelMessage msg;
+
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
+ msg.tunnel_id = htonl (t->local_tid);
+ GNUNET_SERVER_notification_context_broadcast(nc, &msg.header, GNUNET_NO);
+}
+
+
+/**
+ * Function called to notify a client about the socket
+ * being ready to queue more data. "buf" will be
+ * NULL and "size" zero if the socket was closed for
+ * writing in the meantime.
+ *
+ * @param cls closure
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ * @return number of bytes written to buf
+ */
+static size_t
+send_core_create_path (void *cls, size_t size, void *buf);
+
+
+/**
+ * Function called to notify a client about the socket
+ * being ready to queue more data. "buf" will be
+ * NULL and "size" zero if the socket was closed for
+ * writing in the meantime.
+ *
+ * @param cls closure (data itself)
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ *
+ * @return number of bytes written to buf
+ */
+static size_t
+send_core_data_multicast (void *cls, size_t size, void *buf);
+
+
+/**
+ * Decrements the reference counter and frees all resources if needed
+ *
+ * @param dd Data Descriptor used in a multicast message
+ */
+static void
+data_descriptor_decrement_multicast (struct MeshDataDescriptor *dd)
+{
+ if (0 == --(*(dd->copies)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Last copy!\n");
+ if (NULL != dd->client)
+ {
+ if (GNUNET_SCHEDULER_NO_TASK != *(dd->timeout_task))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: cancelling client timeout (%u)...\n",
+ *(dd->timeout_task));
+ GNUNET_SCHEDULER_cancel(*(dd->timeout_task));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: notifying client...\n");
+ GNUNET_SERVER_receive_done (dd->client, GNUNET_OK);
+ }
+ GNUNET_free (dd->timeout_task);
+ }
+ GNUNET_free (dd->copies);
+ GNUNET_free (dd->data);
+ }
+}
+
+
+/**
+ * Cancel a core transmission that was already requested and free all resources
+ * associated to the request.
+ *
+ * @param peer PeeInfo of the peer whose transmission is cancelled.
+ * @param i Position of the transmission to be cancelled.
+ */
+static void
+peer_info_cancel_transmission(struct MeshPeerInfo *peer, unsigned int i)
+{
+ if (NULL != peer->core_transmit[i])
+ {
+ struct MeshDataDescriptor *dd;
+ struct MeshPathInfo *path_info;
+
+#if MESH_DEBUG
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (peer->id, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Cancelling data transmission at %s [%u]\n",
+ GNUNET_i2s (&id),
+ i);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: message type %u\n",
+ peer->types[i]);
+ }
+#endif
+ /* TODO: notify that tranmission has failed */
+ switch (peer->types[i])
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
+ case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
+ case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type payload\n");
+ dd = peer->infos[i];
+ data_descriptor_decrement_multicast (dd);
+ break;
+ case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type create path\n");
+ path_info = peer->infos[i];
+ path_destroy(path_info->path);
+ break;
+ default:
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type unknown!\n");
+ }
+ GNUNET_CORE_notify_transmit_ready_cancel (peer->core_transmit[i]);
+ peer->core_transmit[i] = NULL;
+ GNUNET_free (peer->infos[i]);
+ }
+}
+
+
+/**
+ * Get a unused CORE slot to transmit a message to a peer. If all the slots
+ * are used, cancel one and return it's position.
+ *
+ * @param peer PeerInfo of the neighbor we want to transmit to.
+ *
+ * @return The index of an available slot to transmit to the neighbor.
+ */
+static unsigned int
+peer_info_transmit_slot (struct MeshPeerInfo *peer)
+{
+ unsigned int i;
+
+ for (i = 0; peer->core_transmit[i]; i++)
+ {
+ if (i == (CORE_QUEUE_SIZE - 1))
+ {
+ /* All positions are taken! Overwriting! */
+ GNUNET_break (0);
+ peer_info_cancel_transmission(peer, 0);
+ return 0;
+ }
+ }
+ return i;
+}
+
+
+/**
+ * Retrieve the MeshPeerInfo stucture associated with the peer, create one
+ * and insert it in the appropiate structures if the peer is not known yet.
+ *
+ * @param peer Full identity of the peer.
+ *
+ * @return Existing or newly created peer info.
+ */
+static struct MeshPeerInfo *
+peer_info_get (const struct GNUNET_PeerIdentity *peer)
+{
+ struct MeshPeerInfo *peer_info;
+
+ peer_info = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
+ if (NULL == peer_info)
+ {
+ peer_info =
+ (struct MeshPeerInfo *) GNUNET_malloc (sizeof (struct MeshPeerInfo));
+ GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, peer_info,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ peer_info->id = GNUNET_PEER_intern (peer);
+ }
+
+ return peer_info;
+}
+
+
+/**
+ * Retrieve the MeshPeerInfo stucture associated with the peer, create one
+ * and insert it in the appropiate structures if the peer is not known yet.
+ *
+ * @param peer Short identity of the peer.
+ *
+ * @return Existing or newly created peer info.
+ */
+static struct MeshPeerInfo *
+peer_info_get_short (const GNUNET_PEER_Id peer)
+{
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve(peer, &id);
+ return peer_info_get(&id);
+}
+
+
+/**
+ * Iterator to remove the tunnel from the list of tunnels a peer participates
+ * in.
+ *
+ * @param cls Closure (tunnel info)
+ * @param key GNUNET_PeerIdentity of the peer (unused)
+ * @param value PeerInfo of the peer
+ *
+ * @return always GNUNET_YES, to keep iterating
+ */
+static int
+peer_info_delete_tunnel (void* cls, const GNUNET_HashCode* key, void* value)
+{
+ struct MeshTunnel *t = cls;
+ struct MeshPeerInfo *peer = value;
+ unsigned int i;
+
+ for (i = 0; i < peer->ntunnels; i++)
+ {
+ if (0 == memcmp(&peer->tunnels[i]->id,
+ &t->id,
+ sizeof(struct MESH_TunnelID)))
+ {
+ peer->ntunnels--;
+ peer->tunnels[i] = peer->tunnels[peer->ntunnels];
+ peer->tunnels = GNUNET_realloc (peer->tunnels, peer->ntunnels);
+ return GNUNET_YES;
+ }
+ }
+ return GNUNET_YES;
+}
+
+
+/**
+ * Core callback to write a
+ *
+ * @param cls Closure (MeshDataDescriptor with data in "data" member).
+ * @param size Number of bytes available in buf.
+ * @param buf Where the to write the message.
+ *
+ * @return number of bytes written to buf
+ */
+static size_t
+send_core_data_raw (void *cls, size_t size, void *buf)
+{
+ struct MeshDataDescriptor *info = cls;
+ struct GNUNET_MessageHeader *msg;
+ size_t total_size;
+
+ GNUNET_assert (NULL != info);
+ GNUNET_assert (NULL != info->data);
+ msg = (struct GNUNET_MessageHeader *) info->data;
+ total_size = ntohs (msg->size);
+
+ if (total_size > size)
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (info->peer->id, &id);
+ info->peer->core_transmit[info->handler_n] =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 100,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ size,
+ &send_core_data_raw,
+ info);
+ return 0;
+ }
+ info->peer->core_transmit[info->handler_n] = NULL;
+ memcpy (buf, msg, total_size);
+ GNUNET_free (info->data);
+ GNUNET_free (info);
+ return total_size;
+}
+
+
+/**
+ * Sends an already built message to a peer, properly registrating
+ * all used resources.
+ *
+ * @param message Message to send. Fucntion makes a copy of it.
+ * @param peer Short ID of the neighbor whom to send the message.
+ */
+static void
+send_message (const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct MeshDataDescriptor *info;
+ struct MeshPeerInfo *neighbor;
+ unsigned int i;
+ size_t size;
+
+ size = ntohs (message->size);
+ info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
+ info->data = GNUNET_malloc (size);
+ memcpy (info->data, message, size);
+ neighbor = peer_info_get (peer);
+ i = peer_info_transmit_slot (neighbor);
+ info->handler_n = i;
+ info->peer = neighbor;
+ neighbor->types[i] = GNUNET_MESSAGE_TYPE_MESH_UNICAST;
+ neighbor->infos[i] = info;
+ neighbor->core_transmit[i] =
+ GNUNET_CORE_notify_transmit_ready(core_handle,
+ 0,
+ 100,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ peer,
+ size,
+ &send_core_data_raw,
+ info);
+
+}
+
+
+/**
+ * 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)
+{
+ struct GNUNET_PeerIdentity id;
+ struct MeshPathInfo *path_info;
+ struct MeshPeerInfo *neighbor;
+ unsigned int i;
+
+ if (NULL == p)
+ {
+ p = tree_get_path_to_peer(t->tree, peer->id);
+ if (NULL == p)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ }
+ for (i = 0; i < p->length; i++)
+ {
+ if (p->peers[i] == myid)
+ break;
+ }
+ if (i >= p->length - 1)
+ {
+ path_destroy(p);
+ GNUNET_break (0);
+ return;
+ }
+ GNUNET_PEER_resolve(p->peers[i + 1], &id);
+
+ path_info = GNUNET_malloc (sizeof (struct MeshPathInfo));
+ path_info->path = p;
+ path_info->t = t;
+ neighbor = peer_info_get(&id);
+ path_info->peer = neighbor;
+ path_info->pos = peer_info_transmit_slot(neighbor);
+ neighbor->types[path_info->pos] = GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE;
+ neighbor->infos[path_info->pos] = path_info;
+ neighbor->core_transmit[path_info->pos] =
+ GNUNET_CORE_notify_transmit_ready (
+ core_handle, /* handle */
+ 0, /* cork */
+ 0, /* priority */
+ GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ &id, /* target */
+ sizeof (struct GNUNET_MESH_ManipulatePath)
+ + (p->length * sizeof (struct GNUNET_PeerIdentity)), /*size */
+ &send_core_create_path, /* callback */
+ path_info); /* cls */
+}
+
+
+/**
+ * Sends a DESTROY PATH message to free resources for a path in a tunnel
+ *
+ * @param t Tunnel whose path to destroy.
+ * @param destination Short ID of the peer to whom the path to destroy.
+ */
+static void
+send_destroy_path (struct MeshTunnel *t, GNUNET_PEER_Id destination)
+{
+ struct MeshPeerPath *p;
+ size_t size;
+
+ p = tree_get_path_to_peer(t->tree, destination);
+ if (NULL == p)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ size = sizeof (struct GNUNET_MESH_ManipulatePath);
+ size += p->length * sizeof (struct GNUNET_PeerIdentity);
+ {
+ struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_PeerIdentity *pi;
+ char cbuf[size];
+ unsigned int i;
+
+ msg = (struct GNUNET_MESH_ManipulatePath *) cbuf;
+ msg->header.size = htons (size);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY);
+ msg->tid = htonl (t->id.tid);
+ pi = (struct GNUNET_PeerIdentity *) &msg[1];
+ for (i = 0; i < p->length; i++)
+ {
+ GNUNET_PEER_resolve(p->peers[i], &pi[i]);
+ }
+ send_message (&msg->header, path_get_first_hop(t->tree, destination));
+ }
+ path_destroy (p);
+}
+
+
+/**
+ * Try to establish a new connection to this peer.
+ * Use the best path for the given tunnel.
+ * If the peer doesn't have any path to it yet, try to get one.
+ * If the peer already has some path, send a CREATE PATH towards it.
+ *
+ * @param peer PeerInfo of the peer.
+ * @param t Tunnel for which to create the path, if possible.
+ */
+static void
+peer_info_connect (struct MeshPeerInfo *peer, struct MeshTunnel *t)
+{
+ struct MeshPeerPath *p;
+ struct MeshPathInfo *path_info;
+
+ if (NULL != peer->path_head)
+ {
+ p = tree_get_path_to_peer(t->tree, peer->id);
+ if (NULL == p)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ if (p->length > 1)
+ {
+ send_create_path(peer, p, t);
+ }
+ else
+ {
+ path_destroy(p);
+ send_client_peer_connected(t, myid);
+ }
+ }
+ else if (NULL == peer->dhtget)
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve(peer->id, &id);
+ path_info = GNUNET_malloc(sizeof(struct MeshPathInfo));
+ path_info->peer = peer;
+ path_info->t = t;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Starting DHT GET for peer %s\n",
+ GNUNET_i2s (&id));
+ peer->dhtgetcls = path_info;
+ peer->dhtget =
+ GNUNET_DHT_get_start(dht_handle, /* handle */
+ GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ GNUNET_BLOCK_TYPE_TEST, /* type */
+ &id.hashPubKey, /* key to search */
+ 4, /* replication level */
+ GNUNET_DHT_RO_RECORD_ROUTE |
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ NULL, /* xquery */
+ 0, /* xquery bits */
+ &dht_get_id_handler,
+ path_info);
+ }
+ /* Otherwise, there is no path but the DHT get is already started. */
+}
+
+
+/**
+ * Task to delay the connection of a peer
+ *
+ * @param cls Closure (path info with tunnel and peer to connect).
+ * Will be free'd on exection.
+ * @param tc TaskContext
+ */
+static void
+peer_info_connect_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct MeshPathInfo *path_info = cls;
+
+ if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
+ {
+ GNUNET_free (cls);
+ }
+ peer_info_connect (path_info->peer, path_info->t);
+ GNUNET_free (cls);
+}
+
+
+/**
+ * Destroy the peer_info and free any allocated resources linked to it
+ *
+ * @param pi The peer_info to destroy.
+ *
+ * @return GNUNET_OK on success
+ */
+static int
+peer_info_destroy (struct MeshPeerInfo *pi)
+{
+ struct GNUNET_PeerIdentity id;
+ struct MeshPeerPath *p;
+ struct MeshPeerPath *nextp;
+ unsigned int i;
+
+ GNUNET_PEER_resolve (pi->id, &id);
+ GNUNET_PEER_change_rc (pi->id, -1);
+
+ if (GNUNET_YES !=
+ GNUNET_CONTAINER_multihashmap_remove (peers,&id.hashPubKey, pi))
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "MESH: removing peer %s, not in hashmap\n",
+ GNUNET_i2s (&id));
+ }
+ if (NULL != pi->dhtget)
+ {
+ GNUNET_DHT_get_stop(pi->dhtget);
+ GNUNET_free (pi->dhtgetcls);
+ }
+ for (i = 0; i < CORE_QUEUE_SIZE; i++)
+ {
+ peer_info_cancel_transmission(pi, i);
+ }
+ p = pi->path_head;
+ while (NULL != p)
+ {
+ nextp = p->next;
+ GNUNET_CONTAINER_DLL_remove (pi->path_head, pi->path_tail, p);
+ path_destroy (p);
+ p = nextp;
+ }
+ GNUNET_free (pi);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Remove all paths that rely on a direct connection between p1 and p2
+ * from the peer itself and notify all tunnels about it.
+ *
+ * @param peer PeerInfo of affected peer.
+ * @param p1 GNUNET_PEER_Id of one peer.
+ * @param p2 GNUNET_PEER_Id of another peer that was connected to the first and
+ * no longer is.
+ *
+ * TODO: optimize (see below)
+ */
+static void
+path_remove_from_peer (struct MeshPeerInfo *peer,
+ GNUNET_PEER_Id p1,
+ GNUNET_PEER_Id p2)
+{
+ struct MeshPeerPath *p;
+ struct MeshPeerPath *aux;
+ struct MeshPeerInfo *peer_d;
+ GNUNET_PEER_Id d;
+ unsigned int destroyed;
+ unsigned int best;
+ unsigned int cost;
+ unsigned int i;
+
+ destroyed = 0;
+ p = peer->path_head;
+ while (NULL != p)
+ {
+ aux = p->next;
+ for (i = 0; i < (p->length - 1); i++)
+ {
+ if ((p->peers[i] == p1 && p->peers[i + 1] == p2) ||
+ (p->peers[i] == p2 && p->peers[i + 1] == p1))
+ {
+ GNUNET_CONTAINER_DLL_remove (peer->path_head, peer->path_tail, p);
+ path_destroy (p);
+ destroyed++;
+ break;
+ }
+ }
+ p = aux;
+ }
+ if (0 == destroyed)
+ return;
+
+ for (i = 0; i < peer->ntunnels; i++)
+ {
+ d = tunnel_notify_connection_broken (peer->tunnels[i], p1, p2);
+ /* TODO
+ * Problem: one or more peers have been deleted from the tunnel tree.
+ * We don't know who they are to try to add them again.
+ * We need to try to find a new path for each of the disconnected peers.
+ * Some of them might already have a path to reach them that does not
+ * involve p1 and p2. Adding all anew might render in a better tree than
+ * the trivial immediate fix.
+ *
+ * Trivial immiediate fix: try to reconnect to the disconnected node. All
+ * its children will be reachable trough him.
+ */
+ peer_d = peer_info_get_short(d);
+ best = UINT_MAX;
+ aux = NULL;
+ for (p = peer_d->path_head; NULL != p; p = p->next)
+ {
+ if ((cost = path_get_cost(peer->tunnels[i]->tree, p)) < best)
+ {
+ best = cost;
+ aux = p;
+ }
+ }
+ if (NULL != aux)
+ {
+ /* No callback, as peer will be already disconnected */
+ tree_add_path(peer->tunnels[i]->tree, aux, NULL);
+ }
+ else
+ {
+ peer_info_connect (peer_d, peer->tunnels[i]);
+ }
+ }
+}
+
+
+/**
+ * Add the path to the peer and update the path used to reach it in case this
+ * is the shortest.
+ *
+ * @param peer_info Destination peer to add the path to.
+ * @param path New path to add. Last peer must be the peer in arg 1.
+ * Path will be either used of freed if already known.
+ *
+ * TODO: trim the part from origin to us? Add it as path to origin?
+ */
+void
+path_add_to_peer (struct MeshPeerInfo *peer_info, struct MeshPeerPath *path)
+{
+ struct MeshPeerPath *aux;
+ unsigned int l;
+ unsigned int l2;
+
+#if MESH_DEBUG
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve (peer_info->id, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: adding path [%u] to peer %s\n",
+ path->length,
+ GNUNET_i2s (&id));
+#endif
+ if (NULL == peer_info || NULL == path)
+ {
+ GNUNET_break (0);
+ path_destroy (path);
+ return;
}
l = path_get_length (path);
+ if (0 == l)
+ {
+ GNUNET_free (path);
+ return;
+ }
for (aux = peer_info->path_head; aux != NULL; aux = aux->next)
{
if (l2 > l)
{
GNUNET_CONTAINER_DLL_insert_before (peer_info->path_head,
- peer_info->path_tail, aux, path);
+ peer_info->path_tail,
+ aux,
+ path);
+ return;
}
else
{
}
}
}
- GNUNET_CONTAINER_DLL_insert_tail (peer_info->path_head, peer_info->path_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (peer_info->path_head,
+ peer_info->path_tail,
path);
return;
}
* Build a PeerPath from the paths returned from the DHT, reversing the paths
* to obtain a local peer -> destination path and interning the peer ids.
*
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
- *
* @return Newly allocated and created path
*/
static struct MeshPeerPath *
-path_build_from_dht (const struct GNUNET_PeerIdentity *const *get_path,
- const struct GNUNET_PeerIdentity *const *put_path)
+path_build_from_dht (const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length)
{
struct MeshPeerPath *p;
GNUNET_PEER_Id id;
int i;
- p = path_new (0);
- for (i = 0; get_path[i] != NULL; i++) ;
+ p = path_new (1);
+ p->peers[0] = myid;
+ GNUNET_PEER_change_rc(myid, 1);
+ i = get_path_length;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: GET has %d hops.\n", i);
for (i--; i >= 0; i--)
{
- id = GNUNET_PEER_intern (get_path[i]);
+ id = GNUNET_PEER_intern (&get_path[i]);
if (p->length > 0 && id == p->peers[p->length - 1])
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n");
}
else
{
- p->peers =
- GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * (p->length + 1));
- p->peers[p->length] = id;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Adding from GET: %s.\n",
+ GNUNET_i2s(&get_path[i]));
p->length++;
+ p->peers = GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * p->length);
+ p->peers[p->length - 1] = id;
}
}
- for (i = 0; put_path[i] != NULL; i++) ;
+ i = put_path_length;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: PUT has %d hops.\n", i);
for (i--; i >= 0; i--)
{
- id = GNUNET_PEER_intern (put_path[i]);
- if (p->length > 0 && id == p->peers[p->length - 1])
+ id = GNUNET_PEER_intern (&put_path[i]);
+ if (id == myid)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n");
- GNUNET_PEER_change_rc(id, -1);
- }
- else
- {
- p->peers =
- GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * (p->length + 1));
- p->peers[p->length] = id;
- p->length++;
- }
- }
-#if MESH_DEBUG
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: (first of GET: %s)\n",
- GNUNET_h2s_full(&get_path[0]->hashPubKey));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: (first of PUT: %s)\n",
- GNUNET_h2s_full(&put_path[0]->hashPubKey));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: In total: %d hops\n",
- p->length);
-#endif
- return p;
-}
-
-
-/**
- * Send keepalive packets for a peer
- *
- * @param cls unused
- * @param tc unused
- *
- * FIXME path
- */
-void
-path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct MeshTunnel *t = cls;
-
-// struct GNUNET_PeerIdentity id;
-
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
- {
- return;
+ /* PUT path went through us, so discard the path up until now and start
+ * from here to get a much shorter (and loop-free) path.
+ */
+ path_destroy (p);
+ p = path_new (0);
+ }
+ if (p->length > 0 && id == p->peers[p->length - 1])
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Optimizing 1 hop out.\n");
+ GNUNET_PEER_change_rc(id, -1);
+ }
+ else
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Adding from PUT: %s.\n",
+ GNUNET_i2s(&put_path[i]));
+ p->length++;
+ p->peers = GNUNET_realloc (p->peers, sizeof (GNUNET_PEER_Id) * p->length);
+ p->peers[p->length - 1] = id;
+ }
}
- /* FIXME implement multicast keepalive. Just an empty multicast packet? */
-// GNUNET_PEER_resolve (path_get_first_hop (path->t, path->peer)->id, &id);
-// GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
-// GNUNET_TIME_UNIT_FOREVER_REL, &id,
-// sizeof (struct GNUNET_MESH_ManipulatePath)
-// +
-// (path->path->length *
-// sizeof (struct GNUNET_PeerIdentity)),
-// &send_core_create_path,
-// t);
- t->path_refresh_task =
- GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t);
- return;
-}
-
-
-/**
- * Check if client has registered with the service and has not disconnected
- *
- * @param client the client to check
- *
- * @return non-NULL if client exists in the global DLL
- */
-static struct MeshClient *
-client_get (struct GNUNET_SERVER_Client *client)
-{
- struct MeshClient *c;
-
- c = clients;
- while (NULL != c)
+#if MESH_DEBUG
+ if (get_path_length > 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: (first of GET: %s)\n",
+ GNUNET_i2s(&get_path[0]));
+ if (put_path_length > 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: (first of PUT: %s)\n",
+ GNUNET_i2s(&put_path[0]));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: In total: %d hops\n",
+ p->length);
+ for (i = 0; i < p->length; i++)
{
- if (c->handle == client)
- return c;
- c = c->next;
+ struct GNUNET_PeerIdentity peer_id;
+
+ GNUNET_PEER_resolve(p->peers[i], &peer_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: %u: %s\n",
+ p->peers[i],
+ GNUNET_i2s(&peer_id));
}
- return NULL;
+#endif
+ return p;
}
/**
- * Checks if a given client has subscribed to certain message type
- *
- * @param message_type Type of message to check
- * @param c Client to check
+ * Send keepalive packets for a peer
*
- * @return GNUNET_YES or GNUNET_NO, depending on subscription status
+ * @param cls Closure (tunnel for which to send the keepalive).
+ * @param tc Notification context.
*
- * TODO inline?
+ * TODO: implement explicit multicast keepalive?
*/
-static int
-client_is_subscribed (uint16_t message_type, struct MeshClient *c)
-{
- GNUNET_HashCode hc;
-
- GNUNET_CRYPTO_hash (&message_type, sizeof (uint16_t), &hc);
- return GNUNET_CONTAINER_multihashmap_contains (c->types, &hc);
-}
+static void
+path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
GNUNET_HashCode hash;
GNUNET_CRYPTO_hash (&tid, sizeof (MESH_TunnelNumber), &hash);
+ if (tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ {
+ return GNUNET_CONTAINER_multihashmap_get (incoming_tunnels, &hash);
+ }
return GNUNET_CONTAINER_multihashmap_get (c->tunnels, &hash);
}
* disconnected, most likely because of a path change.
*
* @param n Node in the tree representing the disconnected peer
+ *
+ * FIXME: pass tunnel via cls, make param just a peer identity
*/
void
notify_peer_disconnected (const struct MeshTunnelTreeNode *n)
{
- struct GNUNET_MESH_PeerControl msg;
-
- if (NULL == n->t->client || NULL == nc)
- return;
+ struct MeshPeerInfo *peer;
+ struct MeshPathInfo *path_info;
- msg.header.size = htons (sizeof (msg));
- msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL);
- msg.tunnel_id = htonl (n->t->local_tid);
- GNUNET_PEER_resolve (n->peer, &msg.peer);
- GNUNET_SERVER_notification_context_unicast (nc, n->t->client->handle,
- &msg.header, GNUNET_NO);
+ if (NULL != n->t->client && NULL != nc)
+ {
+ struct GNUNET_MESH_PeerControl msg;
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_PEER_DEL);
+ msg.tunnel_id = htonl (n->t->local_tid);
+ GNUNET_PEER_resolve (n->peer, &msg.peer);
+ GNUNET_SERVER_notification_context_unicast (nc, n->t->client->handle,
+ &msg.header, GNUNET_NO);
+ }
+ peer = peer_info_get_short(n->peer);
+ path_info = GNUNET_malloc (sizeof (struct MeshPathInfo));
+ path_info->peer = peer;
+ path_info->t = n->t;
+ GNUNET_SCHEDULER_add_now(&peer_info_connect_task, path_info);
}
/**
* Add a peer to a tunnel, accomodating paths accordingly and initializing all
* needed rescources.
+ * If peer already exists, reevaluate shortest path and change if different.
*
* @param t Tunnel we want to add a new peer to
* @param peer PeerInfo of the peer being added
*
*/
-void
+static void
tunnel_add_peer (struct MeshTunnel *t, struct MeshPeerInfo *peer)
{
-// struct MeshTunnelTreeNode *n;
- struct MeshPeerPath *p;
+ struct GNUNET_PeerIdentity id;
struct MeshPeerPath *best_p;
+ struct MeshPeerPath *p;
unsigned int best_cost;
unsigned int cost;
- if (NULL != tree_find_peer(t->tree->root, peer->id))
+ GNUNET_PEER_resolve(peer->id, &id);
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains(t->peers, &id.hashPubKey))
{
- /* Already have it, nothing to do. */
- return;
+ t->peers_total++;
+ GNUNET_array_append (peer->tunnels, peer->ntunnels, t);
+ GNUNET_CONTAINER_multihashmap_put(
+ t->peers,
+ &id.hashPubKey,
+ peer,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
}
- t->peers_total++;
- GNUNET_array_append (peer->tunnels, peer->ntunnels, t);
- if (NULL == (p = peer->path_head))
+ if (NULL != (p = peer->path_head))
{
- GNUNET_break (0);
- return;
+ best_p = p;
+ best_cost = path_get_cost(t->tree, p);
+ while (NULL != p)
+ {
+ if ((cost = path_get_cost (t->tree, p)) < best_cost)
+ {
+ best_cost = cost;
+ best_p = p;
+ }
+ p = p->next;
+ }
+ tree_add_path (t->tree, best_p, ¬ify_peer_disconnected);
+ if (GNUNET_SCHEDULER_NO_TASK == t->path_refresh_task)
+ t->path_refresh_task =
+ GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t);
}
+ else
+ {
+ /* Start a DHT get if necessary */
+ peer_info_connect(peer, t);
+ }
+}
- best_p = p;
- best_cost = UINT_MAX;
- while (NULL != p)
+/**
+ * Add a path to a tunnel which we don't own, just to remember the next hop.
+ * If destination node was already in the tunnel, the first hop information
+ * will be replaced with the new path.
+ *
+ * @param t Tunnel we want to add a new peer to
+ * @param p Path to add
+ * @param own_pos Position of local node in path.
+ *
+ */
+static void
+tunnel_add_path (struct MeshTunnel *t,
+ struct MeshPeerPath *p,
+ unsigned int own_pos)
+{
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_assert (0 != own_pos);
+ tree_add_path(t->tree, p, NULL);
+ if (NULL == t->tree->me)
+ t->tree->me = tree_find_peer(t->tree->root, p->peers[own_pos]);
+ if (own_pos < p->length - 1)
{
- if ((cost = path_get_cost (t->tree, p)) < best_cost)
- {
- best_cost = cost;
- best_p = p;
- }
- p = p->next;
+ GNUNET_PEER_resolve (p->peers[own_pos + 1], &id);
+ tree_update_first_hops(t->tree, t->tree->me, &id);
}
- tree_add_path (t->tree, best_p, ¬ify_peer_disconnected);
- if (GNUNET_SCHEDULER_NO_TASK == t->path_refresh_task)
- t->path_refresh_task =
- GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t);
}
/**
- * Notify a tunnel that a connection has broken that affects at least
- * some of its peers.
+ * 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.
+ * In case the peer is the owner of the tree, notifies the client that owns
+ * the tunnel and tries to reconnect.
*
* @param t Tunnel affected.
- * @param peer Peer that (at least) has been affected by the disconnection.
* @param p1 Peer that got disconnected from p2.
* @param p2 Peer that got disconnected from p1.
*
*/
static GNUNET_PEER_Id
tunnel_notify_connection_broken (struct MeshTunnel *t,
- struct MeshPeerInfo *peer,
GNUNET_PEER_Id p1,
GNUNET_PEER_Id p2)
{
- return tree_notify_connection_broken (t->tree, p1, p2,
- ¬ify_peer_disconnected);
+ GNUNET_PEER_Id pid;
+
+ pid = tree_notify_connection_broken (t->tree,
+ p1,
+ p2,
+ ¬ify_peer_disconnected);
+ if (myid != p1 && myid != p2)
+ {
+ return pid;
+ }
+ if (pid != myid)
+ {
+ if (NULL != t->tree->me->parent)
+ {
+ /* We are the peer still connected, notify owner of the disconnection. */
+ struct GNUNET_MESH_PathBroken msg;
+ struct GNUNET_PeerIdentity neighbor;
+
+ msg.header.size = htons (sizeof (msg));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN);
+ GNUNET_PEER_resolve (t->id.oid, &msg.oid);
+ msg.tid = htonl (t->id.tid);
+ msg.peer1 = my_full_id;
+ GNUNET_PEER_resolve (pid, &msg.peer2);
+ GNUNET_PEER_resolve (t->tree->me->parent->peer, &neighbor);
+ send_message (&msg.header, &neighbor);
+ }
+ }
+ return pid;
+}
+
+
+/**
+ * Send a message in a tunnel in multicast, sending a copy to each child node
+ * down the local one in the tunnel tree.
+ *
+ * @param t Tunnel in which to send the data.
+ * @param msg Message to be sent
+ *
+ * @return Number of copies sent.
+ *
+ * TODO: unifiy shared resources and reference counter management
+ */
+static int
+tunnel_send_multicast (struct MeshTunnel *t,
+ const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_PeerIdentity neighbor;
+ struct MeshDataDescriptor *info;
+ struct MeshTunnelTreeNode *n;
+ struct MeshTunnelTreeNode *counter;
+ GNUNET_SCHEDULER_TaskIdentifier *task;
+ unsigned int *copies;
+ unsigned int i;
+ size_t size;
+ void *data;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: sending a multicast packet...\n");
+ size = ntohs (msg->size);
+ GNUNET_assert (NULL != t->tree->me);
+ n = t->tree->me->children_head;
+ if (NULL == n)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: no children in the tree, no one to send.\n");
+ return 0;
+ }
+ copies = GNUNET_malloc (sizeof (unsigned int));
+ for (counter = n; NULL != counter; counter = counter->next)
+ (*copies)++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (%u copies)\n", *copies);
+ data = GNUNET_malloc (size);
+ memcpy (data, msg, size);
+ if (NULL != t->client)
+ {
+ task = GNUNET_malloc (sizeof (GNUNET_SCHEDULER_TaskIdentifier));
+ *task = GNUNET_SCHEDULER_add_delayed (UNACKNOWLEDGED_WAIT,
+ &client_allow_send,
+ t->client->handle);
+ }
+ else
+ task = NULL; // So GCC shuts up about task being potentially uninitialized
+ while (NULL != n)
+ {
+ info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
+ info->data = data;
+ info->size = size;
+ info->copies = copies;
+ if (NULL != t->client)
+ {
+ info->client = t->client->handle;
+ info->timeout_task = task;
+ }
+ info->destination = n->peer;
+ GNUNET_PEER_resolve (n->peer, &neighbor);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: sending to %s...\n",
+ GNUNET_i2s (&neighbor));
+ info->peer = peer_info_get(&neighbor);
+ GNUNET_assert (NULL != info->peer);
+ i = peer_info_transmit_slot(info->peer);
+ info->handler_n = i;
+ info->peer->infos[i] = info;
+ info->peer->types[i] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST;
+ info->peer->core_transmit[i] =
+ GNUNET_CORE_notify_transmit_ready (core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &neighbor,
+ size,
+ &send_core_data_multicast, info);
+ n = n->next;
+ }
+ return *copies;
+}
+
+
+/**
+ * Send a message to all peers in this tunnel that the tunnel is no longer
+ * valid.
+ *
+ * @param t The tunnel whose peers to notify.
+ */
+static void
+tunnel_send_destroy (struct MeshTunnel *t)
+{
+ struct GNUNET_MESH_TunnelDestroy msg;
+
+ 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);
}
+
/**
* Destroy the tunnel and free any allocated resources linked to it
*
GNUNET_HashCode hash;
int r;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DESTROYING TUNNEL at %p\n", t);
if (NULL == t)
return GNUNET_OK;
c = t->client;
#if MESH_DEBUG
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: by client %u\n", c->id);
+ {
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_PEER_resolve(t->id.oid, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: destroying tunnel %s [%x]\n",
+ GNUNET_i2s (&id),
+ t->id.tid);
+ if (NULL != c)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: by client %u\n", c->id);
+ }
#endif
GNUNET_CRYPTO_hash (&t->id, sizeof (struct MESH_TunnelID), &hash);
}
GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
- if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (c->tunnels, &hash, t))
+ if (NULL != c &&
+ GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (c->tunnels, &hash, t))
{
r = GNUNET_SYSERR;
}
- GNUNET_CONTAINER_multihashmap_destroy (t->peers);
+ if (t->local_tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ {
+ GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (incoming_tunnels, &hash, t));
+ }
+
+ if (NULL != t->peers)
+ {
+ GNUNET_CONTAINER_multihashmap_iterate(t->peers,
+ &peer_info_delete_tunnel, t);
+ GNUNET_CONTAINER_multihashmap_destroy (t->peers);
+ }
q = t->queue_head;
while (NULL != q)
{
/* TODO cancel core transmit ready in case it was active */
}
tree_destroy(t->tree);
+ if (NULL != t->dht_get_type)
+ GNUNET_DHT_get_stop(t->dht_get_type);
+ if (GNUNET_SCHEDULER_NO_TASK != t->timeout_task)
+ GNUNET_SCHEDULER_cancel(t->timeout_task);
+ if (GNUNET_SCHEDULER_NO_TASK != t->path_refresh_task)
+ GNUNET_SCHEDULER_cancel(t->path_refresh_task);
GNUNET_free (t);
return r;
}
+/**
+ * Removes an explicit path from a tunnel, freeing all intermediate nodes
+ * that are no longer needed, as well as nodes of no longer reachable peers.
+ * The tunnel itself is also destoyed if results in a remote empty tunnel.
+ *
+ * @param t Tunnel from which to remove the path.
+ * @param p Peer which should be removed.
+ */
+static void
+tunnel_delete_peer (struct MeshTunnel *t,
+ GNUNET_PEER_Id peer)
+{
+ GNUNET_break (GNUNET_OK == tree_del_peer (t->tree, peer, NULL));
+ if (NULL == t->tree->root)
+ tunnel_destroy (t);
+}
+
+
/**
* tunnel_destroy_iterator: iterator for deleting each tunnel that belongs to a
* client when the client disconnects.
static int
tunnel_destroy_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
+ struct MeshTunnel *t = value;
int r;
- r = tunnel_destroy ((struct MeshTunnel *) value);
+ if (NULL != t->dht_get_type)
+ {
+ GNUNET_DHT_get_stop (t->dht_get_type);
+ }
+ r = tunnel_destroy (t);
return r;
}
+/**
+ * Timeout function, destroys tunnel if called
+ *
+ * @param cls Closure (tunnel to destroy).
+ * @param tc TaskContext
+ */
+static void
+tunnel_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct MeshTunnel *t = cls;
+
+ if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
+ return;
+ t->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ tunnel_destroy (t);
+}
+
+/**
+ * Resets the tunnel timeout. Starts it if no timeout was running.
+ *
+ * @param t Tunnel whose timeout to reset.
+ */
+static void
+tunnel_reset_timeout (struct MeshTunnel *t)
+{
+ if (GNUNET_SCHEDULER_NO_TASK != t->timeout_task)
+ GNUNET_SCHEDULER_cancel (t->timeout_task);
+ t->timeout_task = GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_multiply(REFRESH_PATH_TIME, 4),
+ &tunnel_timeout,
+ t);
+}
+
+
/******************************************************************************/
/**************** MESH NETWORK HANDLER HELPERS ***********************/
/******************************************************************************/
-
/**
* Function called to notify a client about the socket
* being ready to queue more data. "buf" will be
size_t size_needed;
int i;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: CREATE PATH sending...\n");
size_needed =
sizeof (struct GNUNET_MESH_ManipulatePath) +
p->length * sizeof (struct GNUNET_PeerIdentity);
if (size < size_needed || NULL == buf)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Retransmitting create path\n");
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- path_get_first_hop (t->tree, peer->id),
- size_needed, &send_core_create_path,
- info);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: create path retransmit!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: buf: %p\n", buf);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: size: (%u/%u)\n",
+ size, size_needed);
+ info->peer->core_transmit[info->pos] =
+ GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ path_get_first_hop (t->tree, peer->id),
+ size_needed,
+ &send_core_create_path,
+ info);
return 0;
}
+ info->peer->core_transmit[info->pos] = NULL;
+#if MESH_DEBUG
+ {
+ struct GNUNET_PeerIdentity id;
+ GNUNET_PEER_resolve (peer->id, &id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: setting core_transmit %s [%u] to NULL\n",
+ GNUNET_i2s (&id),
+ info->pos);
+ }
+#endif
msg = (struct GNUNET_MESH_ManipulatePath *) buf;
msg->header.size = htons (size_needed);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE);
path_destroy (p);
GNUNET_free (info);
-
- return size_needed;
-}
-
-
-#if LATER
-/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure (MeshDataDescriptor with all info to build packet)
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-send_core_data_to_origin (void *cls, size_t size, void *buf)
-{
- struct MeshDataDescriptor *info = cls;
- struct GNUNET_MESH_ToOrigin *msg = buf;
- size_t total_size;
-
- GNUNET_assert (NULL != info);
- total_size = sizeof (struct GNUNET_MESH_ToOrigin) + info->size;
- GNUNET_assert (total_size < 65536); /* UNIT16_MAX */
-
- if (total_size > size)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "not enough buffer to send data to origin\n");
- return 0;
- }
- msg->header.size = htons (total_size);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_DATA_MESSAGE_TO_ORIGIN);
- GNUNET_PEER_resolve (info->origin->oid, &msg->oid);
- msg->tid = htonl (info->origin->tid);
- if (0 != info->size)
- {
- memcpy (&msg[1], &info[1], info->size);
- }
- if (NULL != info->client)
- {
- GNUNET_SERVER_receive_done (info->client, GNUNET_OK);
- }
- GNUNET_free (info);
- return total_size;
-}
-#endif
-
-/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure (data itself)
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-send_core_data_unicast (void *cls, size_t size, void *buf)
-{
- struct MeshDataDescriptor *info = cls;
- struct GNUNET_MESH_Unicast *msg = buf;
- size_t total_size;
-
- GNUNET_assert (NULL != info);
- total_size = sizeof (struct GNUNET_MESH_Unicast) + info->size;
- GNUNET_assert (total_size < 65536); /* UNIT16_MAX */
-
- if (total_size > size)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "not enough buffer to send data to peer\n");
- return 0;
- }
- msg->header.size = htons (total_size);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_UNICAST);
- GNUNET_PEER_resolve (info->origin->oid, &msg->oid);
- GNUNET_PEER_resolve (info->destination, &msg->destination);
- msg->tid = htonl (info->origin->tid);
- if (0 != info->size)
- {
- memcpy (&msg[1], &info[1], info->size);
- }
- if (NULL != info->client)
- {
- GNUNET_SERVER_receive_done (info->client, GNUNET_OK);
- }
- GNUNET_free (info);
- return total_size;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: CREATE PATH (%u bytes long) sent!\n",
+ size_needed);
+ return size_needed;
}
* @param cls closure (data itself)
* @param size number of bytes available in buf
* @param buf where the callee should write the message
+ *
* @return number of bytes written to buf
*/
static size_t
send_core_data_multicast (void *cls, size_t size, void *buf)
{
struct MeshDataDescriptor *info = cls;
- struct GNUNET_MESH_Multicast *msg = buf;
size_t total_size;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Multicast callback.\n");
GNUNET_assert (NULL != info);
- total_size = info->size + sizeof (struct GNUNET_MESH_Multicast);
+ GNUNET_assert (NULL != info->peer);
+ total_size = info->size;
GNUNET_assert (total_size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- if (info->peer)
- {
- info->peer->core_transmit[info->handler_n] = NULL;
- }
if (total_size > size)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "not enough buffer to send data futher\n");
+ /* Retry */
+ struct GNUNET_PeerIdentity id;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Multicast: retransmitting... (%u/%u)\n",
+ size, total_size);
+ GNUNET_PEER_resolve(info->peer->id, &id);
+ info->peer->core_transmit[info->handler_n] =
+ GNUNET_CORE_notify_transmit_ready (core_handle,
+ 0,
+ 0,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &id,
+ total_size,
+ &send_core_data_multicast,
+ info);
return 0;
}
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST);
- msg->header.size = htons (total_size);
- GNUNET_PEER_resolve (info->origin->oid, &msg->oid);
- msg->tid = htonl (info->origin->tid);
- memcpy (&msg[1], &info[1], total_size);
- if (0 == --info->copies)
+ info->peer->core_transmit[info->handler_n] = NULL;
+ info->peer->infos[info->handler_n] = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: copying data...\n");
+ memcpy (buf, info->data, total_size);
+#if MESH_DEBUG
{
- if (NULL != info->client)
+ struct GNUNET_MESH_Multicast *mc;
+ struct GNUNET_MessageHeader *mh;
+
+ mh = buf;
+ if (ntohs (mh->type) == GNUNET_MESSAGE_TYPE_MESH_MULTICAST)
+ {
+ mc = (struct GNUNET_MESH_Multicast *) mh;
+ mh = (struct GNUNET_MessageHeader *) &mc[1];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: multicast, payload type %u\n",
+ ntohs (mh->type));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: multicast, payload size %u\n",
+ ntohs (mh->size));
+ }
+ else
{
- GNUNET_SERVER_receive_done (info->client, GNUNET_OK);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: type %u\n",
+ ntohs (mh->type));
}
- GNUNET_free (info);
}
+#endif
+ data_descriptor_decrement_multicast (info);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: freeing info...\n");
+ GNUNET_free (info);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: return %u\n", total_size);
return total_size;
}
GNUNET_free (info);
/* TODO add signature */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: PATH ACK sent!\n");
return sizeof (struct GNUNET_MESH_PathACK);
}
-/**
- * Function called to notify a client about the socket
- * being ready to queue more data. "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure (data itself)
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-send_core_data_raw (void *cls, size_t size, void *buf)
-{
- struct GNUNET_MessageHeader *msg = cls;
- size_t total_size;
-
- GNUNET_assert (NULL != msg);
- total_size = ntohs (msg->size);
-
- if (total_size > size)
- {
- GNUNET_break (0);
- return 0;
- }
- memcpy (buf, msg, total_size);
- GNUNET_free (cls);
- return total_size;
-}
-
-
-#if LATER
-/**
- * Send another peer a notification to destroy a tunnel
- * @param cls The tunnel to destroy
- * @param size Size in the buffer
- * @param buf Memory where to put the data to transmit
- * @return Size of data put in buffer
- */
-static size_t
-send_p2p_tunnel_destroy (void *cls, size_t size, void *buf)
-{
- struct MeshTunnel *t = cls;
- struct MeshClient *c;
- struct GNUNET_MESH_TunnelMessage *msg;
-
- c = t->client;
- msg = buf;
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY);
- /*FIXME*/ msg->header.size =
- htons (sizeof (struct GNUNET_MESH_TunnelMessage));
- msg->tunnel_id = htonl (t->id.tid);
-
- tunnel_destroy (c, t);
- return sizeof (struct GNUNET_MESH_TunnelMessage);
-}
-#endif
-
-
-/**
- * Send the message to all clients that have subscribed to its type
- *
- * @param msg Pointer to the message itself
- * @return number of clients this message was sent to
- */
-static unsigned int
-send_subscribed_clients (struct GNUNET_MessageHeader *msg)
-{
- struct MeshClient *c;
- unsigned int count;
- uint16_t type;
-
- type = ntohs (msg->type);
- for (count = 0, c = clients; c != NULL; c = c->next)
- {
- if (client_is_subscribed (type, c))
- {
- count++;
- GNUNET_SERVER_notification_context_unicast (nc, c->handle, msg,
- GNUNET_YES);
- }
- }
- return count;
-}
-
-
-
-/**
- * Notify the client that owns the tunnel that a peer has connected to it
- *
- * @param t Tunnel whose owner to notify
- * @param id Short id of the peer that has connected
- */
-static void
-send_client_peer_connected (const struct MeshTunnel *t, const GNUNET_PEER_Id id)
-{
- struct GNUNET_MESH_PeerControl pc;
-
- 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);
- GNUNET_PEER_resolve (id, &pc.peer);
- GNUNET_SERVER_notification_context_unicast (nc, t->client->handle,
- &pc.header, GNUNET_NO);
-}
-
-
/******************************************************************************/
/******************** MESH NETWORK HANDLERS **************************/
/******************************************************************************/
/**
* Core handler for path creation
- * struct GNUNET_CORE_MessageHandler
*
* @param cls closure
* @param message message
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
+ *
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
- *
*/
static int
handle_mesh_path_create (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
unsigned int own_pos;
uint16_t size;
MESH_TunnelNumber tid;
struct GNUNET_MESH_ManipulatePath *msg;
struct GNUNET_PeerIdentity *pi;
- struct GNUNET_PeerIdentity id;
GNUNET_HashCode hash;
struct MeshPeerPath *path;
struct MeshPeerInfo *dest_peer_info;
struct MeshTunnel *t;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: Received a MESH path create msg\n");
+ "MESH: Received a path create msg [%s]\n",
+ GNUNET_i2s(&my_full_id));
size = ntohs (message->size);
if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: path has %u hops.\n",
+ size);
msg = (struct GNUNET_MESH_ManipulatePath *) message;
tid = ntohl (msg->tid);
pi = (struct GNUNET_PeerIdentity *) &msg[1];
t = tunnel_get (pi, tid);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: path is for tunnel %s [%X].\n",
+ GNUNET_i2s(pi),
+ tid);
if (NULL == t)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Creating tunnel\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Creating tunnel\n");
t = GNUNET_malloc (sizeof (struct MeshTunnel));
t->id.oid = GNUNET_PEER_intern (pi);
t->id.tid = tid;
- t->peers = GNUNET_CONTAINER_multihashmap_create (32);
+ t->local_tid = next_local_tid++;
+ /* FIXME test if taken */
+ next_local_tid |= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
+ t->tree = tree_new(t, t->id.oid);
GNUNET_CRYPTO_hash (&t->id, sizeof (struct MESH_TunnelID), &hash);
if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_put (tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ GNUNET_CONTAINER_multihashmap_put (
+ tunnels,
+ &hash,
+ t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
{
+ tunnel_destroy (t);
+ GNUNET_break (0);
+ return GNUNET_OK;
+ }
+ tunnel_reset_timeout (t);
+ GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multihashmap_put (
+ incoming_tunnels,
+ &hash,
+ t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
+ {
+ tunnel_destroy (t);
GNUNET_break (0);
return GNUNET_OK;
}
-
}
dest_peer_info =
GNUNET_CONTAINER_multihashmap_get (peers, &pi[size - 1].hashPubKey);
if (NULL == dest_peer_info)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Creating PeerInfo for destination.\n");
dest_peer_info = GNUNET_malloc (sizeof (struct MeshPeerInfo));
dest_peer_info->id = GNUNET_PEER_intern (&pi[size - 1]);
GNUNET_CONTAINER_multihashmap_put (peers, &pi[size - 1].hashPubKey,
orig_peer_info = GNUNET_CONTAINER_multihashmap_get (peers, &pi->hashPubKey);
if (NULL == orig_peer_info)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Creating PeerInfo for origin.\n");
orig_peer_info = GNUNET_malloc (sizeof (struct MeshPeerInfo));
orig_peer_info->id = GNUNET_PEER_intern (pi);
GNUNET_CONTAINER_multihashmap_put (peers, &pi->hashPubKey, orig_peer_info,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Creating path...\n");
path = path_new (size);
own_pos = 0;
for (i = 0; i < size; i++)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: ... adding %s\n",
+ GNUNET_i2s(&pi[i]));
path->peers[i] = GNUNET_PEER_intern (&pi[i]);
if (path->peers[i] == myid)
own_pos = i;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Own position: %u\n", own_pos);
if (own_pos == 0)
- { /* cannot be self, must be 'not found' */
+ {
+ /* cannot be self, must be 'not found' */
/* create path: self not found in path through self */
GNUNET_break_op (0);
path_destroy (path);
/* FIXME error. destroy tunnel? leave for timeout? */
return 0;
}
+ tunnel_add_path (t, path, own_pos);
if (own_pos == size - 1)
{
/* It is for us! Send ack. */
+ struct GNUNET_MESH_TunnelNotification cmsg;
struct MeshDataDescriptor *info;
unsigned int j;
- path_add_to_origin (orig_peer_info, path); /* inverts path! */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: It's for us!\n");
+ path_add_to_origin (orig_peer_info, path);
+ if (NULL == t->peers)
+ t->peers = GNUNET_CONTAINER_multihashmap_create(4);
+ GNUNET_break (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (
+ t->peers,
+ &my_full_id.hashPubKey,
+ peer_info_get(&my_full_id),
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
info->origin = &t->id;
- info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &id.hashPubKey);
- GNUNET_assert (info->peer);
- for (j = 0; info->peer->core_transmit[j]; j++)
- {
- if (j == 9)
- {
- GNUNET_break (0);
- return GNUNET_OK;
- }
- }
+ info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
+ GNUNET_assert (NULL != info->peer);
+ j = peer_info_transmit_slot(info->peer);
info->handler_n = j;
+ info->peer->types[j] = GNUNET_MESSAGE_TYPE_MESH_PATH_ACK;
+ info->peer->infos[j] = info;
info->peer->core_transmit[j] =
GNUNET_CORE_notify_transmit_ready (core_handle, 0, 100,
GNUNET_TIME_UNIT_FOREVER_REL, peer,
- sizeof (struct GNUNET_MessageHeader),
+ sizeof (struct GNUNET_MESH_PathACK),
&send_core_path_ack, info);
+ cmsg.header.size = htons(sizeof(cmsg));
+ cmsg.header.type = htons(GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE);
+ GNUNET_PEER_resolve(t->id.oid, &cmsg.peer);
+ cmsg.tunnel_id = htonl(t->local_tid);
+ GNUNET_SERVER_notification_context_broadcast(nc, &cmsg.header, GNUNET_NO);
}
else
{
+ struct MeshPeerPath *path2;
+
/* It's for somebody else! Retransmit. */
- struct MeshPathInfo *path_info;
+ path2 = path_duplicate(path);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Retransmitting.\n");
+ path_add_to_peer(dest_peer_info, path);
+ path = path_duplicate(path2);
+ path_add_to_origin(orig_peer_info, path2);
+ send_create_path(dest_peer_info, path, t);
+ }
+ return GNUNET_OK;
+}
- path_info = GNUNET_malloc (sizeof (struct MeshPathInfo));
- path_info->t = t;
- path_info->path = path;
- path_info->peer = dest_peer_info;
- path_add_to_peer (dest_peer_info, path);
- GNUNET_PEER_resolve (path->peers[own_pos + 1], &id);
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, &id,
- sizeof (struct GNUNET_MessageHeader),
- &send_core_create_path, path_info);
+/**
+ * Core handler for path destruction
+ *
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
+ *
+ * @return GNUNET_OK to keep the connection open,
+ * GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_mesh_path_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
+{
+ struct GNUNET_MESH_ManipulatePath *msg;
+ struct GNUNET_PeerIdentity *pi;
+ struct MeshPeerPath *path;
+ struct MeshTunnel *t;
+ unsigned int own_pos;
+ unsigned int i;
+ size_t size;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Received a PATH DESTROY msg from %s\n",
+ GNUNET_i2s(peer));
+ size = ntohs (message->size);
+ if (size < sizeof (struct GNUNET_MESH_ManipulatePath))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+
+ size -= sizeof (struct GNUNET_MESH_ManipulatePath);
+ if (size % sizeof (struct GNUNET_PeerIdentity))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ size /= sizeof (struct GNUNET_PeerIdentity);
+ if (size < 2)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: path has %u hops.\n",
+ size);
+
+ msg = (struct GNUNET_MESH_ManipulatePath *) message;
+ pi = (struct GNUNET_PeerIdentity *) &msg[1];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: path is for tunnel %s [%X].\n",
+ GNUNET_i2s(pi),
+ msg->tid);
+ t = tunnel_get (pi, ntohl (msg->tid));
+ if (NULL == t)
+ {
+ /* TODO notify back: we don't know this tunnel */
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Creating path...\n");
+ path = path_new (size);
+ own_pos = 0;
+ for (i = 0; i < size; i++)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: ... adding %s\n",
+ GNUNET_i2s(&pi[i]));
+ path->peers[i] = GNUNET_PEER_intern (&pi[i]);
+ if (path->peers[i] == myid)
+ own_pos = i;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Own position: %u\n", own_pos);
+ if (own_pos < path->length - 1)
+ send_message (message, &pi[own_pos + 1]);
+ tunnel_delete_peer (t, path->peers[path->length - 1]);
+ path_destroy (path);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Core handler for notifications of broken paths
+ *
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
+ *
+ * @return GNUNET_OK to keep the connection open,
+ * GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_mesh_path_broken (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
+{
+ struct GNUNET_MESH_PathBroken *msg;
+ struct MeshTunnel *t;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Received a PATH BROKEN msg from %s\n",
+ GNUNET_i2s(peer));
+ msg = (struct GNUNET_MESH_PathBroken *) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: regarding %s\n",
+ GNUNET_i2s(&msg->peer1));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: regarding %s\n",
+ GNUNET_i2s(&msg->peer2));
+ t = tunnel_get(&msg->oid, ntohl (msg->tid));
+ if (NULL == t)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ tunnel_notify_connection_broken(t,
+ GNUNET_PEER_search(&msg->peer1),
+ GNUNET_PEER_search(&msg->peer2));
+ return GNUNET_OK;
+
+}
+
+
+/**
+ * Core handler for tunnel destruction
+ *
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
+ *
+ * @return GNUNET_OK to keep the connection open,
+ * GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_mesh_tunnel_destroy (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
+{
+ struct GNUNET_MESH_TunnelDestroy *msg;
+ struct MeshTunnel *t;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got a TUNNEL DESTROY packet from %s\n",
+ GNUNET_i2s (peer));
+ msg = (struct GNUNET_MESH_TunnelDestroy *) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: for tunnel %s [%u]\n",
+ GNUNET_i2s (&msg->oid),
+ ntohl (msg->tid));
+ t = tunnel_get (&msg->oid, ntohl (msg->tid));
+ if (NULL == t)
+ {
+ /* Probably already got the message from another path,
+ * destroyed the tunnel and retransmitted to children.
+ * Safe to ignore.
+ */
+ return GNUNET_OK;
+ }
+ if (t->id.oid == myid)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+ if (t->local_tid >= GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ {
+ /* Tunnel was incoming, notify clients */
+ send_clients_tunnel_destroy (t);
}
+ tunnel_send_destroy (t);
+ tunnel_destroy (t);
return GNUNET_OK;
}
* @param peer peer identity this notification is about
* @param message message
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
handle_mesh_data_unicast (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_Unicast *msg;
struct MeshTunnel *t;
- struct MeshPeerInfo *pi;
+ GNUNET_PEER_Id pid;
size_t size;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: got a unicast packet from %s\n",
+ GNUNET_i2s (peer));
size = ntohs (message->size);
if (size <
sizeof (struct GNUNET_MESH_Unicast) +
return GNUNET_OK;
}
msg = (struct GNUNET_MESH_Unicast *) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: of type %u\n",
+ ntohs (msg[1].header.type));
t = tunnel_get (&msg->oid, ntohl (msg->tid));
if (NULL == t)
{
/* TODO notify back: we don't know this tunnel */
+ GNUNET_break_op (0);
return GNUNET_OK;
}
- pi = GNUNET_CONTAINER_multihashmap_get (t->peers,
- &msg->destination.hashPubKey);
- if (NULL == pi)
- {
- /* TODO maybe feedback, log to statistics */
- return GNUNET_OK;
- }
- if (pi->id == myid)
+ tunnel_reset_timeout (t);
+ pid = GNUNET_PEER_search(&msg->destination);
+ if (pid == myid)
{
- send_subscribed_clients ((struct GNUNET_MessageHeader *) &msg[1]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: it's for us! sending to clients...\n");
+ send_subscribed_clients (message, (struct GNUNET_MessageHeader *) &msg[1]);
return GNUNET_OK;
}
- msg = GNUNET_malloc (size);
- memcpy (msg, message, size);
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- path_get_first_hop (t->tree, pi->id),
- size,
- &send_core_data_raw, msg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: not for us, retransmitting...\n");
+ send_message (message, path_get_first_hop(t->tree, pid));
return GNUNET_OK;
}
* @param message message
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
+ *
+ * TODO: Check who we got this from, to validate route.
*/
static int
handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_Multicast *msg;
- struct GNUNET_PeerIdentity id;
- struct MeshDataDescriptor *info;
- struct MeshPathInfo neighbors;
struct MeshTunnel *t;
size_t size;
- uint16_t i;
- uint16_t j;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: got a multicast packet from %s\n",
+ GNUNET_i2s (peer));
size = ntohs (message->size);
- if (size <
- sizeof (struct GNUNET_MESH_Multicast) +
- sizeof (struct GNUNET_MessageHeader))
+ if (sizeof (struct GNUNET_MESH_Multicast) +
+ sizeof (struct GNUNET_MessageHeader) > size)
{
GNUNET_break_op (0);
return GNUNET_OK;
if (NULL == t)
{
/* TODO notify that we dont know that tunnel */
+ GNUNET_break_op (0);
return GNUNET_OK;
}
+ tunnel_reset_timeout (t);
/* Transmit to locally interested clients */
- if (GNUNET_CONTAINER_multihashmap_contains (t->peers, &my_full_id.hashPubKey))
- {
- send_subscribed_clients ((struct GNUNET_MessageHeader *) &msg[1]);
- }
-
- /* Retransmit to other peers.
- * Using path here as just a collection of peers, not a path per se.
- */
- neighbors.t = t;
- neighbors.path = path_new (0);
- GNUNET_CONTAINER_multihashmap_iterate (t->peers, &iterate_collect_neighbors,
- &neighbors);
- if (0 == neighbors.path->length)
+ if (NULL != t->peers &&
+ GNUNET_CONTAINER_multihashmap_contains (t->peers, &my_full_id.hashPubKey))
{
- GNUNET_free (neighbors.path);
- return GNUNET_OK;
- }
- size -= sizeof (struct GNUNET_MESH_Multicast);
- info = GNUNET_malloc (sizeof (struct MeshDataDescriptor) + size);
- info->origin = &t->id;
- info->copies = neighbors.path->length;
- for (i = 0; i < info->copies; i++)
- {
- GNUNET_PEER_resolve (neighbors.path->peers[i], &id);
- info->peer = GNUNET_CONTAINER_multihashmap_get (peers, &id.hashPubKey);
- GNUNET_assert (NULL != info->peer);
- for (j = 0; 0 != info->peer->core_transmit[j]; j++)
- {
- if (j == (CORE_QUEUE_SIZE - 1))
- {
- GNUNET_break (0);
- return GNUNET_OK;
- }
- }
- info->handler_n = j;
- info->peer->infos[j] = info;
- info->peer->core_transmit[j] =
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, &id,
- ntohs (msg->header.size),
- &send_core_data_multicast, info);
+ send_subscribed_clients (message, &msg[1].header);
}
- GNUNET_free (neighbors.path->peers);
- GNUNET_free (neighbors.path);
+ tunnel_send_multicast(t, message);
return GNUNET_OK;
}
/**
- * Core handler for mesh network traffic
+ * Core handler for mesh network traffic toward the owner of a tunnel
*
* @param cls closure
* @param message message
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
static int
handle_mesh_data_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_ToOrigin *msg;
struct GNUNET_PeerIdentity id;
struct MeshTunnel *t;
size_t size;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: got a ToOrigin packet from %s\n",
+ GNUNET_i2s (peer));
size = ntohs (message->size);
if (size < sizeof (struct GNUNET_MESH_ToOrigin) + /* Payload must be */
sizeof (struct GNUNET_MessageHeader)) /* at least a header */
return GNUNET_OK;
}
msg = (struct GNUNET_MESH_ToOrigin *) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: of type %u\n",
+ ntohs (msg[1].header.type));
t = tunnel_get (&msg->oid, ntohl (msg->tid));
if (NULL == t)
{
/* TODO notify that we dont know this tunnel (whom)? */
+ GNUNET_break_op (0);
return GNUNET_OK;
}
if (t->id.oid == myid)
{
+ char cbuf[size];
+ struct GNUNET_MESH_ToOrigin *copy;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: it's for us! sending to clients...\n");
if (NULL == t->client)
{
/* got data packet for ownerless tunnel */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: no clients!\n");
GNUNET_break_op (0);
return GNUNET_OK;
}
/* TODO signature verification */
- GNUNET_SERVER_notification_context_unicast (nc, t->client->handle, message,
+ memcpy (cbuf, message, size);
+ copy = (struct GNUNET_MESH_ToOrigin *) cbuf;
+ copy->tid = htonl (t->local_tid);
+ GNUNET_SERVER_notification_context_unicast (nc,
+ t->client->handle,
+ ©->header,
GNUNET_YES);
return GNUNET_OK;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: not for us, retransmitting...\n");
+
peer_info = peer_info_get (&msg->oid);
if (NULL == peer_info)
{
return GNUNET_OK;
}
GNUNET_PEER_resolve (t->tree->me->parent->peer, &id);
- msg = GNUNET_malloc (size);
- memcpy (msg, message, size);
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL, &id, size,
- &send_core_data_raw, msg);
+ send_message (message, &id);
return GNUNET_OK;
}
* @param message message
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
- *
- * FIXME path change state
*/
static int
handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_PathACK *msg;
- struct MeshTunnel *t;
+ struct GNUNET_PeerIdentity id;
+ struct MeshTunnelTreeNode *n;
struct MeshPeerInfo *peer_info;
+ struct MeshTunnel *t;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Received a path ACK msg [%s]\n",
+ GNUNET_i2s(&my_full_id));
msg = (struct GNUNET_MESH_PathACK *) message;
t = tunnel_get (&msg->oid, msg->tid);
if (NULL == t)
/* Message for us? */
if (0 == memcmp (&msg->oid, &my_full_id, sizeof (struct GNUNET_PeerIdentity)))
{
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: It's for us!\n");
if (NULL == t->client)
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return GNUNET_OK;
}
+ if (NULL != t->dht_get_type)
+ {
+ GNUNET_DHT_get_stop (t->dht_get_type);
+ t->dht_get_type = NULL;
+ }
peer_info = peer_info_get (&msg->peer_id);
- if (NULL == peer_info)
+ n = tree_find_peer(t->tree->root, peer_info->id);
+ if (NULL == n)
{
GNUNET_break_op (0);
return GNUNET_OK;
}
- /* FIXME change state of peer */
+ n->status = MESH_PEER_READY;
send_client_peer_connected(t, peer_info->id);
return GNUNET_OK;
}
-
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: not for us, retransmitting...\n");
+ GNUNET_PEER_resolve(t->tree->me->parent->peer, &id);
peer_info = peer_info_get (&msg->oid);
if (NULL == peer_info)
{
GNUNET_break (0);
return GNUNET_OK;
}
- msg = GNUNET_malloc (sizeof (struct GNUNET_MESH_PathACK));
- memcpy (msg, message, sizeof (struct GNUNET_MESH_PathACK));
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- path_get_first_hop (t->tree,
- peer_info->id),
- sizeof (struct GNUNET_MESH_PathACK),
- &send_core_data_raw, msg);
+ send_message (message, &id);
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, 0},
{&handle_mesh_data_unicast, GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
{&handle_mesh_data_multicast, GNUNET_MESSAGE_TYPE_MESH_MULTICAST, 0},
{&handle_mesh_data_to_orig, GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
{&handle_mesh_path_ack, GNUNET_MESSAGE_TYPE_MESH_PATH_ACK,
- sizeof (struct GNUNET_MESH_PathACK)},
+ sizeof (struct GNUNET_MESH_PathACK)},
{NULL, 0, 0}
};
static int
deregister_app (void *cls, const GNUNET_HashCode * key, void *value)
{
- GNUNET_CONTAINER_multihashmap_remove (applications, key, value);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (applications, key, value));
return GNUNET_OK;
}
#endif
+/**
+ * Send keepalive packets for a peer
+ *
+ * @param cls Closure (tunnel for which to send the keepalive).
+ * @param tc Notification context.
+ *
+ * TODO: implement explicit multicast keepalive?
+ */
+static void
+path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct MeshTunnel *t = cls;
+ struct GNUNET_MessageHeader *payload;
+ struct GNUNET_MESH_Multicast *msg;
+ size_t size = sizeof(struct GNUNET_MESH_Multicast) +
+ sizeof(struct GNUNET_MessageHeader);
+ char cbuf[size];
+
+ if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ {
+ return;
+ }
+ t->path_refresh_task = GNUNET_SCHEDULER_NO_TASK;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: sending keepalive for tunnel %d\n",
+ t->id.tid);
+
+ msg = (struct GNUNET_MESH_Multicast *) cbuf;
+ msg->header.size = htons (size);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST);
+ msg->oid = my_full_id;
+ msg->tid = htonl(t->id.tid);
+ payload = (struct GNUNET_MessageHeader *) &msg[1];
+ payload->size = htons (sizeof(struct GNUNET_MessageHeader));
+ payload->type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE);
+ tunnel_send_multicast (t, &msg->header);
+
+ t->path_refresh_task =
+ GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t);
+ return;
+}
+
+
/**
* Function to process paths received for a new peer addition. The recorded
* paths form the initial tunnel, which can be optimized later.
* @param cls closure
* @param exp when will this value expire
* @param key key of the result
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
static void
dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *const *get_path,
- const struct GNUNET_PeerIdentity *const *put_path,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
enum GNUNET_BLOCK_Type type, size_t size, const void *data)
{
struct MeshPathInfo *path_info = cls;
struct GNUNET_PeerIdentity pi;
int i;
- if (NULL == get_path || NULL == put_path)
- {
- if (NULL == path_info->peer->path_head)
- {
- // Find ourselves some alternate initial path to the destination: retry
- GNUNET_DHT_get_stop (path_info->peer->dhtget);
- GNUNET_PEER_resolve (path_info->peer->id, &pi);
- path_info->peer->dhtget = GNUNET_DHT_get_start (dht_handle, /* handle */
- GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
- GNUNET_BLOCK_TYPE_TEST, /* type */
- &pi.hashPubKey, /*key to search */
- 4, /* replication level */
- GNUNET_DHT_RO_RECORD_ROUTE, NULL, /* bloom filter */
- 0, /* mutator */
- NULL, /* xquery */
- 0, /* xquery bits */
- dht_get_id_handler,
- (void *) path_info);
- return;
- }
- }
-
- p = path_build_from_dht (get_path, put_path);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got results from DHT!\n");
+ GNUNET_PEER_resolve (path_info->peer->id, &pi);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: for %s\n",
+ GNUNET_i2s(&pi));
+// GNUNET_DHT_get_stop(path_info->peer->dhtget);
+// path_info->peer->dhtget = NULL;
+
+ p = path_build_from_dht (get_path, get_path_length,
+ put_path, put_path_length);
path_add_to_peer (path_info->peer, p);
for (i = 0; i < path_info->peer->ntunnels; i++)
{
tunnel_add_peer (path_info->peer->tunnels[i], path_info->peer);
+ peer_info_connect(path_info->peer, path_info->t);
}
- GNUNET_free (path_info);
+// GNUNET_free (path_info);
return;
}
* @param cls closure
* @param exp when will this value expire
* @param key key of the result
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
* @param type type of the result
* @param size number of bytes in data
* @param data pointer to the result data
static void
dht_get_type_handler (void *cls, struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *const *get_path,
- const struct GNUNET_PeerIdentity *const *put_path,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
enum GNUNET_BLOCK_Type type, size_t size,
const void *data)
{
const struct GNUNET_PeerIdentity *pi = data;
- struct GNUNET_PeerIdentity id;
struct MeshTunnel *t = cls;
struct MeshPeerInfo *peer_info;
- struct MeshPathInfo *path_info;
struct MeshPeerPath *p;
- int i;
if (size != sizeof (struct GNUNET_PeerIdentity))
{
return;
}
GNUNET_assert (NULL != t->client);
- GNUNET_DHT_get_stop (t->client->dht_get_type);
- t->client->dht_get_type = NULL;
peer_info = peer_info_get (pi);
- GNUNET_CONTAINER_multihashmap_put (t->peers, &pi->hashPubKey, peer_info,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-
- if ((NULL == get_path || NULL == put_path) && NULL == peer_info->path_head &&
- NULL == peer_info->dhtget)
- {
- /* we don't have a route to the peer, let's try a direct lookup */
- peer_info->dhtget = GNUNET_DHT_get_start (dht_handle,
- /* handle */
- GNUNET_TIME_UNIT_FOREVER_REL,
- /* timeout */
- GNUNET_BLOCK_TYPE_TEST,
- /* block type */
- &pi->hashPubKey,
- /* key to look up */
- 10U,
- /* replication level */
- GNUNET_DHT_RO_RECORD_ROUTE,
- /* option to dht: record route */
- NULL, /* bloom filter */
- 0, /* mutator */
- NULL, /* xquery */
- 0, /* xquery bits */
- dht_get_id_handler,
- /* callback */
- peer_info); /* closure */
- }
-
- p = path_build_from_dht (get_path, put_path);
+ (void) GNUNET_CONTAINER_multihashmap_put (
+ t->peers,
+ &pi->hashPubKey,
+ peer_info,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+
+ p = path_build_from_dht (get_path, get_path_length,
+ put_path, put_path_length);
path_add_to_peer (peer_info, p);
tunnel_add_peer(t, peer_info);
- p = tree_get_path_to_peer(t->tree, peer_info->id);
-#if MESH_DEBUG
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: new route for tunnel 0x%x found, has %u hops\n",
- t->local_tid, p->length);
- for (i = 0; i < p->length; i++)
- {
- GNUNET_PEER_resolve (p->peers[0], &id);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:\t%d\t%s\n", i,
- GNUNET_h2s_full (&id.hashPubKey));
- }
-#endif
-
- if (p->length > 1)
- {
- path_info = GNUNET_malloc(sizeof(struct MeshPathInfo));
- path_info->t = t;
- path_info->peer = peer_info;
- path_info->path = p;
- GNUNET_PEER_resolve (p->peers[1], &id);
- GNUNET_CORE_notify_transmit_ready (core_handle,
- /* handle */
- 0,
- /* cork */
- 0,
- /* priority */
- GNUNET_TIME_UNIT_FOREVER_REL,
- /* timeout */
- &id,
- /* target */
- sizeof (struct GNUNET_MESH_ManipulatePath)
- +
- (p->length *
- sizeof (struct GNUNET_PeerIdentity)),
- /*size */
- &send_core_create_path,
- /* callback */
- path_info); /* cls */
- return;
- }
- path_destroy(p);
- send_client_peer_connected(t, myid);
+ peer_info_connect (peer_info, t);
}
+
/******************************************************************************/
/********************* MESH LOCAL HANDLES **************************/
/******************************************************************************/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: client disconnected\n");
if (client == NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n");
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (SERVER DOWN)\n");
+ return;
+ }
c = clients;
while (NULL != c)
{
continue;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: matching client found\n");
+ GNUNET_SERVER_client_drop (c->handle);
if (NULL != c->tunnels)
{
GNUNET_CONTAINER_multihashmap_iterate (c->tunnels,
}
if (NULL != c->types)
GNUNET_CONTAINER_multihashmap_destroy (c->types);
- if (NULL != c->dht_get_type)
- GNUNET_DHT_get_stop (c->dht_get_type);
- GNUNET_CONTAINER_DLL_remove (clients, clients_tail, c);
next = c->next;
+ GNUNET_CONTAINER_DLL_remove (clients, clients_tail, c);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT FREE at %p\n", c);
GNUNET_free (c);
c = next;
}
#if MESH_DEBUG
c->id = next_client_id++;
#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CLIENT NEW %u at %p\n", c->id, c);
c->handle = client;
+ GNUNET_SERVER_client_keep (client);
a = (GNUNET_MESH_ApplicationType *) &cc_msg[1];
if (napps > 0)
{
}
t = GNUNET_malloc (sizeof (struct MeshTunnel));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: CREATED TUNNEL at %p\n", t);
while (NULL != tunnel_get_by_pi (myid, next_tid))
next_tid = (next_tid + 1) & ~GNUNET_MESH_LOCAL_TUNNEL_ID_CLI;
t->id.tid = next_tid++;
t->id.oid = myid;
t->local_tid = ntohl (t_msg->tunnel_id);
+#if MESH_DEBUG
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: CREATED TUNNEL %s [%x] (%x)\n",
+ GNUNET_i2s (&my_full_id),
+ t->id.tid,
+ t->local_tid);
+#endif
t->client = c;
t->peers = GNUNET_CONTAINER_multihashmap_create (32);
GNUNET_CRYPTO_hash (&t->local_tid, sizeof (MESH_TunnelNumber), &hash);
if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_put (c->tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ GNUNET_CONTAINER_multihashmap_put (
+ c->tunnels, &hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
GNUNET_CRYPTO_hash (&t->id, sizeof (struct MESH_TunnelID), &hash);
if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_put (tunnels, &hash, t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ GNUNET_CONTAINER_multihashmap_put (
+ tunnels, &hash, t,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
MESH_TunnelNumber tid;
GNUNET_HashCode hash;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: destroying tunnel\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got a DESTROY TUNNEL from client!\n");
/* Sanity check for client registration */
if (NULL == (c = client_get (client)))
t = GNUNET_CONTAINER_multihashmap_get (c->tunnels, &hash);
GNUNET_CONTAINER_multihashmap_remove (c->tunnels, &hash, t);
- /* Remove from global id hashmap */
- GNUNET_CRYPTO_hash (&t->id, sizeof (struct MESH_TunnelID), &hash);
- GNUNET_CONTAINER_multihashmap_remove (tunnels, &hash, t);
-
-// notify_tunnel_destroy(t); FIXME
+ t->client = NULL;
+ tunnel_send_destroy (t);
tunnel_destroy(t);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_PeerControl *peer_msg;
+ struct MeshPeerInfo *peer_info;
struct MeshClient *c;
struct MeshTunnel *t;
MESH_TunnelNumber tid;
- struct MeshPeerInfo *peer_info;
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Got connection request\n");
/* Sanity check for client registration */
if (NULL == (c = client_get (client)))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n",
+ GNUNET_i2s(&peer_msg->peer));
peer_info = peer_info_get (&peer_msg->peer);
- /* Start DHT search if needed, otherwise just add peer to tunnel. */
- if (NULL == peer_info->dhtget && NULL == peer_info->path_head)
- {
- struct MeshPathInfo *path_info;
+ tunnel_add_peer(t, peer_info);
+ peer_info_connect(peer_info, t);
- path_info = GNUNET_malloc(sizeof(struct MeshPathInfo));
- path_info->peer = peer_info;
- path_info->t = t;
- peer_info->dhtget = GNUNET_DHT_get_start(dht_handle, /* handle */
- GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
- GNUNET_BLOCK_TYPE_TEST, /* type */
- &peer_msg->peer.hashPubKey, /*key to search */
- 4, /* replication level */
- GNUNET_DHT_RO_RECORD_ROUTE,
- NULL, /* bloom filter */
- 0, /* mutator */
- NULL, /* xquery */
- 0, /* xquery bits */
- dht_get_id_handler,
- (void *) path_info);
- }
- if (NULL != peer_info->path_head)
- {
- tunnel_add_peer(t, peer_info);
- }
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_MESH_PeerControl *peer_msg;
+ struct MeshPeerInfo *peer_info;
struct MeshClient *c;
struct MeshTunnel *t;
MESH_TunnelNumber tid;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Got a PEER DEL request\n");
/* Sanity check for client registration */
if (NULL == (c = client_get (client)))
{
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: on tunnel %X\n", t->id.tid);
/* Does client own tunnel? */
if (t->client->handle != client)
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: for peer %s\n",
+ GNUNET_i2s(&peer_msg->peer));
+ /* Is the peer in the tunnel? */
+ peer_info = GNUNET_CONTAINER_multihashmap_get(t->peers,
+ &peer_msg->peer.hashPubKey);
+ if (NULL == peer_info)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
/* Ok, delete peer from tunnel */
GNUNET_CONTAINER_multihashmap_remove_all (t->peers,
&peer_msg->peer.hashPubKey);
+ send_destroy_path (t, peer_info->id);
+ tunnel_delete_peer(t, peer_info->id);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
struct MeshClient *c;
struct MeshTunnel *t;
GNUNET_HashCode hash;
- GNUNET_MESH_ApplicationType type;
MESH_TunnelNumber tid;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: got connect by type request\n");
}
/* Do WE have the service? */
- type = ntohl (connect_msg->type);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type requested: %u\n", type);
- GNUNET_CRYPTO_hash (&type, sizeof (GNUNET_MESH_ApplicationType), &hash);
+ t->type = ntohl (connect_msg->type);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type requested: %u\n", t->type);
+ GNUNET_CRYPTO_hash (&t->type, sizeof (GNUNET_MESH_ApplicationType), &hash);
if (GNUNET_CONTAINER_multihashmap_contains (applications, &hash) ==
GNUNET_YES)
{
return;
}
/* Ok, lets find a peer offering the service */
- if (c->dht_get_type)
+ if (NULL != t->dht_get_type)
{
- GNUNET_DHT_get_stop (c->dht_get_type);
+ GNUNET_DHT_get_stop (t->dht_get_type);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: looking in DHT for %s\n",
- GNUNET_h2s_full (&hash));
- c->dht_get_type =
- GNUNET_DHT_get_start (dht_handle, GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BLOCK_TYPE_TEST, &hash, 10U,
- GNUNET_DHT_RO_RECORD_ROUTE, NULL, 0, NULL, 0,
+ GNUNET_h2s (&hash));
+ t->dht_get_type =
+ GNUNET_DHT_get_start (dht_handle,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_BLOCK_TYPE_TEST,
+ &hash,
+ 10U,
+ GNUNET_DHT_RO_RECORD_ROUTE |
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ NULL, 0,
&dht_get_type_handler, t);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
struct MeshTunnel *t;
struct MeshPeerInfo *pi;
struct GNUNET_MESH_Unicast *data_msg;
- struct MeshDataDescriptor *info;
MESH_TunnelNumber tid;
- size_t data_size;
+ size_t size;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got a unicast request from a client!\n");
/* Sanity check for client registration */
if (NULL == (c = client_get (client)))
}
data_msg = (struct GNUNET_MESH_Unicast *) message;
/* Sanity check for message size */
+ size = ntohs (message->size);
if (sizeof (struct GNUNET_MESH_Unicast) +
- sizeof (struct GNUNET_MessageHeader) > ntohs (data_msg->header.size))
+ sizeof (struct GNUNET_MessageHeader) > size)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
}
/* Is it a local tunnel? Then, does client own the tunnel? */
- if (t->client->handle != NULL && t->client->handle != client)
+ if (NULL != t->client &&
+ NULL != t->client->handle &&
+ t->client->handle != client)
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- if (pi->id == myid)
+
+ /* Ok, everything is correct, send the message
+ * (pretend we got it from a mesh peer)
+ */
{
- struct GNUNET_MESH_Unicast copy;
+ char buf[ntohs (message->size)];
+ struct GNUNET_MESH_Unicast *copy;
/* Work around const limitation */
- memcpy (©, data_msg, sizeof (struct GNUNET_MESH_Unicast));
- copy.oid = my_full_id;
- copy.tid = htonl (t->id.tid);
- handle_mesh_data_unicast (NULL, &my_full_id, ©.header, NULL);
+ copy = (struct GNUNET_MESH_Unicast *) buf;
+ memcpy (buf, data_msg, size);
+ copy->oid = my_full_id;
+ copy->tid = htonl (t->id.tid);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: calling generic handler...\n");
+ handle_mesh_data_unicast (NULL, &my_full_id, ©->header, NULL, 0);
+ }
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+}
+
+
+/**
+ * Handler for client traffic directed to the origin
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_local_to_origin (void *cls, struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct GNUNET_MESH_ToOrigin *data_msg;
+ struct GNUNET_PeerIdentity id;
+ struct MeshClient *c;
+ struct MeshTunnel *t;
+ MESH_TunnelNumber tid;
+ size_t size;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got a ToOrigin request from a client!\n");
+
+ /* Sanity check for client registration */
+ if (NULL == (c = client_get (client)))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ data_msg = (struct GNUNET_MESH_ToOrigin *) message;
+ /* Sanity check for message size */
+ size = ntohs (message->size);
+ if (sizeof (struct GNUNET_MESH_ToOrigin) +
+ sizeof (struct GNUNET_MessageHeader) > size)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ /* Tunnel exists? */
+ tid = ntohl (data_msg->tid);
+ if (tid < GNUNET_MESH_LOCAL_TUNNEL_ID_SERV)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ t = tunnel_get_by_local_id (c, tid);
+ if (NULL == t)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- data_size = ntohs (message->size) - sizeof (struct GNUNET_MESH_Unicast);
- info = GNUNET_malloc (sizeof (struct MeshDataDescriptor) + data_size);
- memcpy (&info[1], &data_msg[1], data_size);
- info->destination = pi->id;
- info->origin = &t->id;
- info->size = data_size;
- info->client = client;
- GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
- GNUNET_TIME_UNIT_FOREVER_REL,
- path_get_first_hop (t->tree, pi->id),
- /* FIXME re-check types */
- data_size +
- sizeof (struct GNUNET_MESH_Unicast),
- &send_core_data_unicast, info);
+
+ /* It shouldn't be a local tunnel. */
+ if (NULL != t->client)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_PEER_resolve(t->id.oid, &id);
+
+ /* Ok, everything is correct, send the message
+ * (pretend we got it from a mesh peer)
+ */
+ {
+ char buf[ntohs (message->size)];
+ struct GNUNET_MESH_ToOrigin *copy;
+
+ /* Work around const limitation */
+ copy = (struct GNUNET_MESH_ToOrigin *) buf;
+ memcpy (buf, data_msg, size);
+ copy->oid = id;
+ copy->tid = htonl (t->id.tid);
+ copy->sender = my_full_id;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: calling generic handler...\n");
+ handle_mesh_data_to_orig (NULL, &my_full_id, ©->header, NULL, 0);
+ }
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
+
/**
* Handler for client traffic directed to all peers in a tunnel
*
struct GNUNET_MESH_Multicast *data_msg;
MESH_TunnelNumber tid;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: Got a multicast request from a client!\n");
+
/* Sanity check for client registration */
if (NULL == (c = client_get (client)))
{
}
data_msg = (struct GNUNET_MESH_Multicast *) message;
/* Sanity check for message size */
- if (sizeof (struct GNUNET_MESH_PeerControl) != ntohs (data_msg->header.size))
+ if (sizeof (struct GNUNET_MESH_Multicast) +
+ sizeof (struct GNUNET_MessageHeader) > ntohs (data_msg->header.size))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- /* TODO */
+ {
+ char buf[ntohs(message->size)];
+ struct GNUNET_MESH_Multicast *copy;
+
+ copy = (struct GNUNET_MESH_Multicast *)buf;
+ memcpy(buf, message, ntohs(message->size));
+ copy->oid = my_full_id;
+ copy->tid = htonl(t->id.tid);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "MESH: calling generic handler...\n");
+ handle_mesh_data_multicast(client, &my_full_id, ©->header, NULL, 0);
+ }
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ /* receive done gets called when last copy is sent to a neighbor */
return;
}
* Functions to handle messages from clients
*/
static struct GNUNET_SERVER_MessageHandler client_handlers[] = {
- {&handle_local_new_client, NULL, GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT, 0},
+ {&handle_local_new_client, NULL,
+ GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT, 0},
{&handle_local_tunnel_create, NULL,
GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE,
sizeof (struct GNUNET_MESH_TunnelMessage)},
sizeof (struct GNUNET_MESH_ConnectPeerByType)},
{&handle_local_unicast, NULL,
GNUNET_MESSAGE_TYPE_MESH_UNICAST, 0},
- {&handle_local_unicast, NULL,
+ {&handle_local_to_origin, NULL,
GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN, 0},
{&handle_local_multicast, NULL,
GNUNET_MESSAGE_TYPE_MESH_MULTICAST, 0},
* @param cls service closure
* @param server handle to the server for this service
* @param identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Core init\n");
core_handle = server;
* @param cls closure
* @param peer peer identity this notification is about
* @param atsi performance data for the connection
+ * @param atsi_count number of records in 'atsi'
*/
static void
core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
-// GNUNET_PEER_Id pid;
struct MeshPeerInfo *peer_info;
struct MeshPeerPath *path;
+#if MESH_DEBUG_CONNECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n",
+ GNUNET_i2s(&my_full_id));
+#endif
peer_info = peer_info_get (peer);
if (myid == peer_info->id)
{
+#if MESH_DEBUG_CONNECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (self)\n");
+#endif
return;
}
+#if MESH_DEBUG_CONNECTION
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n",
+ GNUNET_i2s(peer));
+ }
+#endif
path = path_new (2);
path->peers[0] = myid;
path->peers[1] = peer_info->id;
+ GNUNET_PEER_change_rc(myid, 1);
+ GNUNET_PEER_change_rc(peer_info->id, 1);
path_add_to_peer (peer_info, path);
return;
}
struct MeshPeerInfo *pi;
unsigned int i;
+#if MESH_DEBUG_CONNECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer disconnected\n");
+#endif
pi = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
- if (!pi)
+ if (NULL == pi)
{
GNUNET_break (0);
return;
}
for (i = 0; i < CORE_QUEUE_SIZE; i++)
{
- if (pi->core_transmit[i])
- {
- GNUNET_CORE_notify_transmit_ready_cancel (pi->core_transmit[i]);
- /* TODO: notify that tranmission has failed */
- GNUNET_free (pi->infos[i]);
- }
+ /* TODO: notify that the transmission failed */
+ peer_info_cancel_transmission(pi, i);
}
path_remove_from_peer (pi, pi->id, myid);
+#if MESH_DEBUG_CONNECTION
if (myid == pi->id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (self)\n");
}
+#endif
return;
}
/************************ MAIN FUNCTIONS ****************************/
/******************************************************************************/
+/**
+ * Iterator over tunnel hash map entries to destroy the tunnel during shutdown.
+ *
+ * @param cls closure
+ * @param key current key code
+ * @param value value in the hash map
+ * @return GNUNET_YES if we should continue to iterate,
+ * GNUNET_NO if not.
+ */
+static int
+shutdown_tunnel (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct MeshTunnel *t = value;
+ tunnel_destroy(t);
+ return GNUNET_YES;
+}
+
+/**
+ * Iterator over peer hash map entries to destroy the tunnel during shutdown.
+ *
+ * @param cls closure
+ * @param key current key code
+ * @param value value in the hash map
+ * @return GNUNET_YES if we should continue to iterate,
+ * GNUNET_NO if not.
+ */
+static int
+shutdown_peer (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct MeshPeerInfo *p = value;
+ peer_info_destroy (p);
+ return GNUNET_YES;
+}
+
/**
* Task run during shutdown.
*
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct MeshClient *c;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: shutting down\n");
+ /* TODO: destroy tunnels? */
if (core_handle != NULL)
{
GNUNET_CORE_disconnect (core_handle);
core_handle = NULL;
}
+ GNUNET_CONTAINER_multihashmap_iterate(tunnels, &shutdown_tunnel, NULL);
+ GNUNET_CONTAINER_multihashmap_iterate(peers, &shutdown_peer, NULL);
if (dht_handle != NULL)
{
- for (c = clients; NULL != c; c = c->next)
- if (NULL != c->dht_get_type)
- GNUNET_DHT_get_stop (c->dht_get_type);
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
}
&core_init, /* Call core_init once connected */
&core_connect, /* Handle connects */
&core_disconnect, /* remove peers on disconnects */
- NULL, /* Do we care about "status" updates? */
NULL, /* Don't notify about all incoming messages */
GNUNET_NO, /* For header only in notification */
NULL, /* Don't notify about all outbound messages */
dht_handle = GNUNET_DHT_connect (c, 64);
if (dht_handle == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error connecting to DHT.\
- Running without DHT has a severe\
- impact in MESH capabilities.\n\
- Plase check your configuretion and enable DHT.\n");
GNUNET_break (0);
}
next_tid = 0;
+ next_local_tid = GNUNET_MESH_LOCAL_TUNNEL_ID_SERV;
tunnels = GNUNET_CONTAINER_multihashmap_create (32);
+ incoming_tunnels = GNUNET_CONTAINER_multihashmap_create (32);
peers = GNUNET_CONTAINER_multihashmap_create (32);
applications = GNUNET_CONTAINER_multihashmap_create (32);
types = GNUNET_CONTAINER_multihashmap_create (32);
{
int ret;
-#if MESH_DEBUG
- fprintf (stderr, "main ()\n");
-#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: main()\n");
ret =
(GNUNET_OK ==
GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE, &run,
NULL)) ? 0 : 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: main() END\n");
-#if MESH_DEBUG
- fprintf (stderr, "main () END\n");
-#endif
+
return ret;
}
projects / oweals / gnunet.git / blobdiff