X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Fgnunet-gns.c;h=83dd7b27b5f32efbbbf8d9e75ac8de01fb9cd7f0;hb=a12b8c2c4cbf952c8c305cde193bb25c13a0912b;hp=bb256dadf0df554e3e69088fd0502b89490edb5d;hpb=e537bb14c1b23deefe1df7fd07905b1f318c87c7;p=oweals%2Fgnunet.git
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index bb256dadf..83dd7b27b 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -1,79 +1,93 @@
/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012-2013, 2017-2018 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- 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.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file gnunet-gns.c
* @brief command line tool to access distributed GNS
* @author Christian Grothoff
- *
- * TODO:
- * - everything
*/
#include "platform.h"
#include
#include
+#include
#include
#include
/**
- * Handle to GNS service.
+ * Configuration we are using.
*/
-static struct GNUNET_GNS_Handle *gns;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * GNS name to shorten. (-s option)
+ * Handle to GNS service.
*/
-static char *shorten_name;
+static struct GNUNET_GNS_Handle *gns;
/**
* GNS name to lookup. (-u option)
*/
static char *lookup_name;
-
/**
* record type to look up (-t option)
*/
static char *lookup_type;
/**
- * name to look up authority for (-a option)
+ * raw output
*/
-static char *auth_name;
+static int raw;
/**
- * raw output
+ * Desired record type.
+ */
+static uint32_t rtype;
+
+/**
+ * Handle to lookup request
+ */
+static struct GNUNET_GNS_LookupWithTldRequest *lr;
+
+/**
+ * Global return value.
+ * 0 on success (default),
+ * 1 on internal failures
+ * 2 on launch failure,
+ * 4 if the name is not a GNS-supported TLD,
*/
-static int raw = 0;
+static int global_ret;
-static enum GNUNET_GNS_RecordType rtype;
/**
* 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)
{
+ (void) cls;
+ if (NULL != lr)
+ {
+ GNUNET_GNS_lookup_with_tld_cancel (lr);
+ lr = NULL;
+ }
if (NULL != gns)
{
GNUNET_GNS_disconnect (gns);
@@ -82,53 +96,68 @@ do_shutdown (void *cls,
}
+/**
+ * Function called with the result of a GNS lookup.
+ *
+ * @param cls the 'const char *' name that was resolved
+ * @param was_gns #GNUNET_NO if TLD did not indicate use of GNS
+ * @param rd_count number of records returned
+ * @param rd array of @a rd_count records with the results
+ */
static void
-process_shorten_result(void* cls, const char* nshort)
-{
- printf("%s shortened to %s\n", (char*) cls, nshort);
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-}
-
-static void
-process_lookup_result(void* cls, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+process_lookup_result (void *cls,
+ int was_gns,
+ uint32_t rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- int i;
- char* name = (char*) cls;
- const char* typename;
+ const char *name = cls;
+ const char *typename;
char* string_val;
-
- if (!raw) {
- if (rd_count == 0)
- printf("No results.\n");
+
+ lr = NULL;
+ if (GNUNET_NO == was_gns)
+ {
+ global_ret = 4; /* not for GNS */
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if (! raw)
+ {
+ if (0 == rd_count)
+ printf ("No results.\n");
else
- printf("%s:\n", name);
+ printf ("%s:\n",
+ name);
}
-
-
-
- for (i=0; i