case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
- case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
return GNUNET_YES;
case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
GNUNET_break (0);
}
- if (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN != q->type)
- return GMC_is_sendable (q->c, q->fwd);
-
- return GNUNET_NO;
+ return GMC_is_sendable (q->c, q->fwd);
}
*
* @param peer The destination peer.
*
- * @return Best current known path towards the peer, if any.
+ * @return First transmittable message, if any. Otherwise, NULL.
*/
static struct MeshPeerQueue *
peer_get_first_message (const struct MeshPeer *peer)
for (q = peer->queue_head; NULL != q; q = q->next)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Checking %p towards %s\n", q, GMC_2s (q->c));
if (queue_is_sendable (q))
return q;
}
queue = peer_get_first_message (peer);
if (NULL == queue)
{
- GNUNET_break (0); /* Core tmt_rdy should've been canceled */
+ GNUNET_assert (0); /* Core tmt_rdy should've been canceled */
return 0;
}
c = queue->c;
struct MeshPeerQueue *q;
struct GNUNET_MessageHeader *msg;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connection pop on %s\n", GMC_2s (c));
for (q = peer->queue_head; NULL != q; q = q->next)
{
if (q->c != c)
path_destroy (path);
return NULL;
}
- if (2 >= path->length && GNUNET_NO == trusted)
- {
- /* Only allow CORE to tell us about direct paths */
- path_destroy (path);
- return NULL;
- }
+
for (l = 1; l < path->length; l++)
{
if (path->peers[l] == myid)
LOG (GNUNET_ERROR_TYPE_DEBUG, " final length: %u\n", path->length);
+ if (2 >= path->length && GNUNET_NO == trusted)
+ {
+ /* Only allow CORE to tell us about direct paths */
+ path_destroy (path);
+ return NULL;
+ }
+
l = path_get_length (path);
if (0 == l)
{
sizeof (GNUNET_PEER_Id) * path->length))
{
GNUNET_CONTAINER_DLL_remove (peer->path_head, peer->path_tail, iter);
- path_destroy (iter);
- if (path == iter)
- return;
+ if (iter != path)
+ path_destroy (iter);
}
}
path_destroy (path);
GMP_set_tunnel (struct MeshPeer *peer, struct MeshTunnel3 *t)
{
peer->tunnel = t;
+ if (NULL == t && NULL != peer->search_h)
+ {
+ GMP_stop_search (peer);
+ }
}
}
+/**
+ * Notify a peer that a link between two other peers is broken. If any path
+ * used that link, eliminate it.
+ *
+ * @param peer Peer affected by the change.
+ * @param peer1 Peer whose link is broken.
+ * @param peer2 Peer whose link is broken.
+ */
+void
+GMP_notify_broken_link (struct MeshPeer *peer,
+ struct GNUNET_PeerIdentity *peer1,
+ struct GNUNET_PeerIdentity *peer2)
+{
+ struct MeshPeerPath *iter;
+ struct MeshPeerPath *next;
+ unsigned int i;
+ GNUNET_PEER_Id p1;
+ GNUNET_PEER_Id p2;
+
+ p1 = GNUNET_PEER_search (peer1);
+ p2 = GNUNET_PEER_search (peer2);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Link %u-%u broken\n", p1, p2);
+ if (0 == p1 || 0 == p2)
+ {
+ /* We don't even know them */
+ return;
+ }
+
+ for (iter = peer->path_head; NULL != iter; iter = next)
+ {
+ next = iter->next;
+ for (i = 0; i < iter->length - 1; i++)
+ {
+ if ((iter->peers[i] == p1 && iter->peers[i + 1] == p2)
+ || (iter->peers[i] == p2 && iter->peers[i + 1] == p1))
+ {
+ char *s;
+
+ s = path_2s (iter);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " - invalidating %s\n", s);
+ GNUNET_free (s);
+
+ path_invalidate (iter);
+ }
+ }
+ }
+}
+
+
/**
* Count the number of known paths toward the peer.
*