fix

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

diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c
index 890347bc6e34f1de4d5a63b46948c8d56f0cc8f8..440568509c0ea1da62e92e68352bf6b16211fb2c 100644 (file)
--- a/src/gns/test_gns_ns_lookup.c
+++ b/src/gns/test_gns_ns_lookup.c
@@ -110,7 +110,7 @@ on_lookup_result_alt2 (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_TYPE_A)
+      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -154,7 +154,7 @@ on_lookup_result_alt (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_TYPE_A)
+      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -173,7 +173,7 @@ on_lookup_result_alt (void *cls, uint32_t rd_count,
     }
   }
 
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_TYPE_A,
+  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
                     GNUNET_YES,
                     NULL,
                     &on_lookup_result_alt2, TEST_DOMAIN_ALT2);
@@ -200,7 +200,7 @@ on_lookup_result(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_TYPE_A)
+      if (rd[i].record_type == GNUNET_GNS_RECORD_A)
       {
         memcpy(&a, rd[i].data, sizeof(a));
         addr = inet_ntoa(a);
@@ -219,7 +219,7 @@ on_lookup_result(void *cls, uint32_t rd_count,
     }
   }
 
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_TYPE_A,
+  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_A,
                     GNUNET_YES,
                     NULL,
                     &on_lookup_result_alt, TEST_DOMAIN_ALT);
@@ -231,6 +231,7 @@ start_lookup (void)
 {
 
   
+  GNUNET_NAMESTORE_disconnect (namestore_handle);
   gns_handle = GNUNET_GNS_connect (cfg);
 
   if (NULL == gns_handle)
@@ -240,7 +241,7 @@ start_lookup (void)
     ok = 2;
   }
 
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
                      GNUNET_YES,
                      NULL,
                      &on_lookup_result, TEST_DOMAIN);
@@ -289,7 +290,6 @@ static void
 commence_testing (void *cls, int32_t success, const char *emsg)
 {
   
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
   resolver_working = GNUNET_NO;
 
   GNUNET_RESOLVER_connect (cfg);
@@ -386,7 +386,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
 
   rd.data_size = strlen (TEST_RECORD_NS);
   rd.data = TEST_RECORD_NS;
-  rd.record_type = GNUNET_GNS_RECORD_TYPE_NS;
+  rd.record_type = GNUNET_GNS_RECORD_NS;
  
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   alice_key,