- start test only after warmup

[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 5d693bd3fa711115db62c30615a7b56e7b6e14db..05b924edadcf52058177cf87cc7fe6f400d208b0 100644 (file)
--- a/src/mesh/gnunet-service-mesh_peer.c
+++ b/src/mesh/gnunet-service-mesh_peer.c
@@ -289,7 +289,7 @@ core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
   }
   else
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "CONNECTED %s <= %s\n",
+    LOG (GNUNET_ERROR_TYPE_INFO, "CONNECTED %s <= %s\n",
          own_id, GNUNET_i2s (peer));
     path = path_new (2);
     path->peers[1] = mp->id;
@@ -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;
 }
@@ -899,7 +899,6 @@ queue_send (void *cls, size_t size, void *buf)
   {
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
-    case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
     case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
     case GNUNET_MESSAGE_TYPE_MESH_KX:
     case GNUNET_MESSAGE_TYPE_MESH_ACK:
@@ -1221,6 +1220,50 @@ connection_get_first_message (struct MeshPeer *peer, struct MeshConnection *c)
 }
 
 
+/**
+ * Get the first message for a connection and unqueue it.
+ *
+ * @param peer Neighboring peer.
+ * @param c Connection.
+ *
+ * @return First message for this connection.
+ */
+struct GNUNET_MessageHeader *
+GMP_connection_pop (struct MeshPeer *peer, struct MeshConnection *c)
+{
+  struct MeshPeerQueue *q;
+  struct GNUNET_MessageHeader *msg;
+
+  for (q = peer->queue_head; NULL != q; q = q->next)
+  {
+    if (q->c != c)
+      continue;
+    switch (q->type)
+    {
+      case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
+      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_ACK:
+      case GNUNET_MESSAGE_TYPE_MESH_POLL:
+        GMP_queue_destroy (q, GNUNET_YES);
+        continue;
+
+      case GNUNET_MESSAGE_TYPE_MESH_KX:
+      case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
+        msg = (struct GNUNET_MessageHeader *) q->cls;
+        GMP_queue_destroy (q, GNUNET_NO);
+        return msg;
+
+      default:
+        GNUNET_break (0);
+    }
+  }
+
+  return NULL;
+}
+
+
 void
 GMP_queue_unlock (struct MeshPeer *peer, struct MeshConnection *c)
 {
@@ -1302,8 +1345,15 @@ GMP_init (const struct GNUNET_CONFIGURATION_Handle *c)
     transport_handle = GNUNET_TRANSPORT_connect (c, &my_full_id, NULL, /* cls */
                                                  /* Notify callbacks */
                                                  NULL, NULL, NULL);
-
   }
+  else
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
+    LOG (GNUNET_ERROR_TYPE_WARNING, "*  DISABLE TRYING CONNECT in config  *\n");
+    LOG (GNUNET_ERROR_TYPE_WARNING, "*  Use this only for test purposes.  *\n");
+    LOG (GNUNET_ERROR_TYPE_WARNING, "**************************************\n");
+  }
+
 
 
   if (NULL == core_handle)
@@ -1431,7 +1481,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)
       {