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

[gnunet]

Author: schanzen
Date: 2012-03-15 11:00:34 +0100 (Thu, 15 Mar 2012)
New Revision: 20510

Modified:
   gnunet/src/gns/gns_api.c
   gnunet/src/gns/test_gns_simple_lookup.c
Log:
-fix


Modified: gnunet/src/gns/gns_api.c
===================================================================
--- gnunet/src/gns/gns_api.c    2012-03-15 09:34:11 UTC (rev 20509)
+++ gnunet/src/gns/gns_api.c    2012-03-15 10:00:34 UTC (rev 20510)
@@ -468,7 +468,7 @@
               "Got message\n");
   if (msg == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
          "Error receiving data from GNS service, reconnecting\n");
     force_reconnect (handle);
     return;
@@ -489,6 +489,7 @@
       GNUNET_break_op (0);
       GNUNET_CLIENT_receive (handle->client, &process_message, handle,
                              GNUNET_TIME_UNIT_FOREVER_REL);
+      return;
     }
 
     for (qe = handle->lookup_head; qe != NULL; qe = qe->next)
@@ -515,6 +516,7 @@
       GNUNET_break_op (0);
       GNUNET_CLIENT_receive (handle->client, &process_message, handle,
                              GNUNET_TIME_UNIT_FOREVER_REL);
+      return;
     }
 
     for (qe = handle->shorten_head; qe != NULL; qe = qe->next)
@@ -539,6 +541,7 @@
       GNUNET_break_op (0);
       GNUNET_CLIENT_receive (handle->client, &process_message, handle,
                              GNUNET_TIME_UNIT_FOREVER_REL);
+      return;
     }
 
     for (qe = handle->get_auth_head; qe != NULL; qe = qe->next)
@@ -587,9 +590,15 @@
  * @param handle handle of the GNS connection to stop
  */
 void
-GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
+GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *h)
 {
-  GNUNET_CLIENT_disconnect (handle->client, 0);
+  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+  if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (h->reconnect_task);
+    h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  GNUNET_free(h);
   /* disco from GNS */
 }
 

Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c     2012-03-15 09:34:11 UTC (rev 
20509)
+++ gnunet/src/gns/test_gns_simple_lookup.c     2012-03-15 10:00:34 UTC (rev 
20510)
@@ -137,6 +137,7 @@
       }
     }
   }
+  GNUNET_GNS_disconnect(gns_handle);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
   GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
                               GNUNET_YES, GNUNET_NO);