Changed Namestore API, changed error handling, changed gns record json

2 files changed, 30 insertions, 10 deletions

diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index d8c82bc86..0ffe5c643 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -182,12 +182,32 @@ GNUNET_JSON_from_gns_record (const char* rname,
   record_type_str = GNUNET_GNSRECORD_number_to_typename(rd->record_type);
 
   // ? for possible NULL values
-  ret = json_pack("{s:s?,s:s?,s:s?,s:i,s:s?}",
-                  "value", value_str,
-                  "type", record_type_str,
-                  "expiration_time", expiration_time_str,
-                  "flag", flags,
-                  "label", rname);
+  if (NULL != rname)
+  {
+    ret = json_pack ("{s:s?,s:s?,s:s?,s:i,s:s?}",
+                     "value",
+                     value_str,
+                     "record_type",
+                     record_type_str,
+                     "expiration_time",
+                     expiration_time_str,
+                     "flag",
+                     flags,
+                     "label",
+                     rname);
+  }
+  else
+  {
+    ret = json_pack ("{s:s?,s:s?,s:s?,s:i}",
+                     "value",
+                     value_str,
+                     "record_type",
+                     record_type_str,
+                     "expiration_time",
+                     expiration_time_str,
+                     "flag",
+                     flags);
+  }
   GNUNET_free_non_null(value_str);
   return ret;
 }
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index 7bdf97f06..fe51119b1 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -26,10 +26,10 @@
 #include "gnunet_json_lib.h"
 
 #define GNUNET_JSON_GNSRECORD_VALUE "value"
-#define GNUNET_JSON_GNSRECORD_TYPE "type"
+#define GNUNET_JSON_GNSRECORD_TYPE "record_type"
 #define GNUNET_JSON_GNSRECORD_EXPIRATION_TIME "expiration_time"
 #define GNUNET_JSON_GNSRECORD_FLAG "flag"
-#define GNUNET_JSON_GNSRECORD_LABEL "label"
+#define GNUNET_JSON_GNSRECORD_RECORD_NAME "record_name"
 #define GNUNET_JSON_GNSRECORD_NEVER "never"
 
 
@@ -52,7 +52,7 @@ parse_gnsrecordobject (void *cls,
   const char *value;
   const char *expiration_time;
   const char *record_type;
-  const char *label;
+  const char *name;
   int flag;
   void *rdata = NULL;
   size_t rdata_size;
@@ -71,7 +71,7 @@ parse_gnsrecordobject (void *cls,
                              GNUNET_JSON_GNSRECORD_TYPE, &record_type,
                              GNUNET_JSON_GNSRECORD_EXPIRATION_TIME, &expiration_time,
                              GNUNET_JSON_GNSRECORD_FLAG, &flag,
-                             GNUNET_JSON_GNSRECORD_LABEL, &label);
+                             GNUNET_JSON_GNSRECORD_RECORD_NAME, &name);
   if (0 != unpack_state)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,