- log output

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

diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index f475e2d0c3b9f338f6657de009496486c989985b..4a8973d08651cd3041daf8bdbb318352f7df3ef4 100644 (file)
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -36,6 +36,8 @@
 
 #define REKEY_WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
 
+#define CONNECTIONS_PER_TUNNEL 3
+
 /******************************************************************************/
 /********************************   STRUCTS  **********************************/
 /******************************************************************************/
@@ -47,11 +49,36 @@ struct MeshTChannel
   struct MeshChannel *ch;
 };
 
+
+/**
+ * Connection list and metadata.
+ */
 struct MeshTConnection
 {
+  /**
+   * Next in DLL.
+   */
   struct MeshTConnection *next;
+
+  /**
+   * Prev in DLL.
+   */
   struct MeshTConnection *prev;
+
+  /**
+   * Connection handle.
+   */
   struct MeshConnection *c;
+
+  /**
+   * Creation time, to keep oldest connection alive.
+   */
+  struct GNUNET_TIME_Absolute created;
+
+  /**
+   * Connection throughput, to keep fastest connection alive.
+   */
+  uint32_t throughput;
 };
 
 /**
@@ -625,7 +652,7 @@ tunnel_get_connection (struct MeshTunnel3 *t)
   unsigned int qn;
   unsigned int lowest_q;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel_get_connection %s\n", GMP_2s (t->peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "tunnel_get_connection %s\n", GMT_2s (t));
   best = NULL;
   lowest_q = UINT_MAX;
   for (iter = t->connection_head; NULL != iter; iter = iter->next)
@@ -1800,12 +1827,8 @@ GMT_change_cstate (struct MeshTunnel3* t, enum MeshTunnel3CState cstate)
 {
   if (NULL == t)
     return;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-              "Tunnel %s cstate was %s\n",
-              GMP_2s (t->peer), cstate2s (t->cstate));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-              "Tunnel %s cstate is now %s\n",
-              GMP_2s (t->peer), cstate2s (cstate));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s cstate %s => %s\n",
+       GMP_2s (t->peer), cstate2s (t->cstate), cstate2s (cstate));
   if (myid != GMP_get_short_id (t->peer) &&
       MESH_TUNNEL3_READY != t->cstate &&
       MESH_TUNNEL3_READY == cstate)
@@ -1813,19 +1836,21 @@ GMT_change_cstate (struct MeshTunnel3* t, enum MeshTunnel3CState cstate)
     t->cstate = cstate;
     if (MESH_TUNNEL3_KEY_OK == t->estate)
     {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  triggered send queued data\n");
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered send queued data\n");
       send_queued_data (t);
     }
     else if (MESH_TUNNEL3_KEY_UNINITIALIZED == t->estate)
     {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  triggered rekey\n");
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered rekey\n");
       rekey_tunnel (t, NULL);
     }
   }
   t->cstate = cstate;
 
-  if (MESH_TUNNEL3_READY == cstate && 3 <= GMT_count_connections (t))
+  if (MESH_TUNNEL3_READY == cstate
+      && CONNECTIONS_PER_TUNNEL <= GMT_count_connections (t))
   {
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered stop dht\n");
     GMP_stop_search (t->peer);
   }
 }
@@ -1858,6 +1883,36 @@ GMT_change_estate (struct MeshTunnel3* t, enum MeshTunnel3EState state)
 }
 
 
+/**
+ * Check that the tunnel doesn't have too many connections,
+ * remove one if necessary.
+ *
+ * For the time being, this means the newest connection.
+ *
+ * @param t Tunnel to check.
+ */
+static void
+check_connection_count (struct MeshTunnel3 *t)
+{
+  if (GMT_count_connections (t) > CONNECTIONS_PER_TUNNEL)
+  {
+    struct MeshTConnection *iter;
+    struct MeshTConnection *c;
+
+    for (iter = t->connection_head; NULL != iter; iter = iter->next)
+    {
+      if (NULL == c || iter->created.abs_value_us > c->created.abs_value_us)
+      {
+        c = iter;
+      }
+    }
+    if (NULL != c)
+      GMC_destroy (c->c);
+    else
+      GNUNET_break (0);
+  }
+}
+
 /**
  * Add a connection to a tunnel.
  *
@@ -1877,7 +1932,11 @@ GMT_add_connection (struct MeshTunnel3 *t, struct MeshConnection *c)
 
   aux = GNUNET_new (struct MeshTConnection);
   aux->c = c;
-  GNUNET_CONTAINER_DLL_insert_tail (t->connection_head, t->connection_tail, aux);
+  aux->created = GNUNET_TIME_absolute_get ();
+
+  GNUNET_CONTAINER_DLL_insert (t->connection_head, t->connection_tail, aux);
+
+  check_connection_count (t);
 }
 
 
@@ -1926,8 +1985,8 @@ GMT_remove_connection (struct MeshTunnel3 *t,
       && GNUNET_NO == shutting_down)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  no more connections, getting new ones\n");
-    GMP_connect (t->peer);
     t->cstate = MESH_TUNNEL3_SEARCHING;
+    GMP_connect (t->peer);
     return;
   }
 
@@ -2201,7 +2260,7 @@ GMT_use_path (struct MeshTunnel3 *t, struct MeshPeerPath *p)
     if (p->peers[own_pos] == myid)
       break;
   }
-  if (own_pos > p->length - 1)
+  if (own_pos >= p->length)
   {
     GNUNET_break_op (0);
     return NULL;
@@ -2652,7 +2711,7 @@ GMT_get_path_cost (const struct MeshTunnel3 *t,
       }
     }
   }
-  return (path->length + overlap) * (path->score * -1);
+  return path->length + overlap;
 }