-fixes
[oweals/gnunet.git] / src / gns / test_gns_pseu_shorten.c
index e0a6760e42d6c9bbda867bf17324bf8474e02820..5caf2396e5a1d70d899fab3fb429fdf41461fefe 100644 (file)
@@ -54,6 +54,9 @@
 
 #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
+#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
+#define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"
+
 /* Globals */
 
 /**
  */
 static char *test_directory;
 
-struct GNUNET_TESTING_Daemon *d1;
-
+static struct GNUNET_TESTING_PeerGroup *pg;
 
 /* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier disco_task;
 
 /* Global return value (0 for success, anything else for failure) */
 static int ok;
@@ -93,6 +97,14 @@ struct GNUNET_CRYPTO_ShortHashCode bob_hash;
 void
 shutdown_callback (void *cls, const char *emsg)
 {
+  if (disco_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    disco_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_cancel(disco_task);
+    GNUNET_DHT_disconnect(dht_handle);
+    dht_handle = NULL;
+  }
+
   if (emsg != NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
@@ -103,6 +115,14 @@ shutdown_callback (void *cls, const char *emsg)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
 }
 
+static void
+disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  disco_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_DHT_disconnect(dht_handle);
+  dht_handle = NULL;
+}
+
 /**
  * Called when gns shorten finishes
  */
@@ -110,6 +130,7 @@ static void
 process_shorten_result(void* cls, const char* sname)
 {
   GNUNET_GNS_disconnect(gns_handle);
+  //GNUNET_SCHEDULER_add_now(disco_dht, NULL);
   ok = 0;
 
   if (sname == NULL)
@@ -134,8 +155,7 @@ process_shorten_result(void* cls, const char* sname)
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
-  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
-                              GNUNET_YES, GNUNET_NO);
+  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
 }
 
 static void
@@ -196,7 +216,8 @@ on_lookup_result(void *cls, uint32_t rd_count,
 static void
 commence_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_DHT_disconnect(dht_handle);
+  GNUNET_SCHEDULER_add_now(disco_dht, NULL);
+  //GNUNET_DHT_disconnect(dht_handle);
 
   GNUNET_CRYPTO_rsa_key_free(our_key);
   GNUNET_CRYPTO_rsa_key_free(bob_key);
@@ -219,27 +240,22 @@ commence_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * down the peers without freeing memory associated with GET request.
  */
 static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-
-  if (d1 != NULL)
-    GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
-                                GNUNET_YES, GNUNET_NO);
-  GNUNET_SCHEDULER_cancel (die_task);
-}
-
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
               (char *) cls);
-  GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
   ok = 1;
+  
+  if (disco_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    disco_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_cancel(disco_task);
+    GNUNET_DHT_disconnect(dht_handle);
+    dht_handle = NULL;
+  }
+  if (pg != NULL)
+    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_SCHEDULER_cancel (die_task);
 }
 
 static void
@@ -480,13 +496,14 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
 
 static void
 do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
-          const struct GNUNET_CONFIGURATION_Handle *cfg,
+          const struct GNUNET_CONFIGURATION_Handle *_cfg,
           struct GNUNET_TESTING_Daemon *d, const char *emsg)
 {
   
   
   char* our_keyfile;
   
+  cfg = _cfg;
 
   GNUNET_SCHEDULER_cancel (die_task);
 
@@ -518,8 +535,8 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
   }
 
   our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile);
-  bob_key = GNUNET_CRYPTO_rsa_key_create ();
-  alice_key = GNUNET_CRYPTO_rsa_key_create ();
+  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
+  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_ALICE);
   
   GNUNET_free(our_keyfile);
 
@@ -566,8 +583,11 @@ run (void *cls, char *const *args, const char *cfgfile,
                                     "didn't start all daemons in reasonable amount of time!!!");
   
   /* Start alice */
-  d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
-                                   NULL, NULL, NULL, &do_lookup, NULL);
+  //d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
+  //                                 NULL, NULL, NULL, &do_lookup, NULL);
+  pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
+                                    NULL, NULL, &do_lookup, NULL,
+                                    NULL, NULL, NULL);
 }
 
 static int
@@ -595,7 +615,7 @@ check ()
   if (ret != GNUNET_OK)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`test-gns-dht-delegated-lookup': Failed with error code %d\n", ret);
+                "`test-gns-pseu-shorten': Failed with error code %d\n", ret);
   }
   return ok;
 }
@@ -605,7 +625,7 @@ main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup ("test-gns-simple-lookup",
+  GNUNET_log_setup ("test-gns-pseu-shorten",
 #if VERBOSE
                     "DEBUG",
 #else