[GNUnet-SVN] r29399 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-09-18 19:24:27 +0200 (Wed, 18 Sep 2013)
New Revision: 29399

Modified:
   gnunet/src/gns/gnunet-gns-proxy.c
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-fix double cleanup

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 17:11:26 UTC (rev 29398)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 17:24:27 UTC (rev 29399)
@@ -1615,6 +1615,8 @@
        return NULL;
       }
       s5r->url = GNUNET_strdup (url);
+      GNUNET_SCHEDULER_cancel (s5r->timeout_task);
+      s5r->timeout_task = GNUNET_SCHEDULER_NO_TASK;
       return s5r;
     }
   }

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-18 17:11:26 UTC 
(rev 29398)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-18 17:24:27 UTC 
(rev 29399)
@@ -580,6 +580,9 @@
       i++;
     }
     GNUNET_assert (i == n);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+               "Transmitting standard DNS result with %u records\n",
+               n);
     rh->proc (rh->proc_cls,
              n,
              rd);
@@ -1755,7 +1758,10 @@
     default:
       af = AF_UNSPEC;
       break;
-    }
+    }  
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+               "Doing standard DNS lookup for `%s'\n",
+               rh->name);
     rh->std_resolve = GNUNET_RESOLVER_ip_get (rh->name, 
                                              af,
                                              DNS_LOOKUP_TIMEOUT,