-make build conditional on MHD

[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 323adf38565abc5a35cbbfac1da8b3d3e2da78c8..58f0e1c9e5c1a48654bb96ad3ea8a8191dce0bd4 100644 (file)
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -46,14 +46,14 @@
 #define TEST_IP_DNS  "131.159.74.67"
 #define TEST_RECORD_CNAME_SERVER "server.gads"
 #define TEST_RECORD_CNAME_PLUS "server.+"
-#define TEST_RECORD_CNAME_ZKEY "www.188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey"
+#define TEST_RECORD_CNAME_ZKEY "www.J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey"
 #define TEST_RECORD_CNAME_DNS "gnunet.org"
 #define TEST_RECORD_NAME_SERVER "server"
 #define TEST_RECORD_NAME_PLUS "www"
 #define TEST_RECORD_NAME_ZKEY "www2"
 #define TEST_RECORD_NAME_DNS "www3"
 
-#define KEYFILE_BOB "zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey"
+#define KEYFILE_BOB "zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey"
 
 
 /* Task handle to use to schedule test failure */
@@ -132,7 +132,7 @@ on_lookup_result_cname (void *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_CNAME)
+      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_CNAME)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "CNAME: %s\n", rd[i].data);
         if (0 == strcmp(rd[i].data, TEST_RECORD_CNAME_SERVER))
@@ -173,7 +173,7 @@ on_lookup_result_dns (void *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)
+      if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
       {
        memcpy(&a, rd[i].data, sizeof(a));
        addr = inet_ntoa(a);
@@ -191,7 +191,7 @@ on_lookup_result_dns (void *cls,
       }
     }
   }
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_CNAME,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_DNSPARSER_TYPE_CNAME,
                      GNUNET_YES,
                      NULL,
                      &on_lookup_result_cname, TEST_DOMAIN_PLUS);
@@ -221,7 +221,7 @@ on_lookup_result_zkey (void *cls, uint32_t rd_count,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "type: %d\n", rd[i].record_type);
-    if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+    if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
     {
       memcpy (&a, rd[i].data, sizeof(a));
       addr = inet_ntoa(a);
@@ -241,7 +241,7 @@ on_lookup_result_zkey (void *cls, uint32_t rd_count,
                  "No resolution!\n");
     }
   }  
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_A,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_DNS, GNUNET_DNSPARSER_TYPE_A,
                     GNUNET_YES,
                     NULL,
                     &on_lookup_result_dns, TEST_DOMAIN_DNS);
@@ -269,7 +269,7 @@ on_lookup_result_plus (void *cls, uint32_t rd_count,
   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)
+    if (rd[i].record_type == GNUNET_DNSPARSER_TYPE_A)
     {
       memcpy(&a, rd[i].data, sizeof(a));
       addr = inet_ntoa(a);
@@ -286,7 +286,7 @@ on_lookup_result_plus (void *cls, uint32_t rd_count,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
     }
   }
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_A,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ZKEY, GNUNET_DNSPARSER_TYPE_A,
                     GNUNET_YES,
                     NULL,
                     &on_lookup_result_zkey, TEST_DOMAIN_ZKEY);
@@ -322,7 +322,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_A,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_DNSPARSER_TYPE_A,
                     GNUNET_YES,
                     NULL,
                     &on_lookup_result_plus, TEST_DOMAIN_PLUS);
@@ -334,7 +334,7 @@ do_check (void *cls,
           const struct GNUNET_CONFIGURATION_Handle *ccfg,
           struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded alice_pkey;
+  struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
   struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
   struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
   char* alice_keyfile;
@@ -387,7 +387,7 @@ do_check (void *cls,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_PLUS);
   rd.data = TEST_RECORD_CNAME_PLUS;
-  rd.record_type = GNUNET_GNS_RECORD_CNAME;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_CNAME;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                            alice_key,
@@ -398,7 +398,7 @@ do_check (void *cls,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_ZKEY);
   rd.data = TEST_RECORD_CNAME_ZKEY;
-  rd.record_type = GNUNET_GNS_RECORD_CNAME;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_CNAME;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                            alice_key,
@@ -409,7 +409,7 @@ do_check (void *cls,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_DNS);
   rd.data = TEST_RECORD_CNAME_DNS;
-  rd.record_type = GNUNET_GNS_RECORD_CNAME;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_CNAME;
 
   GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
                                            alice_key,