[GNUnet-SVN] r34869 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-01-09 19:04:39 +0100 (Fri, 09 Jan 2015)
New Revision: 34869

Modified:
   gnunet/src/cadet/gnunet-service-cadet_dht.c
   gnunet/src/cadet/gnunet-service-cadet_peer.c
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- minor log modifications, docs

Modified: gnunet/src/cadet/gnunet-service-cadet_dht.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_dht.c 2015-01-09 18:04:37 UTC (rev 
34868)
+++ gnunet/src/cadet/gnunet-service-cadet_dht.c 2015-01-09 18:04:39 UTC (rev 
34869)
@@ -373,6 +373,7 @@
   return h;
 }
 
+
 void
 GCD_search_stop (struct GCD_search_handle *h)
 {

Modified: gnunet/src/cadet/gnunet-service-cadet_peer.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-01-09 18:04:37 UTC 
(rev 34868)
+++ gnunet/src/cadet/gnunet-service-cadet_peer.c        2015-01-09 18:04:39 UTC 
(rev 34869)
@@ -1804,10 +1804,10 @@
 
   if (NULL != peer->search_h && GNUNET_YES == rerun_search)
   {
+    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;
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "  Stopping DHT GET for peer %s\n",
-         GCP_2s (peer));
   }
 
   if (NULL == peer->search_h)
@@ -1815,8 +1815,6 @@
     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))

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-01-09 18:04:37 UTC 
(rev 34868)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-01-09 18:04:39 UTC 
(rev 34869)
@@ -1383,7 +1383,7 @@
   }
   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 @@
   /* 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;
   }