#include "gnunet_core_service.h"
#include "gnunet_statistics_service.h"
-#include "mesh_protocol_enc.h"
+#include "mesh_protocol.h"
#include "gnunet-service-mesh_peer.h"
#include "gnunet-service-mesh_dht.h"
#include "gnunet-service-mesh_connection.h"
-#include "gnunet-service-mesh_local.h"
#include "gnunet-service-mesh_tunnel.h"
#include "mesh_path.h"
*/
int fwd;
- /**
- * Channel this message belongs to, if known.
- */
- struct MeshChannel *ch;
-
/**
* Pointer to info stucture used as cls.
*/
* @param key Current key code (peer id).
* @param value Value in the hash map (connection).
*
- * @return GNUNET_YES if we should continue to iterate,
- * GNUNET_NO if not.
+ * @return #GNUNET_YES to continue to iterate.
*/
static int
notify_broken (void *cls,
struct MeshPeer *peer = cls;
struct MeshConnection *c = value;
- GMC_notify_broken (c, peer, &my_full_id);
+ GMC_notify_broken (c, peer);
return GNUNET_YES;
}
static void
core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct MeshPeer *pi;
+ struct MeshPeer *mp;
struct MeshPeerPath *path;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer connected\n");
LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GNUNET_i2s (&my_full_id));
- pi = GMP_get (peer);
- if (myid == pi->id)
+ mp = GMP_get (peer);
+ if (myid == mp->id)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
path = path_new (1);
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GNUNET_i2s (peer));
path = path_new (2);
- path->peers[1] = pi->id;
- GNUNET_PEER_change_rc (pi->id, 1);
+ path->peers[1] = mp->id;
+ GNUNET_PEER_change_rc (mp->id, 1);
GNUNET_STATISTICS_update (stats, "# peers", 1, GNUNET_NO);
}
path->peers[0] = myid;
GNUNET_PEER_change_rc (myid, 1);
- peer_add_path (pi, path, GNUNET_YES);
+ GMP_add_path (mp, path, GNUNET_YES);
- pi->connections = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_YES);
+ mp->connections = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_YES);
return;
}
static void
core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct MeshPeer *pi;
+ struct MeshPeer *p;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
- pi = GNUNET_CONTAINER_multipeermap_get (peers, peer);
- if (NULL == pi)
+ p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
+ if (NULL == p)
{
GNUNET_break (0);
return;
}
+ if (myid == p->id)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GMP_2s (p));
+
- GNUNET_CONTAINER_multihashmap_iterate (pi->connections, ¬ify_broken, pi);
- GNUNET_CONTAINER_multihashmap_destroy (pi->connections);
- pi->connections = NULL;
- if (NULL != pi->core_transmit)
+ GNUNET_CONTAINER_multihashmap_iterate (p->connections, ¬ify_broken, p);
+ GNUNET_CONTAINER_multihashmap_destroy (p->connections);
+ p->connections = NULL;
+ if (NULL != p->core_transmit)
{
- GNUNET_CORE_notify_transmit_ready_cancel (pi->core_transmit);
- pi->core_transmit = NULL;
+ GNUNET_CORE_notify_transmit_ready_cancel (p->core_transmit);
+ p->core_transmit = NULL;
}
- if (myid == pi->id)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
- }
GNUNET_STATISTICS_update (stats, "# peers", -1, GNUNET_NO);
return;
sizeof (struct GNUNET_MESH_ACK)},
{&GMC_handle_poll, GNUNET_MESSAGE_TYPE_MESH_POLL,
sizeof (struct GNUNET_MESH_Poll)},
- {&GMC_handle_fwd, GNUNET_MESSAGE_TYPE_MESH_FWD, 0},
- {&GMC_handle_bck, GNUNET_MESSAGE_TYPE_MESH_BCK, 0},
+ {&GMC_handle_encrypted, GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED, 0},
+ {&GMC_handle_kx, GNUNET_MESSAGE_TYPE_MESH_KX, 0},
{NULL, 0, 0}
};
/**
- * Returns if peer is used (has a tunnel, is neighbor).
+ * Returns if peer is used (has a tunnel or is neighbor).
*
- * @peer Peer to check.
+ * @param peer Peer to check.
*
- * @return GNUNET_YES if peer is in use.
+ * @return #GNUNET_YES if peer is in use.
*/
static int
peer_is_used (struct MeshPeer *peer)
}
-/**
- * Free a transmission that was already queued with all resources
- * associated to the request.
- *
- * @param queue Queue handler to cancel.
- * @param clear_cls Is it necessary to free associated cls?
- */
-static void
-queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
-{
- struct MeshPeer *peer;
-
- peer = queue->peer;
- GNUNET_assert (NULL != queue->c);
-
- if (GNUNET_YES == clear_cls)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# queue destroy type %s\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
- switch (queue->type)
- {
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
- case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
- LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n");
- /* fall through */
- case GNUNET_MESSAGE_TYPE_MESH_FWD:
- case GNUNET_MESSAGE_TYPE_MESH_BCK:
- case GNUNET_MESSAGE_TYPE_MESH_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_POLL:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# prebuilt message\n");;
- GNUNET_free_non_null (queue->cls);
- break;
-
- default:
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_ERROR, "# type %s unknown!\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
- }
- }
- GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
-
- if (queue->type != GNUNET_MESSAGE_TYPE_MESH_ACK &&
- queue->type != GNUNET_MESSAGE_TYPE_MESH_POLL)
- {
- peer->queue_n--;
- }
-
- if (NULL != queue->callback)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# Calling callback\n");
- queue->callback (queue->callback_cls,
- queue->c, queue->type,
- queue->fwd, queue->size,
- GNUNET_TIME_absolute_get_duration (queue->start_waiting));
- }
-
- GNUNET_free (queue);
-}
-
/**
* Core callback to write a queued packet to core buffer
*
case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
- case GNUNET_MESSAGE_TYPE_MESH_FWD:
- case GNUNET_MESSAGE_TYPE_MESH_BCK:
+ case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
+ case GNUNET_MESSAGE_TYPE_MESH_KX:
case GNUNET_MESSAGE_TYPE_MESH_ACK:
case GNUNET_MESSAGE_TYPE_MESH_POLL:
LOG (GNUNET_ERROR_TYPE_DEBUG,
}
/* Free queue, but cls was freed by send_core_* */
- queue_destroy (queue, GNUNET_NO);
+ GMP_queue_destroy (queue, GNUNET_NO);
/* If more data in queue, send next */
queue = peer_get_first_message (peer);
/******************************** API ***********************************/
/******************************************************************************/
+
+/**
+ * Free a transmission that was already queued with all resources
+ * associated to the request.
+ *
+ * @param queue Queue handler to cancel.
+ * @param clear_cls Is it necessary to free associated cls?
+ */
+void
+GMP_queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
+{
+ struct MeshPeer *peer;
+
+ peer = queue->peer;
+ GNUNET_assert (NULL != queue->c);
+
+ if (GNUNET_YES == clear_cls)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# queue destroy type %s\n",
+ GNUNET_MESH_DEBUG_M2S (queue->type));
+ switch (queue->type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
+ case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
+ LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n");
+ /* fall through */
+ case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_POLL:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
+ case GNUNET_MESSAGE_TYPE_MESH_KX:
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# prebuilt message\n");;
+ GNUNET_free_non_null (queue->cls);
+ break;
+
+ default:
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR, "# type %s unknown!\n",
+ GNUNET_MESH_DEBUG_M2S (queue->type));
+ }
+ }
+ GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
+
+ if (queue->type != GNUNET_MESSAGE_TYPE_MESH_ACK &&
+ queue->type != GNUNET_MESSAGE_TYPE_MESH_POLL)
+ {
+ peer->queue_n--;
+ }
+
+ if (NULL != queue->callback)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# Calling callback\n");
+ queue->callback (queue->callback_cls,
+ queue->c, queue->type,
+ queue->fwd, queue->size,
+ GNUNET_TIME_absolute_get_duration (queue->start_waiting));
+ }
+
+ GNUNET_free (queue);
+}
+
+
/**
* @brief Queue and pass message to core when possible.
*
* @param type Type of the message, 0 for a raw message.
* @param size Size of the message.
* @param c Connection this message belongs to (cannot be NULL).
- * @param ch Channel this message belongs to, if applicable (otherwise NULL).
* @param fwd Is this a message going root->dest? (FWD ACK are NOT FWD!)
* @param cont Continuation to be called once CORE has taken the message.
* @param cont_cls Closure for @c cont.
+ *
+ * @return Handle to cancel the message before it is sent. Once cont is called
+ * message has been sent and therefore the handle is no longer valid.
*/
-void
+struct MeshPeerQueue *
GMP_queue_add (struct MeshPeer *peer, void *cls, uint16_t type, size_t size,
- struct MeshConnection *c, struct MeshChannel *ch, int fwd,
+ struct MeshConnection *c, int fwd,
GMP_sent cont, void *cont_cls)
{
struct MeshPeerQueue *queue;
int call_core;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "queue add %s %s (%u) on c %p, ch %p\n",
- fwd ? "FWD" : "BCK", GNUNET_MESH_DEBUG_M2S (type), size, c, ch);
+ "queue add %s %s towards %s (size %u) on c %p (%s)\n",
+ fwd ? "FWD" : "BCK", GNUNET_MESH_DEBUG_M2S (type), GMP_2s(peer),
+ size, c, GMC_2s (c));
GNUNET_assert (NULL != c);
if (NULL == peer->connections)
{
/* We are not connected to this peer, ignore request. */
GNUNET_break_op (0);
- return;
+ return NULL;
}
priority = 0;
queue->size = size;
queue->peer = peer;
queue->c = c;
- queue->ch = ch;
queue->fwd = fwd;
queue->callback = cont;
queue->callback_cls = cont_cls;
- if (100 <= priority)
+ if (100 > priority)
{
- struct MeshPeerQueue *copy;
- struct MeshPeerQueue *next;
-
- for (copy = peer->queue_head; NULL != copy; copy = next)
- {
- next = copy->next;
- if (copy->type == type && copy->c == c && copy->fwd == fwd)
- {
- /* Example: also a FWD ACK for connection XYZ */
- queue_destroy (copy, GNUNET_YES);
- }
- }
- GNUNET_CONTAINER_DLL_insert (peer->queue_head, peer->queue_tail, queue);
+ GNUNET_CONTAINER_DLL_insert_tail (peer->queue_head, peer->queue_tail, queue);
+ peer->queue_n++;
}
else
{
- GNUNET_CONTAINER_DLL_insert_tail (peer->queue_head, peer->queue_tail, queue);
- peer->queue_n++;
+ GNUNET_CONTAINER_DLL_insert (peer->queue_head, peer->queue_tail, queue);
+ call_core = GNUNET_YES;
}
if (NULL == peer->core_transmit && GNUNET_YES == call_core)
GMP_2s (peer));
}
+ return queue;
}
* Cancel all queued messages to a peer that belong to a certain connection.
*
* @param peer Peer towards whom to cancel.
- * @param c Connection whose queued messages to cancel.
+ * @param c Connection whose queued messages to cancel. Might be destroyed by
+ * the sent continuation call.
*/
void
GMP_queue_cancel (struct MeshPeer *peer, struct MeshConnection *c)
{
struct MeshPeerQueue *q;
struct MeshPeerQueue *next;
+ struct MeshPeerQueue *prev;
for (q = peer->queue_head; NULL != q; q = next)
{
- next = q->next;
+ prev = q->prev;
if (q->c == c)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "connection_cancel_queue %s\n",
+ "GMP_cancel_queue %s\n",
GNUNET_MESH_DEBUG_M2S (q->type));
- queue_destroy (q, GNUNET_YES);
+ GMP_queue_destroy (q, GNUNET_YES);
+
+ /* Get next from prev, q->next might be already freed:
+ * queue destroy -> callback -> GMC_destroy -> cancel_queues -> here
+ */
+ if (NULL == prev)
+ next = peer->queue_head;
+ else
+ next = prev->next;
+ }
+ else
+ {
+ next = q->next;
}
}
if (NULL == peer->queue_head)
if (q->c != c)
continue;
if (queue_is_sendable (q))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " sendable!!\n");
return q;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " not sendable\n");
}
return NULL;
}
+
void
GMP_queue_unlock (struct MeshPeer *peer, struct MeshConnection *c)
{
* Initialize the peer subsystem.
*
* @param c Configuration.
- * @param id Peer identity
*/
void
GMP_init (const struct GNUNET_CONFIGURATION_Handle *c)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "init\n");
peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (c, "MESH", "MAX_PEERS",
* Retrieve the MeshPeer stucture associated with the peer, create one
* and insert it in the appropriate structures if the peer is not known yet.
*
- * @param peer Full identity of the peer.
+ * @param peer_id Full identity of the peer.
*
* @return Existing or newly created peer structure.
*/
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
peer->id = GNUNET_PEER_intern (peer_id);
}
- peer->last_contact = GNUNET_TIME_absolute_get();
+ peer->last_contact = GNUNET_TIME_absolute_get();
- return peer;
+ return peer;
}
*
* @param peer Peer to check.
*
- * @return GNUNET_YES if there is a direct connection.
+ * @return #GNUNET_YES if there is a direct connection.
*/
int
GMP_is_neighbor (const struct MeshPeer *peer)
/**
* Create and initialize a new tunnel towards a peer, in case it has none.
+ * In case the peer already has a tunnel, nothing is done.
*
* Does not generate any traffic, just creates the local data structures.
*
* 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 peer 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.
* @param trusted Do we trust that this path is real?
+ *
+ * @return path if path was taken, pointer to existing duplicate if exists
+ * NULL on error.
*/
-void
-GMP_add_path (struct MeshPeer *peer_info, struct MeshPeerPath *path,
+struct MeshPeerPath *
+GMP_add_path (struct MeshPeer *peer, struct MeshPeerPath *path,
int trusted)
{
struct MeshPeerPath *aux;
unsigned int l;
unsigned int l2;
- if ((NULL == peer_info) || (NULL == path))
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "adding path [%u] to peer %s\n",
+ path->length, GMP_2s (peer));
+
+ if ((NULL == peer) || (NULL == path))
{
GNUNET_break (0);
path_destroy (path);
- return;
+ return NULL;
}
- if (path->peers[path->length - 1] != peer_info->id)
+ if (path->peers[path->length - 1] != peer->id)
{
GNUNET_break (0);
path_destroy (path);
- return;
+ return NULL;
}
if (2 >= path->length && GNUNET_NO == trusted)
{
/* Only allow CORE to tell us about direct paths */
path_destroy (path);
- return;
+ return NULL;
}
for (l = 1; l < path->length; l++)
{
{
path->peers[l2] = path->peers[l + l2];
}
- path->length -= l;
- l = 1;
- path->peers =
- GNUNET_realloc (path->peers, path->length * sizeof (GNUNET_PEER_Id));
+ path->length -= l;
+ l = 1;
+ path->peers = GNUNET_realloc (path->peers,
+ path->length * sizeof (GNUNET_PEER_Id));
}
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "adding path [%u] to peer %s\n",
- path->length, GMP_2s (peer_info));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "adding path [%u]\n", path->length);
l = path_get_length (path);
if (0 == l)
{
path_destroy (path);
- return;
+ return NULL;
}
- GNUNET_assert (peer_info->id == path->peers[path->length - 1]);
- for (aux = peer_info->path_head; aux != NULL; aux = aux->next)
+ GNUNET_assert (peer->id == path->peers[path->length - 1]);
+ for (aux = peer->path_head; aux != NULL; aux = aux->next)
{
l2 = path_get_length (aux);
if (l2 > l)
{
- GNUNET_CONTAINER_DLL_insert_before (peer_info->path_head,
- peer_info->path_tail, aux, path);
- return;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " added\n");
+ GNUNET_CONTAINER_DLL_insert_before (peer->path_head,
+ peer->path_tail, aux, path);
+ return path;
+ }
+ else
+ {
+ if (l2 == l && memcmp (path->peers, aux->peers, l) == 0)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " already known\n");
+ path_destroy (path);
+ return aux;
+ }
}
- else
- {
- if (l2 == l && memcmp (path->peers, aux->peers, l) == 0)
- {
- path_destroy (path);
- return;
- }
- }
}
- GNUNET_CONTAINER_DLL_insert_tail (peer_info->path_head, peer_info->path_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (peer->path_head, peer->path_tail,
path);
- return;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " added last\n");
+ return path;
}
* The path is given in peer_info -> destination, therefore we turn the path
* upside down first.
*
- * @param peer_info Peer to add the path to, being the origin of the path.
+ * @param peer Peer to add the path to, being the origin of the path.
* @param path New path to add after being inversed.
* Path will be either used or freed.
* @param trusted Do we trust that this path is real?
+ *
+ * @return path if path was taken, pointer to existing duplicate if exists
+ * NULL on error.
*/
-void
+struct MeshPeerPath *
GMP_add_path_to_origin (struct MeshPeer *peer,
struct MeshPeerPath *path,
int trusted)
{
if (NULL == path)
- return;
+ return NULL;
path_invert (path);
- GMP_add_path (peer, path, trusted);
+ return GMP_add_path (peer, path, trusted);
}
if (NULL == peer || NULL == peer->connections)
{
GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Peer %s is not a neighbor!\n",
+ GMP_2s (peer));
return GNUNET_SYSERR;
}
return GNUNET_CONTAINER_multihashmap_remove (peer->connections,
c);
}
+/**
+ * Start the DHT search for new paths towards the peer: we don't have
+ * enough good connections.
+ *
+ * @param peer Destination peer.
+ */
+void
+GMP_start_search (struct MeshPeer *peer)
+{
+ if (NULL != peer->search_h)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ peer->search_h = GMD_search (GMP_get_id (peer), &search_handler, peer);
+}
+
+
+/**
+ * Stop the DHT search for new paths towards the peer: we already have
+ * enough good connections.
+ *
+ * @param peer Destination peer.
+ */
+void
+GMP_stop_search (struct MeshPeer *peer)
+{
+ if (NULL == peer->search_h)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ GMD_search_stop (peer->search_h);
+ peer->search_h = NULL;
+}
+
+
/**
* Get the Full ID of a peer.
*
}
+/**
+ * Get the tunnel towards a peer.
+ *
+ * @param peer Peer to get from.
+ *
+ * @return Tunnel towards peer.
+ */
+struct MeshTunnel3 *
+GMP_get_tunnel (const struct MeshPeer *peer)
+{
+ return peer->tunnel;
+}
+
+
/**
* Get the static string for a peer ID.
*
projects / oweals / gnunet.git / blobdiff