-fix

[oweals/gnunet.git] / src / gns / test_gns_cname_lookup.c

diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c
index 5a864b5563daef4e5dd8d0371735b0dff20d9474..4d15175e1377f61155502ecb8be04448e33e764b 100644 (file)
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -23,7 +23,7 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
@@ -94,14 +94,6 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-static void
-end_badly_now ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-}
-
-
 static void 
 shutdown_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -172,8 +164,7 @@ on_lookup_result_dns (void *cls,
   if (rd_count == 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Lookup failed, rp_filtering?\n");
-    ok = 2;
+                "CNAME to DNS delegation failed. System offline?\n");
   }
   else
   {
@@ -184,19 +175,19 @@ on_lookup_result_dns (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
       if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
-        memcpy(&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
-        if (0 == strcmp(addr, TEST_IP_DNS))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
-          ok = 0;
-        }
+       memcpy(&a, rd[i].data, sizeof(a));
+       addr = inet_ntoa(a);
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+       if (0 == strcmp(addr, TEST_IP_DNS))
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                     "%s correctly resolved to %s!\n", TEST_DOMAIN_DNS, addr);
+         ok = 0;
+       }
       }
       else
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
       }
     }
   }
@@ -220,37 +211,36 @@ on_lookup_result_zkey (void *cls, uint32_t rd_count,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Lookup failed, rp_filtering?\n");
     ok = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
-  else
+  ok = 1;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+             "name: %s\n", (char*)cls);
+  for (i=0; i<rd_count; i++)
   {
-    ok = 1;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-               "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
+               "type: %d\n", rd[i].record_type);
+    if (rd[i].record_type == GNUNET_GNS_RECORD_A)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
-      {
-        memcpy (&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-                   "address: %s\n", addr);
-        if (0 == strcmp (addr, TEST_IP_ZKEY))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                     "%s correctly resolved to %s!\n", 
-                     TEST_DOMAIN_ZKEY, addr);
-          ok = 0;
-        }
-      }
-      else
+      memcpy (&a, rd[i].data, sizeof(a));
+      addr = inet_ntoa(a);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+                 "address: %s\n", addr);
+      if (0 == strcmp (addr, TEST_IP_ZKEY))
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                   "No resolution!\n");
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                   "%s correctly resolved to %s!\n", 
+                   TEST_DOMAIN_ZKEY, addr);
+       ok = 0;
       }
     }
-  
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 "No resolution!\n");
+    }
+  }  
   GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_A,
                     GNUNET_YES,
                     NULL,
@@ -271,31 +261,30 @@ on_lookup_result_plus (void *cls, uint32_t rd_count,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Lookup failed, rp_filtering?\n");
     ok = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
-  else
+  ok = 1;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
+  for (i=0; i<rd_count; i++)
   {
-    ok = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
-    for (i=0; i<rd_count; i++)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
+    if (rd[i].record_type == GNUNET_GNS_RECORD_A)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
-      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+      memcpy(&a, rd[i].data, sizeof(a));
+      addr = inet_ntoa(a);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+      if (0 == strcmp(addr, TEST_IP_PLUS))
       {
-        memcpy(&a, rd[i].data, sizeof(a));
-        addr = inet_ntoa(a);
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
-        if (0 == strcmp(addr, TEST_IP_PLUS))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "%s correctly resolved to %s!\n", TEST_DOMAIN_PLUS, addr);
-          ok = 0;
-        }
-      }
-      else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                   "%s correctly resolved to %s!\n", TEST_DOMAIN_PLUS, addr);
+       ok = 0;
       }
     }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
+    }
   }
   GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_A,
                     GNUNET_YES,
@@ -322,7 +311,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to store record in namestore: %s\n",
                emsg);
-    end_badly_now ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   gns_handle = GNUNET_GNS_connect(cfg);
@@ -330,7 +319,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to GNS!\n");
-    end_badly_now ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_A,
@@ -345,9 +334,9 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-  struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-  struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
+  struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
   struct GNUNET_NAMESTORE_RecordData rd;
   const char* ip = TEST_IP_PLUS;
@@ -362,7 +351,7 @@ do_check (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
                "Failed to connect to namestore\n");
-    end_badly_now ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
@@ -372,15 +361,15 @@ do_check (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                "Failed to get key from cfg\n");
-    end_badly_now ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
-  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
+  alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
+  GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
   GNUNET_free(alice_keyfile);
 
-  bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
+  bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
 
   rd.expiration_time = UINT64_MAX;
   GNUNET_assert(1 == inet_pton (AF_INET, ip, &web));
@@ -440,8 +429,8 @@ do_check (void *cls,
                                  &rd,
                                  &commence_testing,
                                  NULL);
-  GNUNET_CRYPTO_rsa_key_free(alice_key);
-  GNUNET_CRYPTO_rsa_key_free(bob_key);
+  GNUNET_CRYPTO_ecc_key_free(alice_key);
+  GNUNET_CRYPTO_ecc_key_free(bob_key);
 }