From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Thu, 6 Sep 2012 16:20:00 +0000 (+0000)
Subject: -fix to api
X-Git-Tag: initial-import-from-subversion-38251~11910
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a478592e836e5082291bf1cc02b3deb2f2062159;p=oweals%2Fgnunet.git

-fix to api
---

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 1503dc104..0a91afc06 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -261,6 +261,7 @@ reconnect (struct GNUNET_GNS_Handle *h)
              "Trying to connect to GNS...\n");
   h->client = GNUNET_CLIENT_connect ("gns", h->cfg);
   GNUNET_assert (NULL != h->client);
+  process_pending_messages (h);
 }
 
 /**
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 204cbc29e..243b6ced0 100644
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -40,7 +40,7 @@
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
 
-#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
 
 /* If number of peers not in config file, use this number */
 #define DEFAULT_NUM_PEERS 2
@@ -134,7 +134,6 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test failed \n");
-  GNUNET_break (0);
   GNUNET_SCHEDULER_shutdown ();
   ok = 1;
 }
@@ -502,6 +501,12 @@ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
   else
     res = setup_alice (pinfo->result.cfg);
   
+  if (get_cfg_ops[0] == op)
+    get_cfg_ops[0] = NULL;
+  else if (get_cfg_ops[1] == op)
+    get_cfg_ops[1] = NULL;
+  else
+    get_cfg_ops[2] = NULL;
   GNUNET_TESTBED_operation_done (op);
   op = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "A \n");