-ensure external symbols have proper prefix for conversation service

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

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 4472c764eaa09268b3a8e7a763fff6638d6dc885..e7e2404f647317ed383708d0a61311ca0444c6e5 100644 (file)
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -129,11 +129,11 @@ do_shutdown (void *cls,
 
 
 /**
- * Function called with the result of a GADS lookup.
+ * Function called with the result of a GNS lookup.
  *
  * @param cls the 'const char *' name that was resolved
  * @param rd_count number of records returned
- * @param rd array of 'rd_count' records with the results
+ * @param rd array of @a rd_count records with the results
  */
 static void
 process_lookup_result (void *cls, uint32_t rd_count,
@@ -155,10 +155,21 @@ process_lookup_result (void *cls, uint32_t rd_count,
   }
   for (i=0; i<rd_count; i++)
   {
+    if ( (rd[i].record_type != rtype) &&
+        (GNUNET_NAMESTORE_TYPE_ANY != rtype) )
+      continue;
     typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
     string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
                                                   rd[i].data,
                                                   rd[i].data_size);
+    if (NULL == string_val)
+    {
+      fprintf (stderr,
+              "Record %u of type %d malformed, skipping\n",
+              (unsigned int) i,
+              (int) rd[i].record_type);
+      continue;
+    }
     if (raw)
       printf ("%s\n", 
              string_val);
@@ -166,7 +177,7 @@ process_lookup_result (void *cls, uint32_t rd_count,
       printf ("Got `%s' record: %s\n",
              typename, 
              string_val);
-    GNUNET_free_non_null (string_val);
+    GNUNET_free (string_val);
   }
   GNUNET_SCHEDULER_shutdown ();
 }
@@ -180,7 +191,7 @@ process_lookup_result (void *cls, uint32_t rd_count,
  * @param shorten_key private key used for shortening, can be NULL
  */
 static void
-lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicKey *pkey,
+lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
                  const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
 {
   if (NULL != lookup_type)
@@ -227,10 +238,10 @@ identity_shorten_cb (void *cls,
                     void **ctx,
                     const char *name)
 {
-  struct GNUNET_CRYPTO_EccPublicKey *pkeym = cls;
+  struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls;
 
   id_op = NULL;
-  if (NULL == ego) 
+  if (NULL == ego)
     lookup_with_keys (pkeym, NULL);
   else
     lookup_with_keys (pkeym,
@@ -246,15 +257,15 @@ identity_shorten_cb (void *cls,
  * @param pkey public key to use for the zone
  */
 static void
-lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicKey *pkey)
+lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
 {
-  struct GNUNET_CRYPTO_EccPublicKey *pkeym;
+  struct GNUNET_CRYPTO_EccPublicSignKey *pkeym;
 
   GNUNET_assert (NULL != pkey);
-  pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
+  pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
   *pkeym = *pkey;
   id_op = GNUNET_IDENTITY_get (identity,
-                              "shorten-zone",
+                              "gns-short",
                               &identity_shorten_cb,
                               pkeym);
   if (NULL == id_op)
@@ -276,7 +287,7 @@ static void
 identity_zone_cb (void *cls,
                  const struct GNUNET_IDENTITY_Ego *ego)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   el = NULL;
   if (NULL == ego) 
@@ -314,7 +325,7 @@ identity_master_cb (void *cls,
                    void **ctx,
                    const char *name)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   id_op = NULL;
   if (NULL == ego) 
@@ -341,7 +352,7 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  struct GNUNET_CRYPTO_EccPublicKey pkey;
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   cfg = c;
   gns = GNUNET_GNS_connect (cfg);
@@ -357,7 +368,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (NULL != public_key)
   {
     if (GNUNET_OK !=
-       GNUNET_CRYPTO_ecc_public_key_from_string (public_key,
+       GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
                                                  strlen (public_key),
                                                  &pkey))
     {
@@ -384,7 +395,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                     &lookup_name[strlen (lookup_name) - 4])) )
   {
     /* no zone required, use 'anonymous' zone */
-    GNUNET_CRYPTO_ecc_key_get_public (GNUNET_CRYPTO_ecc_key_get_anonymous (),
+    GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (),
                                      &pkey);
     lookup_with_public_key (&pkey);
   }