update tests to use new MQ API

[oweals/gnunet.git] / src / namecache / gnunet-namecache.c

diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c
index cda40fae96caa833839c603d7802b6eb7abf6783..490197b1e90666f87ed573954c64d7e5f87ea96c 100644 (file)
--- a/src/namecache/gnunet-namecache.c
+++ b/src/namecache/gnunet-namecache.c
@@ -1,7 +1,6 @@
-
 /*
      This file is part of GNUnet.
-     (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012, 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -15,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file gnunet-namecache.c
@@ -27,12 +26,11 @@
  * - test
  */
 #include "platform.h"
-#include <gnunet_util_lib.h>
-#include <gnunet_dnsparser_lib.h>
-#include <gnunet_identity_service.h>
-#include <gnunet_gnsrecord_lib.h>
-#include <gnunet_namecache_service.h>
-#include <gnunet_namestore_service.h>
+#include "gnunet_util_lib.h"
+#include "gnunet_dnsparser_lib.h"
+#include "gnunet_identity_service.h"
+#include "gnunet_gnsrecord_lib.h"
+#include "gnunet_namecache_service.h"
 
 
 /**
@@ -70,11 +68,9 @@ static int ret;
  * Task run on shutdown.  Cleans up everything.
  *
  * @param cls unused
- * @param tc scheduler context
  */
 static void
-do_shutdown (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   if (NULL != qe)
   {
@@ -99,7 +95,7 @@ do_shutdown (void *cls,
 static void
 display_records_from_block (void *cls,
                            unsigned int rd_len,
-                           const struct GNUNET_NAMESTORE_RecordData *rd)
+                           const struct GNUNET_GNSRECORD_Data *rd)
 {
   const char *typestring;
   char *s;
@@ -145,7 +141,7 @@ display_records_from_block (void *cls,
  */
 static void
 handle_block (void *cls,
-             const struct GNUNET_NAMESTORE_Block *block)
+             const struct GNUNET_GNSRECORD_Block *block)
 {
   qe = NULL;
   if (NULL == block)
@@ -154,7 +150,7 @@ handle_block (void *cls,
             "No matching block found\n");
   }
   else if (GNUNET_OK !=
-          GNUNET_NAMESTORE_block_decrypt (block,
+          GNUNET_GNSRECORD_block_decrypt (block,
                                           &pubkey,
                                           name,
                                           &display_records_from_block,
@@ -194,15 +190,22 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                   &pubkey))
   {
     fprintf (stderr,
-             _("Invalid public key for reverse lookup `%s'\n"),
+             _("Invalid public key for zone `%s'\n"),
              pkey);
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &do_shutdown,
-                                NULL);
-  GNUNET_NAMESTORE_query_from_public_key (&pubkey,
+  if (NULL == name)
+  {
+    fprintf (stderr,
+             _("You must specify a name\n"));
+    return;
+  }
+
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                NULL);
+  ns = GNUNET_NAMECACHE_connect (cfg);
+  GNUNET_GNSRECORD_query_from_public_key (&pubkey,
                                           name,
                                           &dhash);
   qe = GNUNET_NAMECACHE_lookup_block (ns,