- rename

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

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 864d1d0ada37069cf9933a35fd426ebd74148412..8d220d76daf4565465a92b8afa03fa0885a79af7 100644 (file)
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -40,6 +40,11 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg;
  */
 static struct GNUNET_GNS_Handle *gns;
 
+/**
+ * Desired timeout for the lookup (default is no timeout).
+ */
+static struct GNUNET_TIME_Relative timeout;
+
 /**
  * GNS name to lookup. (-u option)
  */
@@ -60,6 +65,11 @@ static char *zone_ego_name;
  */
 static char *public_key;
 
+/**
+ * Set to GNUNET_GNS_LO_LOCAL_MASTER if we are looking up in the master zone.
+ */
+static enum GNUNET_GNS_LocalOptions local_options;
+
 /**
  * raw output
  */
@@ -199,6 +209,12 @@ lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey,
     rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type);
   else
     rtype = GNUNET_DNSPARSER_TYPE_A;
+  if (UINT32_MAX == rtype)
+  {
+    fprintf (stderr,
+             _("Invalid typename specified, assuming `ANY'\n"));
+    rtype = GNUNET_GNSRECORD_TYPE_ANY;
+  }
 
   if (NULL != lookup_name)
   {
@@ -206,7 +222,7 @@ lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey,
                                        lookup_name,
                                        pkey,
                                        rtype,
-                                       GNUNET_NO, /* Use DHT */
+                                       local_options,
                                        shorten_key,
                                        &process_lookup_result,
                                        lookup_name);
@@ -215,7 +231,7 @@ lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey,
   {
     fprintf (stderr,
             _("Please specify name to lookup!\n"));
-    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 }
@@ -265,6 +281,7 @@ lookup_with_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey)
   GNUNET_assert (NULL != pkey);
   pkeym = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
   *pkeym = *pkey;
+  GNUNET_break (NULL == id_op);
   id_op = GNUNET_IDENTITY_get (identity,
                               "gns-short",
                               &identity_shorten_cb,
@@ -327,16 +344,27 @@ identity_master_cb (void *cls,
                    const char *name)
 {
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+  const char *dot;
 
   id_op = NULL;
   if (NULL == ego)
   {
     fprintf (stderr,
-            _("Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-gns-import.sh?\n"));
+            _("Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-gns-import.sh?\n"));
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+  /* main name is our own master zone, do no look for that in the DHT */
+  local_options = GNUNET_GNS_LO_LOCAL_MASTER;
+
+  /* if the name is of the form 'label.gnu', never go to the DHT */
+  dot = NULL;
+  if (NULL != lookup_name)
+    dot = strchr (lookup_name, '.');
+  if ( (NULL != dot) &&
+       (0 == strcasecmp (dot, ".gnu")) )
+    local_options = GNUNET_GNS_LO_NO_DHT;
   lookup_with_public_key (&pkey);
 }
 
@@ -364,7 +392,7 @@ run (void *cls, char *const *args, const char *cfgfile,
             _("Failed to connect to GNS\n"));
     return;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (timeout,
                                &do_shutdown, NULL);
   if (NULL != public_key)
   {
@@ -402,8 +430,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   else
   {
+    GNUNET_break (NULL == id_op);
     id_op = GNUNET_IDENTITY_get (identity,
-                                "master-zone",
+                                "gns-master",
                                 &identity_master_cb,
                                 NULL);
     GNUNET_assert (NULL != id_op);
@@ -428,6 +457,9 @@ main (int argc, char *const *argv)
     {'t', "type", "TYPE",
       gettext_noop ("Specify the type of the record to lookup"), 1,
       &GNUNET_GETOPT_set_string, &lookup_type},
+    { 'T', "timeout", "DELAY",
+      gettext_noop ("Specify timeout for the lookup"), 1,
+      &GNUNET_GETOPT_set_relative_time, &timeout },
     {'r', "raw", NULL,
       gettext_noop ("No unneeded output"), 0,
       &GNUNET_GETOPT_set_one, &raw},
@@ -441,6 +473,7 @@ main (int argc, char *const *argv)
   };
   int ret;
 
+  timeout = GNUNET_TIME_UNIT_FOREVER_REL;
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;