- fix tunnel state management after connection failure<

5 files changed, 44 insertions, 11 deletions

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index ab8f94fc4..c1a75fca4 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1709,7 +1709,7 @@ GCC_handle_confirm (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
   else if (get_prev_hop (c) == pi)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "  ACK\n");
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "  FINAL ACK\n");
     fwd = GNUNET_YES;
     connection_change_state (c, CADET_CONNECTION_READY);
   }
@@ -2693,7 +2693,7 @@ GCC_get_allowed (struct CadetConnection *c, int fwd)
   struct CadetFlowControl *fc;
 
   fc = fwd ? &c->fwd_fc : &c->bck_fc;
-  if (GC_is_pid_bigger(fc->last_pid_recv, fc->last_ack_sent))
+  if (GC_is_pid_bigger (fc->last_pid_recv, fc->last_ack_sent))
   {
     return 0;
   }
diff --git a/src/cadet/gnunet-service-cadet_local.c b/src/cadet/gnunet-service-cadet_local.c
index b612be6dd..10e1a0ab4 100644
--- a/src/cadet/gnunet-service-cadet_local.c
+++ b/src/cadet/gnunet-service-cadet_local.c
@@ -771,7 +771,7 @@ get_all_tunnels_iterator (void *cls,
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNELS);
   msg.destination = *peer;
   msg.channels = htonl (GCT_count_channels (t));
-  msg.connections = htonl (GCT_count_connections (t));
+  msg.connections = htonl (GCT_count_any_connections (t));
   msg.cstate = htons ((uint16_t) GCT_get_cstate (t));
   msg.estate = htons ((uint16_t) GCT_get_estate (t));
 
@@ -900,7 +900,7 @@ handle_show_tunnel (void *cls, struct GNUNET_SERVER_Client *client,
 
   /* Initialize context */
   ch_n = GCT_count_channels (t);
-  c_n = GCT_count_connections (t);
+  c_n = GCT_count_any_connections (t);
 
   size = sizeof (struct GNUNET_CADET_LocalInfoTunnel);
   size += c_n * sizeof (struct GNUNET_CADET_Hash);
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index c037c6171..11b3fc9a8 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -1708,8 +1708,7 @@ GCP_connect (struct CadetPeer *peer)
   {
     GCD_search_stop (peer->search_h);
     peer->search_h = NULL;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "  Stopping DHT GET for peer %s\n",
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "  Stopping DHT GET for peer %s\n",
          GCP_2s (peer));
   }
 
@@ -1721,7 +1720,8 @@ GCP_connect (struct CadetPeer *peer)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
                 "  Starting DHT GET for peer %s\n", GCP_2s (peer));
     peer->search_h = GCD_search (id, &search_handler, peer);
-    if (CADET_TUNNEL_NEW == GCT_get_cstate (t))
+    if (CADET_TUNNEL_NEW == GCT_get_cstate (t)
+        || 0 == GCT_count_any_connections (t))
       GCT_change_cstate (t, CADET_TUNNEL_SEARCHING);
   }
 }
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 2d8aa90b6..6e5137925 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -2361,8 +2361,7 @@ GCT_remove_connection (struct CadetTunnel *t,
       && CADET_TUNNEL_SHUTDOWN != t->cstate
       && GNUNET_NO == shutting_down)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "  no more connections, getting new ones\n");
-    GCT_change_cstate (t, CADET_TUNNEL_SEARCHING);
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "  too few connections, getting new ones\n");
     GCP_connect (t->peer);
     return;
   }
@@ -2674,13 +2673,36 @@ GCT_use_path (struct CadetTunnel *t, struct CadetPeerPath *p)
 
 
 /**
- * Count created connections of a tunnel. Not necessarily ready connections!
+ * Count all created connections of a tunnel. Not necessarily ready connections!
  *
  * @param t Tunnel on which to count.
  *
  * @return Number of connections created, either being established or ready.
  */
 unsigned int
+GCT_count_any_connections (struct CadetTunnel *t)
+{
+  struct CadetTConnection *iter;
+  unsigned int count;
+
+  if (NULL == t)
+    return 0;
+
+  for (count = 0, iter = t->connection_head; NULL != iter; iter = iter->next)
+    count++;
+
+  return count;
+}
+
+
+/**
+ * Count established (ready) connections of a tunnel.
+ *
+ * @param t Tunnel on which to count.
+ *
+ * @return Number of connections.
+ */
+unsigned int
 GCT_count_connections (struct CadetTunnel *t)
 {
   struct CadetTConnection *iter;
@@ -2696,6 +2718,7 @@ GCT_count_connections (struct CadetTunnel *t)
   return count;
 }
 
+
 /**
  * Count channels of a tunnel.
  *
diff --git a/src/cadet/gnunet-service-cadet_tunnel.h b/src/cadet/gnunet-service-cadet_tunnel.h
index f94153258..382fcdf33 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.h
+++ b/src/cadet/gnunet-service-cadet_tunnel.h
@@ -51,7 +51,7 @@ enum CadetTunnelCState
   CADET_TUNNEL_NEW,
 
     /**
-     * Path to the peer not known yet.
+     * No path to the peer known yet.
      */
   CADET_TUNNEL_SEARCHING,
 
@@ -312,6 +312,16 @@ struct CadetConnection *
 GCT_use_path (struct CadetTunnel *t, struct CadetPeerPath *p);
 
 /**
+ * Count all created connections of a tunnel. Not necessarily ready connections!
+ *
+ * @param t Tunnel on which to count.
+ *
+ * @return Number of connections created, either being established or ready.
+ */
+unsigned int
+GCT_count_any_connections (struct CadetTunnel *t);
+
+/**
  * Count established (ready) connections of a tunnel.
  *
  * @param t Tunnel on which to count.