X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Ftest_gns_cname_lookup.c;h=643a79033d9933816ca9f05e4d8f5d61b24019ab;hb=39850a9dc3d789303b91816275314898c0ae80e2;hp=f1045fda733f6a2e306556e5b3d1ca0487aae91d;hpb=146d71432ed366ccd3e576f4b3e261ace67cf757;p=oweals%2Fgnunet.git

diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c
index f1045fda7..643a79033 100644
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -20,10 +20,10 @@
 /**
  * @file gns/test_gns_cname_lookup.c
  * @brief base testcase for testing a local GNS record lookup
- *
+ * @author Martin Schanzenbach
  */
 #include "platform.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testing_lib-new.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
@@ -31,23 +31,20 @@
 #include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
 
-/* DEFINES */
-#define VERBOSE GNUNET_YES
 
-/* Timeout for entire testcase */
+/**
+ * Timeout for entire testcase 
+ */
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
-/* If number of peers not in config file, use this number */
-#define DEFAULT_NUM_PEERS 2
-
 /* test records to resolve */
-#define TEST_DOMAIN_PLUS "www.gnunet"
-#define TEST_DOMAIN_ZKEY "www2.gnunet"
-#define TEST_DOMAIN_DNS  "www3.gnunet"
+#define TEST_DOMAIN_PLUS "www.gads"
+#define TEST_DOMAIN_ZKEY "www2.gads"
+#define TEST_DOMAIN_DNS  "www3.gads"
 #define TEST_IP_PLUS "127.0.0.1"
 #define TEST_IP_ZKEY "127.0.0.2"
 #define TEST_IP_DNS  "131.159.74.67"
-#define TEST_RECORD_CNAME_SERVER "server.gnunet"
+#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_DNS "gnunet.org"
@@ -58,17 +55,9 @@
 
 #define KEYFILE_BOB "zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey"
 
-/* Globals */
-
-/**
- * Directory to store temp data in, defined in config file
- */
-static char *test_directory;
-
-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;
 
 /* Global return value (0 for success, anything else for failure) */
 static int ok;
@@ -77,31 +66,59 @@ static struct GNUNET_NAMESTORE_Handle *namestore_handle;
 
 static struct GNUNET_GNS_Handle *gns_handle;
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
 
 /**
- * Check whether peers successfully shut down.
+ * 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.
  */
-void
-shutdown_callback (void *cls, const char *emsg)
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (emsg != NULL)
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != gns_handle)
+  {
+    GNUNET_GNS_disconnect (gns_handle);
+    gns_handle = NULL;
+  }
+  if (NULL != namestore_handle)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
-    if (ok == 0)
-      ok = 2;
+    GNUNET_NAMESTORE_disconnect (namestore_handle);
+    namestore_handle = NULL;
   }
+  GNUNET_break (0);
+  GNUNET_SCHEDULER_shutdown ();
+  ok = 1;
+}
+
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+static void 
+shutdown_task (void *cls,
+	       const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_GNS_disconnect (gns_handle);
+  gns_handle = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
 static void
-on_lookup_result_cname (void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+on_lookup_result_cname (void *cls, 
+			uint32_t rd_count,
+			const struct GNUNET_NAMESTORE_RecordData *rd)
 {
-  int i;
+  uint32_t i;
   
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  GNUNET_NAMESTORE_disconnect (namestore_handle);
+  namestore_handle = NULL;
   if (rd_count == 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -115,7 +132,7 @@ on_lookup_result_cname (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_CNAME)
+      if (rd[i].record_type == GNUNET_GNS_RECORD_CNAME)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "CNAME: %s\n", rd[i].data);
         if (0 == strcmp(rd[i].data, TEST_RECORD_CNAME_SERVER))
@@ -131,24 +148,23 @@ on_lookup_result_cname (void *cls, uint32_t rd_count,
       }
     }
   }
-  GNUNET_GNS_disconnect(gns_handle);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
-  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
+
 static void
-on_lookup_result_dns (void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+on_lookup_result_dns (void *cls,
+		      uint32_t rd_count,
+		      const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct in_addr a;
-  int i;
+  uint32_t i;
   char* addr;
   
   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
   {
@@ -157,37 +173,37 @@ on_lookup_result_dns (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);
-        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");
       }
     }
   }
-
-  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_TYPE_CNAME,
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_CNAME,
                      GNUNET_YES,
                      NULL,
                      &on_lookup_result_cname, TEST_DOMAIN_PLUS);
 }
 
+
 static void
 on_lookup_result_zkey (void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+		       const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct in_addr a;
-  int i;
+  uint32_t i;
   char* addr;
   
   if (rd_count == 0)
@@ -195,45 +211,49 @@ 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++)
+    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_TYPE_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))
       {
-        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
-      {
-        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;
       }
     }
-  }
-
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_TYPE_A,
-                    GNUNET_YES,
-                    NULL,
-                    &on_lookup_result_dns, TEST_DOMAIN_DNS);
+    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,
+		     &on_lookup_result_dns, TEST_DOMAIN_DNS);
 }
 
+
 static void
 on_lookup_result_plus (void *cls, uint32_t rd_count,
-                 const struct GNUNET_NAMESTORE_RecordData *rd)
+		       const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   struct in_addr a;
-  int i;
+  uint32_t i;
   char* addr;
   
   if (rd_count == 0)
@@ -241,119 +261,97 @@ 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_TYPE_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))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "%s correctly resolved to %s!\n", TEST_DOMAIN_PLUS, 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_PLUS))
       {
-        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_TYPE_A,
-                    GNUNET_YES,
-                    NULL,
-                    &on_lookup_result_zkey, TEST_DOMAIN_ZKEY);
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_A,
+		     GNUNET_YES,
+		     NULL,
+		     &on_lookup_result_zkey, TEST_DOMAIN_ZKEY);
 }
 
 
-static void
-disco_ns (void* cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_NAMESTORE_disconnect (namestore_handle);
-}
-
 /**
  * Function scheduled to be run on the successful start of services
  * tries to look up the dns record for TEST_DOMAIN
+ *
+ * @param cls closure
+ * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
+ *                GNUNET_NO if content was already there or not found
+ *                GNUNET_YES (or other positive value) on success
+ * @param emsg NULL on success, otherwise an error message
  */
 static void
 commence_testing (void *cls, int32_t success, const char *emsg)
 {
-  
-  GNUNET_SCHEDULER_add_now (disco_ns, NULL);
-  
+  if (NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to store record in namestore: %s\n",
+		emsg);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   gns_handle = GNUNET_GNS_connect(cfg);
-
   if (NULL == gns_handle)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to GNS!\n");
-    ok = 2;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
-
-  GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_TYPE_A,
-                    GNUNET_YES,
-                    NULL,
-                    &on_lookup_result_plus, TEST_DOMAIN_PLUS);
-}
-
-
-/**
- * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
- * down the peers without freeing memory associated with GET request.
- */
-static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-
-  if (pg != NULL)
-    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_SCHEDULER_cancel (die_task);
+  GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_A,
+		     GNUNET_YES,
+		     NULL,
+		     &on_lookup_result_plus, TEST_DOMAIN_PLUS);
 }
 
-/**
- * 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;
-}
 
 static void
-do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
-          const struct GNUNET_CONFIGURATION_Handle *_cfg,
-          struct GNUNET_TESTING_Daemon *d, const char *emsg)
+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;
   char* alice_keyfile;
+  struct GNUNET_NAMESTORE_RecordData rd;
+  const char* ip = TEST_IP_PLUS;
+  struct in_addr web;
   
-  cfg = _cfg;
-
-  GNUNET_SCHEDULER_cancel (die_task);
+  cfg = ccfg;
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
   /* put records into namestore */
   namestore_handle = GNUNET_NAMESTORE_connect(cfg);
   if (NULL == namestore_handle)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    ok = -1;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+		"Failed to connect to namestore\n");
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
@@ -361,26 +359,22 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
                                                           "ZONEKEY",
                                                           &alice_keyfile))
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    ok = -1;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+		"Failed to get key from cfg\n");
+    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);
-  
   GNUNET_free(alice_keyfile);
 
   bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
 
-  struct GNUNET_NAMESTORE_RecordData rd;
-  char* ip = TEST_IP_PLUS;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
   rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
+  GNUNET_assert(1 == inet_pton (AF_INET, ip, &web));
   rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
+  rd.data = &web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
 
@@ -393,7 +387,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_PLUS);
   rd.data = TEST_RECORD_CNAME_PLUS;
-  rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+  rd.record_type = GNUNET_GNS_RECORD_CNAME;
 
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   alice_key,
@@ -404,7 +398,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_ZKEY);
   rd.data = TEST_RECORD_CNAME_ZKEY;
-  rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+  rd.record_type = GNUNET_GNS_RECORD_CNAME;
 
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   alice_key,
@@ -415,7 +409,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
 
   rd.data_size = strlen (TEST_RECORD_CNAME_DNS);
   rd.data = TEST_RECORD_CNAME_DNS;
-  rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+  rd.record_type = GNUNET_GNS_RECORD_CNAME;
 
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   alice_key,
@@ -424,98 +418,32 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
                                   NULL,
                                   NULL);
 
-  GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP_ZKEY, web));
+  GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP_ZKEY, &web));
   rd.data_size = sizeof(struct in_addr);
-  rd.data = web;
+  rd.data = &web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
   
   GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  bob_key,
-                                  TEST_RECORD_NAME_PLUS,
-                                  &rd,
-                                  &commence_testing,
-                                  NULL);
-  
+				  bob_key,
+				  TEST_RECORD_NAME_PLUS,
+				  &rd,
+				  &commence_testing,
+				  NULL);
   GNUNET_CRYPTO_rsa_key_free(alice_key);
   GNUNET_CRYPTO_rsa_key_free(bob_key);
-  GNUNET_free(web);
-
 }
 
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  cfg = c;
-   /* Get path from configuration file */
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
-                                             &test_directory))
-  {
-    ok = 404;
-    return;
-  }
-
-    
-  /* Set up a task to end testing if peer start fails */
-  die_task =
-      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
-                                    "didn't start all daemons in reasonable amount of time!!!");
-  
-  /* Start alice */
-  pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
-                                    NULL, NULL, &do_lookup, NULL,
-                                    NULL, NULL, NULL);
-}
-
-static int
-check ()
-{
-  int ret;
-
-  /* Arguments for GNUNET_PROGRAM_run */
-  char *const argv[] = { "test-gns-simple-lookup", /* Name to give running binary */
-    "-c",
-    "test_gns_simple_lookup.conf",       /* Config file to use */
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  /* Run the run function as a new program */
-  ret =
-      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                          "test-gns-simple-lookup", "nohelp", options, &run,
-                          &ok);
-  if (ret != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`test-gns-simple-lookup': Failed with error code %d\n", ret);
-  }
-  return ok;
-}
 
 int
 main (int argc, char *argv[])
 {
-  int ret;
+  ok = 1;
 
-  GNUNET_log_setup ("test-gns-simple-lookup",
-#if VERBOSE
-                    "DEBUG",
-#else
+  GNUNET_log_setup ("test-gns-simple-cname-lookup",
                     "WARNING",
-#endif
                     NULL);
-  ret = check ();
-  /**
-   * Need to remove base directory, subdirectories taken care
-   * of by the testing framework.
-   */
-  return ret;
+  GNUNET_TESTING_peer_run ("test-gns-simple-cname-lookup", "test_gns_simple_lookup.conf", &do_check, NULL);
+  return ok;
 }
 
-/* end of test_gns_twopeer.c */
+/* end of test_gns_cname_lookup.c */