-never store NICKs anywhere but in '+', do not display nicks in gnunet-namestore

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

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 6a8df6945021842d80315c0d4f1a2656ccd17cdb..e985e1b049d8b2c5356d0faacff0b3d1efcdece9 100644 (file)
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -1,4 +1,3 @@
-
 /*
      This file is part of GNUnet.
      (C) 2012, 2013 Christian Grothoff (and other contributing authors)
@@ -50,8 +49,14 @@ static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
  */
 static struct GNUNET_IDENTITY_EgoLookup *el;
 
+/**
+ * Identity service handle
+ */
 static struct GNUNET_IDENTITY_Handle *idh;
 
+/**
+ * Obtain default ego
+ */
 struct GNUNET_IDENTITY_Operation *get_default;
 
 /**
@@ -300,6 +305,7 @@ add_continuation (void *cls,
     if (GNUNET_NO != success)
       ret = 1;
   }
+  ret = 0;
   test_finished ();
 }
 
@@ -378,6 +384,8 @@ display_record (void *cls,
           rname);
   for (i=0;i<rd_len;i++)
   {
+    if (GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type)
+      continue;
     typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
     s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
                                          rd[i].data,
@@ -698,12 +706,8 @@ testservice_task (void *cls,
     char sname[64];
     struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
-    if ( (2 != (sscanf (uri,
-                        "gnunet://gns/%104s/%63s",
-                        sh,
-                        sname)) ) ||
-         (GNUNET_OK !=
-          GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
+    if ( (2 != (sscanf (uri, "gnunet://gns/%52s/%63s", sh, sname)) ) ||
+         (GNUNET_OK != GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
     {
       fprintf (stderr,
                _("Invalid URI `%s'\n"),
@@ -726,7 +730,7 @@ testservice_task (void *cls,
     else
       rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
 
-    if (1 != shadow)
+    if (1 == shadow)
       rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
     add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
                                                 &zone_pkey,
@@ -785,6 +789,7 @@ identity_cb (void *cls,
                ego_name);
     }
     GNUNET_SCHEDULER_shutdown ();
+    ret = -1;
     return;
   }
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
@@ -809,6 +814,7 @@ default_ego_cb (void *cls,
     fprintf (stderr,
              _("No default ego configured in identity service\n"));
     GNUNET_SCHEDULER_shutdown ();
+    ret = -1;
     return;
   }
   else
@@ -841,6 +847,7 @@ testservice_id_task (void *cls, int result)
     fprintf (stderr,
              _("Identity service is not running\n"));
     GNUNET_SCHEDULER_shutdown ();
+    ret = -1;
     return;
   }
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
@@ -851,6 +858,7 @@ testservice_id_task (void *cls, int result)
     idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
     if (NULL == idh)
       fprintf (stderr, _("Cannot connect to identity service\n"));
+    ret = -1;
     return;
   }
   el = GNUNET_IDENTITY_ego_lookup (cfg,