summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cadet/gnunet-service-cadet_dht.c1
-rw-r--r--src/cadet/gnunet-service-cadet_peer.c6
-rw-r--r--src/cadet/gnunet-service-cadet_tunnel.c6
3 files changed, 5 insertions, 8 deletions
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index d6228110f..4896a28e4 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -373,6 +373,7 @@ GCD_search (const struct GNUNET_PeerIdentity *peer_id,
return h;
}
+
void
GCD_search_stop (struct GCD_search_handle *h)
{
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 5ad4fffc8..396ebeb82 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -1804,10 +1804,10 @@ GCP_connect (struct CadetPeer *peer)
if (NULL != peer->search_h && GNUNET_YES == rerun_search)
{
- GCD_search_stop (peer->search_h);
- peer->search_h = NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG, " Stopping DHT GET for peer %s\n",
GCP_2s (peer));
+ GCD_search_stop (peer->search_h);
+ peer->search_h = NULL;
}
if (NULL == peer->search_h)
@@ -1815,8 +1815,6 @@ GCP_connect (struct CadetPeer *peer)
const struct GNUNET_PeerIdentity *id;
id = GNUNET_PEER_resolve2 (peer->id);
- 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)
|| 0 == GCT_count_any_connections (t))
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 3a826a98c..e699740ce 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1383,7 +1383,7 @@ send_kx (struct CadetTunnel *t,
}
type = ntohs (message->type);
- /* Even if tunnel is being destroyed, send anyway.
+ /* Even if tunnel is "being destroyed", send anyway.
* Could be a response to a rekey initiated by remote peer,
* who is trying to create a new channel!
*/
@@ -1391,14 +1391,12 @@ send_kx (struct CadetTunnel *t,
/* Must have a connection, or be looking for one. */
if (NULL == t->connection_head)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%s while no connection\n", GC_m2s (type));
if (CADET_TUNNEL_SEARCHING != t->cstate)
{
- LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n");
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_ERROR, "no connection, sending %s\n", GC_m2s (type));
GCT_debug (t, GNUNET_ERROR_TYPE_ERROR);
GCP_debug (t->peer, GNUNET_ERROR_TYPE_ERROR);
- LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n");
}
return NULL;
}