-use new serialization/deserialization API

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 2e2f08042aaa93391983401bb0fc46ef462ea038..62bda7d20d2cf68b796087e41d3ec9091bb783df 100644 (file)
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -71,6 +71,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
   plugin_namestore_sqlite.c
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la  \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3
 libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \

diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 0e0fc5243e505dd27650c60ad4db740e7bfb973a..3d511a6e441967be3be2512c8adf0bae62d40a12 100644 (file)
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_namestore_plugin.h"
+#include "gnunet_namestore_service.h"
 #include <sqlite3.h>
 
 /**
@@ -107,35 +108,6 @@ struct Plugin
 };
 
 
-/**
- * Internal format of a record in the BLOB in the database.
- */
-struct DbRecord
-{
-
-  /**
-   * Expiration time for the DNS record.
-   */
-  struct GNUNET_TIME_AbsoluteNBO expiration;
-
-  /**
-   * Number of bytes in 'data', network byte order.
-   */
-  uint32_t data_size;
-
-  /**
-   * Type of the GNS/DNS record, network byte order.
-   */
-  uint32_t record_type;
-
-  /**
-   * Flags for the record, network byte order.
-   */
-  uint32_t flags;
-  
-};
-
-
 /**
  * @brief Prepare a SQL statement
  *
@@ -483,8 +455,6 @@ namestore_sqlite_put_records (void *cls,
   size_t name_len;
   uint64_t rvalue;
   size_t data_size;
-  size_t off;
-  unsigned int i;
 
   GNUNET_CRYPTO_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
   (void) namestore_sqlite_remove_records (plugin, &zone, name);
@@ -492,9 +462,7 @@ namestore_sqlite_put_records (void *cls,
   GNUNET_CRYPTO_hash (name, name_len, &nh);
 
   rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
-  data_size = rd_count * sizeof (struct DbRecord);
-  for (i=0;i<rd_count;i++)  
-    data_size += rd[i].data_size;
+  data_size = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
   if (data_size > 64 * 65536)
   {
     GNUNET_break (0);
@@ -502,20 +470,12 @@ namestore_sqlite_put_records (void *cls,
   }
   {
     char data[data_size];
-    struct DbRecord *rec;
-    
-    rec = (struct DbRecord *) data;
-    off = rd_count * sizeof (struct DbRecord);
-    for (i=0;i<rd_count;i++)  
+
+    if (data_size != GNUNET_NAMESTORE_records_serialize (rd_count, rd,
+                                                        data_size, data))
     {
-      rec[i].expiration = GNUNET_TIME_absolute_hton (rd[i].expiration);
-      rec[i].data_size = htonl ((uint32_t) rd[i].data_size);
-      rec[i].record_type = htonl (rd[i].record_type);
-      rec[i].flags = htonl (rd[i].flags);
-      memcpy (&data[off],
-             rd[i].data,
-             rd[i].data_size);
-      off += rd[i].data_size;
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
     }
     if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_records, 1, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), SQLITE_STATIC)) ||
        (SQLITE_OK != sqlite3_bind_text (plugin->put_records, 2, name, -1, SQLITE_STATIC)) ||
@@ -663,38 +623,28 @@ namestore_sqlite_iterate_records (void *cls,
     sig = sqlite3_column_blob (stmt, 5);
 
     if ( (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) != sqlite3_column_bytes (stmt, 0)) ||
-        (sizeof (struct GNUNET_CRYPTO_RsaSignature) != sqlite3_column_bytes (stmt, 5)) ||
-        (sizeof (struct DbRecord) * record_count > data_size) )
+        (sizeof (struct GNUNET_CRYPTO_RsaSignature) != sqlite3_column_bytes (stmt, 5)) )
     {
       GNUNET_break (0);
       ret = GNUNET_SYSERR;
     }
     else
     {
-      const struct DbRecord *db = (const struct DbRecord*) data;
       struct GNUNET_NAMESTORE_RecordData rd[record_count];
-      unsigned int i;
-      size_t off;
 
-      off = record_count * sizeof (struct DbRecord);
-      for (i=0;i<record_count;i++)
+      if (GNUNET_OK !=
+         GNUNET_NAMESTORE_records_deserialize (data_size, data,
+                                               record_count, rd))
+      {
+       GNUNET_break (0);
+       ret = GNUNET_SYSERR;
+       record_count = 0;
+      }
+      else
       {
-       if (off + ntohl (db[i].data_size) > data_size)
-       {
-         GNUNET_break (0);
-         ret = GNUNET_SYSERR;
-         record_count = i;
-         break;
-       }
-       rd[i].expiration = GNUNET_TIME_absolute_ntoh (db[i].expiration);
-       rd[i].data_size = ntohl (db[i].data_size);
-       rd[i].data = &data[off];
-       rd[i].record_type = ntohl (db[i].record_type);
-       rd[i].flags = ntohl (db[i].flags);
-       off += rd[i].data_size;
-      }     
-      iter (iter_cls, zone_key, expiration, name, 
-           record_count, rd, sig);
+       iter (iter_cls, zone_key, expiration, name, 
+             record_count, rd, sig);
+      }
     }
   }
   else