/** 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;
+ 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
*/
* 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;
};
* - Adapt X to churn
*/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n",
- GNUNET_h2s_full (&my_full_id.hashPubKey));
+ GNUNET_i2s (&my_full_id));
GNUNET_DHT_put (dht_handle, /* DHT handle */
&my_full_id.hashPubKey, /* Key to use */
10U, /* Replication level */
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)
{
if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
return;
- info->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+#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);
}
tunnel_get (struct GNUNET_PeerIdentity *oid, MESH_TunnelNumber tid);
+/**
+ * Notify a tunnel that a connection has broken that affects at least
+ * some of its peers.
+ *
+ * @param t Tunnel affected.
+ * @param p1 Peer that got disconnected from p2.
+ * @param p2 Peer that got disconnected from p1.
+ *
+ * @return Short ID of the peer disconnected (either p1 or p2).
+ * 0 if the tunnel remained unaffected.
+ */
+static GNUNET_PEER_Id
+tunnel_notify_connection_broken (struct MeshTunnel *t,
+ GNUNET_PEER_Id p1,
+ GNUNET_PEER_Id p2);
+
+
/**
* Send the message to all clients that have subscribed to its type
*
/**
* 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
}
+/**
+ * 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
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.
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type payload\n");
dd = peer->infos[i];
- if (0 == --(*dd->copies))
- {
- GNUNET_free (dd->copies);
- GNUNET_free (dd->data);
- }
+ data_descriptor_decrement_multicast (dd);
break;
case GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: type create path\n");
}
+/**
+ * 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.
}
+/**
+ * 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 (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);
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 */
}
-#if LATER
+/**
+ * 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 t tunnel the path belongs to
- * @param pi the peer_info to destroy
+ *
+ * @param pi The peer_info to destroy.
+ *
* @return GNUNET_OK on success
*/
static int
peer_info_destroy (struct MeshPeerInfo *pi)
{
- GNUNET_HashCode hash;
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);
- GNUNET_CRYPTO_hash (&id, sizeof (struct GNUNET_PeerIdentity), &hash);
- GNUNET_CONTAINER_multihashmap_remove (peers, &hash, pi);
- GNUNET_SCHEDULER_cancel (pi->path_refresh_task);
+ 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;
}
-#endif
-
-/**
- * Notify a tunnel that a connection has broken that affects at least
- * 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.
- *
- * @return Short ID of the peer disconnected (either p1 or p2).
- * 0 if the tunnel remained unaffected.
- */
-static GNUNET_PEER_Id
-tunnel_notify_connection_broken (struct MeshTunnel *t,
- struct MeshPeerInfo *peer, GNUNET_PEER_Id p1,
- GNUNET_PEER_Id p2);
/**
* Remove all paths that rely on a direct connection between p1 and p2
GNUNET_PEER_Id p1,
GNUNET_PEER_Id p2)
{
- struct GNUNET_PeerIdentity id;
struct MeshPeerPath *p;
struct MeshPeerPath *aux;
struct MeshPeerInfo *peer_d;
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;
for (i = 0; i < peer->ntunnels; i++)
{
- d = tunnel_notify_connection_broken (peer->tunnels[i], peer, p1, p2);
+ 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.
}
else
{
- 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 |
- GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
- NULL, /* xquery */
- 0, /* xquery bits */
- &dht_get_id_handler,
- (void *) path_info);
+ peer_info_connect (peer_d, peer->tunnels[i]);
}
}
}
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;
}
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;
}
*/
static struct MeshPeerPath *
path_build_from_dht (const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
+ unsigned int get_path_length,
const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length)
+ unsigned int put_path_length)
{
struct MeshPeerPath *p;
GNUNET_PEER_Id id;
if (get_path_length > 0)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: (first of GET: %s)\n",
- GNUNET_h2s_full(&get_path[0].hashPubKey));
+ GNUNET_i2s(&get_path[0]));
if (put_path_length > 0)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: (first of PUT: %s)\n",
- GNUNET_h2s_full(&put_path[0].hashPubKey));
+ GNUNET_i2s(&put_path[0]));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: In total: %d hops\n",
p->length);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: %u: %s\n",
p->peers[i],
- GNUNET_h2s_full(&peer_id.hashPubKey));
+ GNUNET_i2s(&peer_id));
}
#endif
return p;
*
* TODO: implement explicit multicast keepalive?
*/
-void
+static void
path_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
* 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 MeshPeerInfo *peer;
+ struct MeshPathInfo *path_info;
if (NULL != n->t->client && NULL != nc)
{
&msg.header, GNUNET_NO);
}
peer = peer_info_get_short(n->peer);
- peer_info_connect(peer, n->t);
+ 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);
}
/**
- * 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;
}
* @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,
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;
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 (*copies = 0; NULL != n; n = n->next)
+ for (counter = n; NULL != counter; counter = counter->next)
(*copies)++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: (%u copies)\n", *copies);
- n = t->tree->me->children_head;
data = GNUNET_malloc (size);
memcpy (data, msg, size);
+ 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->origin = &t->id;
info->data = data;
info->size = size;
info->copies = copies;
if (NULL != t->client)
{
info->client = t->client->handle;
- info->timeout_task = GNUNET_SCHEDULER_add_delayed (UNACKNOWLEDGED_WAIT,
- &client_allow_send,
- t->client->handle);
+ info->timeout_task = task;
}
info->destination = n->peer;
GNUNET_PEER_resolve (n->peer, &neighbor);
}
+/**
+ * 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
*
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.
}
+/**
+ * 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 ***********************/
/******************************************************************************/
}
-#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
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: type %u\n",
- ntohs (mh->type));
- }
- }
-#endif
- if (0 == --(*info->copies))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Last copy!\n");
- if (NULL != info->client)
- {
- if (GNUNET_SCHEDULER_NO_TASK != info->timeout_task)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "MESH: cancelling client timeout (%u)...\n",
- info->timeout_task);
- GNUNET_SCHEDULER_cancel(info->timeout_task);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: notifying client...\n");
- GNUNET_SERVER_receive_done (info->client, GNUNET_OK);
- }
+ ntohs (mh->type));
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: freeing memory...\n");
- GNUNET_free (info->data);
- GNUNET_free (info->copies);
}
+#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);
}
-/**
- * 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
-
-
/******************************************************************************/
/******************** 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_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
unsigned int own_pos;
uint16_t size;
tunnels,
&hash,
t,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
{
- tunnel_destroy(t);
+ 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_ONLY))
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
{
- tunnel_destroy(t);
+ tunnel_destroy (t);
GNUNET_break (0);
return GNUNET_OK;
}
return 0;
}
tunnel_add_path (t, path, own_pos);
- t->tree->me = tree_find_peer(t->tree->root, myid);
if (own_pos == size - 1)
{
/* It is for us! Send ack. */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: It's for us!\n");
path_add_to_origin (orig_peer_info, path);
- t->peers = GNUNET_CONTAINER_multihashmap_create(4);
+ 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,
}
+/**
+ * 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;
+}
+
+
/**
* Core handler for mesh network traffic going from the origin to a peer
*
* @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_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_Unicast *msg;
struct MeshTunnel *t;
GNUNET_break_op (0);
return GNUNET_OK;
}
+ tunnel_reset_timeout (t);
pid = GNUNET_PEER_search(&msg->destination);
if (pid == myid)
{
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MESH: not for us, retransmitting...\n");
- 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, pid),
- size,
- &send_core_data_raw, msg);
+ 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)
*
static int
handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_Multicast *msg;
struct MeshTunnel *t;
GNUNET_break_op (0);
return GNUNET_OK;
}
+ tunnel_reset_timeout (t);
/* Transmit to locally interested clients */
if (NULL != t->peers &&
* @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_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_ToOrigin *msg;
struct GNUNET_PeerIdentity id;
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)
static int
handle_mesh_path_ack (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct GNUNET_MESH_PathACK *msg;
struct GNUNET_PeerIdentity id;
/* 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");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: It's for us!\n");
if (NULL == t->client)
{
GNUNET_break_op (0);
return GNUNET_OK;
}
- peer_info = peer_info_get (&msg->peer_id);
- if (NULL == peer_info)
+ if (NULL != t->dht_get_type)
{
- GNUNET_break_op (0);
- return GNUNET_OK;
+ GNUNET_DHT_get_stop (t->dht_get_type);
+ t->dht_get_type = NULL;
}
+ peer_info = peer_info_get (&msg->peer_id);
n = tree_find_peer(t->tree->root, peer_info->id);
if (NULL == n)
{
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,
- &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}
};
*
* TODO: implement explicit multicast keepalive?
*/
-void
+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;
+ size_t size = sizeof(struct GNUNET_MESH_Multicast) +
+ sizeof(struct GNUNET_MessageHeader);
+ char cbuf[size];
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
{
"MESH: sending keepalive for tunnel %d\n",
t->id.tid);
- size = sizeof(struct GNUNET_MESH_Multicast) +
- sizeof(struct GNUNET_MessageHeader);
- msg = GNUNET_malloc (size);
+ 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_CREATE);
- handle_mesh_data_multicast (NULL, &my_full_id, &msg->header, NULL);
+ payload->type = htons (GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE);
+ tunnel_send_multicast (t, &msg->header);
- GNUNET_free (msg);
t->path_refresh_task =
GNUNET_SCHEDULER_add_delayed (t->tree->refresh, &path_refresh, t);
return;
struct GNUNET_PeerIdentity pi;
int i;
+ 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: Got results from DHT for %s\n",
- GNUNET_h2s_full(&pi.hashPubKey));
- GNUNET_DHT_get_stop(path_info->peer->dhtget);
- path_info->peer->dhtget = NULL;
+ "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);
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;
}
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->dht_get_type);
- t->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)
- {
- path_info = GNUNET_malloc (sizeof (struct MeshPathInfo));
- path_info->peer = peer_info;
- path_info->t = t;
- /* 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 |
- GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
- /* option to dht: record route */
- NULL, /* xquery */
- 0, /* xquery bits */
- dht_get_id_handler, /* callback */
- path_info); /* closure */
- return;
- }
+ (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);
+ 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)
- {
- send_create_path(peer_info, p, t);
- return;
- }
- path_destroy(p);
- send_client_peer_connected(t, myid);
+ peer_info_connect (peer_info, t);
}
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);
- 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);
-// notify_tunnel_destroy(t);
+ t->client = NULL;
+ tunnel_send_destroy (t);
tunnel_destroy(t);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
return;
}
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: for %s\n",
- GNUNET_h2s_full(&peer_msg->peer.hashPubKey));
+ GNUNET_i2s(&peer_msg->peer));
peer_info = peer_info_get (&peer_msg->peer);
tunnel_add_peer(t, peer_info);
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;
}
GNUNET_DHT_get_stop (t->dht_get_type);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: looking in DHT for %s\n",
- GNUNET_h2s_full (&hash));
+ GNUNET_h2s (&hash));
t->dht_get_type =
GNUNET_DHT_get_start (dht_handle,
GNUNET_TIME_UNIT_FOREVER_REL,
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);
+ handle_mesh_data_unicast (NULL, &my_full_id, ©->header, NULL, 0);
}
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
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);
+ handle_mesh_data_to_orig (NULL, &my_full_id, ©->header, NULL, 0);
}
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
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);
+ handle_mesh_data_multicast(client, &my_full_id, ©->header, NULL, 0);
}
/* receive done gets called when last copy is sent to a neighbor */
* @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_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
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_h2s(&my_full_id.hashPubKey));
+ GNUNET_i2s(&my_full_id));
#endif
peer_info = peer_info_get (peer);
if (myid == peer_info->id)
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: %s\n",
- GNUNET_h2s(&peer->hashPubKey));
+ GNUNET_i2s(peer));
}
#endif
path = path_new (2);
}
for (i = 0; i < CORE_QUEUE_SIZE; i++)
{
+ /* TODO: notify that the transmission failed */
peer_info_cancel_transmission(pi, i);
}
path_remove_from_peer (pi, pi->id, myid);
/******************************************************************************/
/**
- * Iterator over hash map entries.
+ * 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,
+ * @return GNUNET_YES if we should continue to iterate,
* GNUNET_NO if not.
*/
-int
+static int
shutdown_tunnel (void *cls, const GNUNET_HashCode * key, void *value)
{
struct MeshTunnel *t = value;
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.
*
core_handle = NULL;
}
GNUNET_CONTAINER_multihashmap_iterate(tunnels, &shutdown_tunnel, NULL);
+ GNUNET_CONTAINER_multihashmap_iterate(peers, &shutdown_peer, NULL);
if (dht_handle != NULL)
{
GNUNET_DHT_disconnect (dht_handle);
{
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