-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 0a6bcf66b4ffb7003c2aac5e3d5386d198a36160..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 ();
 }
@@ -230,7 +241,7 @@ identity_shorten_cb (void *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,
@@ -254,7 +265,7 @@ lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
   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)