- fix handling of duplicate incoming channel create with respect to queued retransmis...

[oweals/gnunet.git] / src / mesh / gnunet-service-mesh_peer.c

diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c
index 1701ae820e23506afb224eb20c9e5061db07c16b..241e6481ea02ea450d7ef709bc2f7a111bca53b1 100644 (file)
--- a/src/mesh/gnunet-service-mesh_peer.c
+++ b/src/mesh/gnunet-service-mesh_peer.c
@@ -776,8 +776,8 @@ queue_is_sendable (struct MeshPeerQueue *q)
       GNUNET_break (0);
   }
 
-  if (GMC_is_sendable (q->c, q->fwd))
-    return GNUNET_YES;
+  if (GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN != q->type)
+    return GMC_is_sendable (q->c, q->fwd);
 
   return GNUNET_NO;
 }
@@ -870,7 +870,7 @@ queue_send (void *cls, size_t size, void *buf)
   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;
@@ -1234,6 +1234,7 @@ GMP_connection_pop (struct MeshPeer *peer, struct MeshConnection *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)
@@ -1481,7 +1482,12 @@ GMP_connect (struct MeshPeer *peer)
     p = peer_get_best_path (peer);
     if (NULL != p)
     {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  %u hops\n", p->length);
+      char *s;
+
+      s = path_2s (p);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  path to use: %s\n", s);
+      GNUNET_free (s);
+
       c = GMT_use_path (t, p);
       if (NULL == c)
       {
@@ -1659,12 +1665,7 @@ GMP_add_path (struct MeshPeer *peer, struct MeshPeerPath *path,
     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)
@@ -1683,6 +1684,13 @@ GMP_add_path (struct MeshPeer *peer, struct MeshPeerPath *path,
 
   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)
   {
@@ -1800,9 +1808,8 @@ GMP_remove_path (struct MeshPeer *peer, struct MeshPeerPath *path)
                      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);
@@ -2020,6 +2027,56 @@ GMP_try_connect (struct MeshPeer *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.
  *