using DNS2GNS record type instead of recycling NS record type in GNS; fixing testcase by properly converting DNS records back to GNS blocks

1 files changed, 13 insertions, 2 deletions

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 0a6bcf66b..4b0ae38bc 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -133,7 +133,7 @@ do_shutdown (void *cls,
  *
  * @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 ();
 }