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

[gnunet]

Author: grothoff
Date: 2013-09-18 19:38:39 +0200 (Wed, 18 Sep 2013)
New Revision: 29401

Modified:
   gnunet/src/gns/gnunet-gns-proxy.c
   gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-logging, bugfixes

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 17:38:24 UTC (rev 29400)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 17:38:39 UTC (rev 29401)
@@ -1638,7 +1638,10 @@
   GNUNET_free_non_null (hd->domain);
   MHD_stop_daemon (hd->daemon);
   if (GNUNET_SCHEDULER_NO_TASK != hd->httpd_task)
+  {
     GNUNET_SCHEDULER_cancel (hd->httpd_task);
+    hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_free_non_null (hd->proxy_cert);
   if (hd == httpd)
     httpd = NULL;
@@ -1657,7 +1660,8 @@
                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct MhdHttpList *hd = cls;
-  
+
+  hd->httpd_task = GNUNET_SCHEDULER_NO_TASK;
   kill_httpd (hd);
 }
 

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-18 17:38:24 UTC 
(rev 29400)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-18 17:38:39 UTC 
(rev 29401)
@@ -638,9 +638,12 @@
   const struct sockaddr_in *sa4;
   const struct sockaddr_in6 *sa6;
 
-  rh->std_resolve = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received %u bytes of DNS IP data\n",
+             addrlen);
   if (NULL == addr)
   {
+    rh->std_resolve = NULL;
     transmit_lookup_dns_result (rh);
     return;
   }
@@ -1916,6 +1919,8 @@
   }
   if (NULL != rh->std_resolve)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Canceling standard DNS resolution\n");
     GNUNET_RESOLVER_request_cancel (rh->std_resolve);
     rh->std_resolve = NULL;
   }