aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet')
-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,
373 return h; 373 return h;
374} 374}
375 375
376
376void 377void
377GCD_search_stop (struct GCD_search_handle *h) 378GCD_search_stop (struct GCD_search_handle *h)
378{ 379{
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)
1804 1804
1805 if (NULL != peer->search_h && GNUNET_YES == rerun_search) 1805 if (NULL != peer->search_h && GNUNET_YES == rerun_search)
1806 { 1806 {
1807 GCD_search_stop (peer->search_h);
1808 peer->search_h = NULL;
1809 LOG (GNUNET_ERROR_TYPE_DEBUG, " Stopping DHT GET for peer %s\n", 1807 LOG (GNUNET_ERROR_TYPE_DEBUG, " Stopping DHT GET for peer %s\n",
1810 GCP_2s (peer)); 1808 GCP_2s (peer));
1809 GCD_search_stop (peer->search_h);
1810 peer->search_h = NULL;
1811 } 1811 }
1812 1812
1813 if (NULL == peer->search_h) 1813 if (NULL == peer->search_h)
@@ -1815,8 +1815,6 @@ GCP_connect (struct CadetPeer *peer)
1815 const struct GNUNET_PeerIdentity *id; 1815 const struct GNUNET_PeerIdentity *id;
1816 1816
1817 id = GNUNET_PEER_resolve2 (peer->id); 1817 id = GNUNET_PEER_resolve2 (peer->id);
1818 LOG (GNUNET_ERROR_TYPE_DEBUG,
1819 " Starting DHT GET for peer %s\n", GCP_2s (peer));
1820 peer->search_h = GCD_search (id, &search_handler, peer); 1818 peer->search_h = GCD_search (id, &search_handler, peer);
1821 if (CADET_TUNNEL_NEW == GCT_get_cstate (t) 1819 if (CADET_TUNNEL_NEW == GCT_get_cstate (t)
1822 || 0 == GCT_count_any_connections (t)) 1820 || 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,
1383 } 1383 }
1384 type = ntohs (message->type); 1384 type = ntohs (message->type);
1385 1385
1386 /* Even if tunnel is being destroyed, send anyway. 1386 /* Even if tunnel is "being destroyed", send anyway.
1387 * Could be a response to a rekey initiated by remote peer, 1387 * Could be a response to a rekey initiated by remote peer,
1388 * who is trying to create a new channel! 1388 * who is trying to create a new channel!
1389 */ 1389 */
@@ -1391,14 +1391,12 @@ send_kx (struct CadetTunnel *t,
1391 /* Must have a connection, or be looking for one. */ 1391 /* Must have a connection, or be looking for one. */
1392 if (NULL == t->connection_head) 1392 if (NULL == t->connection_head)
1393 { 1393 {
1394 LOG (GNUNET_ERROR_TYPE_DEBUG, "%s while no connection\n", GC_m2s (type));
1394 if (CADET_TUNNEL_SEARCHING != t->cstate) 1395 if (CADET_TUNNEL_SEARCHING != t->cstate)
1395 { 1396 {
1396 LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n");
1397 GNUNET_break (0); 1397 GNUNET_break (0);
1398 LOG (GNUNET_ERROR_TYPE_ERROR, "no connection, sending %s\n", GC_m2s (type));
1399 GCT_debug (t, GNUNET_ERROR_TYPE_ERROR); 1398 GCT_debug (t, GNUNET_ERROR_TYPE_ERROR);
1400 GCP_debug (t->peer, GNUNET_ERROR_TYPE_ERROR); 1399 GCP_debug (t->peer, GNUNET_ERROR_TYPE_ERROR);
1401 LOG (GNUNET_ERROR_TYPE_ERROR, "\n\n\n");
1402 } 1400 }
1403 return NULL; 1401 return NULL;
1404 } 1402 }