DHT: modify API and protocol messages to add path signatures, except for now the actual signatures are just placeholders (signing and signature verification are missing)

8 files changed, 37 insertions, 32 deletions

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index 8b665e705..944a99aad 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -243,7 +243,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
                       enum GNUNET_BLOCK_Type type,
                       struct GNUNET_TIME_Absolute discard_time,
                       unsigned int path_info_len,
-                      const struct GNUNET_PeerIdentity *path_info)
+                      const struct GNUNET_DHT_PathElement *path_info)
 {
   ssize_t used;
 
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index ce3b4c25d..84bc4a852 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -47,21 +47,27 @@ static const char *plugin_name;
 
 static int
 checkIt (void *cls,
-         const struct GNUNET_HashCode *key, size_t size, const char *data,
+         const struct GNUNET_HashCode *key,
+         size_t size,
+         const char *data,
          enum GNUNET_BLOCK_Type type,
          struct GNUNET_TIME_Absolute exp,
          unsigned int path_len,
-         const struct GNUNET_PeerIdentity *path)
+         const struct GNUNET_DHT_PathElement *path)
 {
-  if ((size == sizeof(struct GNUNET_HashCode)) && (0 == memcmp (data, cls,
-                                                                size)))
+  if ( (size == sizeof(struct GNUNET_HashCode)) &&
+       (0 == memcmp (data,
+                     cls,
+                     size)) )
     found++;
   return GNUNET_OK;
 }
 
 
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_DATACACHE_Handle *h;
diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c
index 20d18458d..fbd3aea9a 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -80,7 +80,7 @@ struct Value
   /**
    * Path information.
    */
-  struct GNUNET_PeerIdentity *path_info;
+  struct GNUNET_DHT_PathElement *path_info;
 
   /**
    * Payload (actual payload follows this struct)
@@ -125,7 +125,7 @@ struct PutContext
   /**
    * Path information.
    */
-  const struct GNUNET_PeerIdentity *path_info;
+  const struct GNUNET_DHT_PathElement *path_info;
 
   /**
    * Number of bytes in @e data.
@@ -181,7 +181,8 @@ put_cb (void *cls,
                        put_ctx->path_info_len);
     GNUNET_memcpy (val->path_info,
                    put_ctx->path_info,
-                   put_ctx->path_info_len * sizeof(struct GNUNET_PeerIdentity));
+                   put_ctx->path_info_len * sizeof(struct
+                                                   GNUNET_DHT_PathElement));
     GNUNET_CONTAINER_heap_update_cost (val->hn,
                                        val->discard_time.abs_value_us);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -219,7 +220,7 @@ heap_plugin_put (void *cls,
                  enum GNUNET_BLOCK_Type type,
                  struct GNUNET_TIME_Absolute discard_time,
                  unsigned int path_info_len,
-                 const struct GNUNET_PeerIdentity *path_info)
+                 const struct GNUNET_DHT_PathElement *path_info)
 {
   struct Plugin *plugin = cls;
   struct Value *val;
@@ -255,7 +256,7 @@ heap_plugin_put (void *cls,
                      path_info_len);
   GNUNET_memcpy (val->path_info,
                  path_info,
-                 path_info_len * sizeof(struct GNUNET_PeerIdentity));
+                 path_info_len * sizeof(struct GNUNET_DHT_PathElement));
   (void) GNUNET_CONTAINER_multihashmap_put (plugin->map,
                                             &val->key,
                                             val,
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index 070619137..6a44c44a5 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -156,7 +156,7 @@ postgres_plugin_put (void *cls,
                      enum GNUNET_BLOCK_Type type,
                      struct GNUNET_TIME_Absolute discard_time,
                      unsigned int path_info_len,
-                     const struct GNUNET_PeerIdentity *path_info)
+                     const struct GNUNET_DHT_PathElement *path_info)
 {
   struct Plugin *plugin = cls;
   uint32_t type32 = (uint32_t) type;
@@ -168,7 +168,7 @@ postgres_plugin_put (void *cls,
     GNUNET_PQ_query_param_fixed_size (data, data_size),
     GNUNET_PQ_query_param_fixed_size (path_info,
                                       path_info_len * sizeof(struct
-                                                             GNUNET_PeerIdentity)),
+                                                             GNUNET_DHT_PathElement)),
     GNUNET_PQ_query_param_end
   };
   enum GNUNET_DB_QueryStatus ret;
@@ -227,7 +227,7 @@ handle_results (void *cls,
     uint32_t type;
     void *data;
     size_t data_size;
-    struct GNUNET_PeerIdentity *path;
+    struct GNUNET_DHT_PathElement *path;
     size_t path_len;
     struct GNUNET_PQ_ResultSpec rs[] = {
       GNUNET_PQ_result_spec_absolute_time ("discard_time",
@@ -251,12 +251,12 @@ handle_results (void *cls,
       GNUNET_break (0);
       return;
     }
-    if (0 != (path_len % sizeof(struct GNUNET_PeerIdentity)))
+    if (0 != (path_len % sizeof(struct GNUNET_DHT_PathElement)))
     {
       GNUNET_break (0);
       path_len = 0;
     }
-    path_len %= sizeof(struct GNUNET_PeerIdentity);
+    path_len %= sizeof(struct GNUNET_DHT_PathElement);
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Found result of size %u bytes and type %u in database\n",
          (unsigned int) data_size,
@@ -446,7 +446,7 @@ extract_result_cb (void *cls,
     uint32_t type;
     void *data;
     size_t data_size;
-    struct GNUNET_PeerIdentity *path;
+    struct GNUNET_DHT_PathElement *path;
     size_t path_len;
     struct GNUNET_HashCode key;
     struct GNUNET_PQ_ResultSpec rs[] = {
@@ -473,12 +473,12 @@ extract_result_cb (void *cls,
       GNUNET_break (0);
       return;
     }
-    if (0 != (path_len % sizeof(struct GNUNET_PeerIdentity)))
+    if (0 != (path_len % sizeof(struct GNUNET_DHT_PathElement)))
     {
       GNUNET_break (0);
       path_len = 0;
     }
-    path_len %= sizeof(struct GNUNET_PeerIdentity);
+    path_len %= sizeof(struct GNUNET_DHT_PathElement);
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Found result of size %u bytes and type %u in database\n",
          (unsigned int) data_size,
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 0c894556b..d08b32caf 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -192,7 +192,7 @@ sqlite_plugin_put (void *cls,
                    enum GNUNET_BLOCK_Type type,
                    struct GNUNET_TIME_Absolute discard_time,
                    unsigned int path_info_len,
-                   const struct GNUNET_PeerIdentity *path_info)
+                   const struct GNUNET_DHT_PathElement *path_info)
 {
   struct Plugin *plugin = cls;
   uint32_t type32 = type;
@@ -204,7 +204,7 @@ sqlite_plugin_put (void *cls,
     GNUNET_SQ_query_param_fixed_size (data, size),
     GNUNET_SQ_query_param_fixed_size (path_info,
                                       path_info_len
-                                      * sizeof(struct GNUNET_PeerIdentity)),
+                                      * sizeof(struct GNUNET_DHT_PathElement)),
     GNUNET_SQ_query_param_end };
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -265,7 +265,7 @@ sqlite_plugin_get (void *cls,
   uint32_t off;
   unsigned int total;
   size_t psize;
-  struct GNUNET_PeerIdentity *path;
+  struct GNUNET_DHT_PathElement *path;
   struct GNUNET_SQ_QueryParam params_count[] =
   { GNUNET_SQ_query_param_auto_from_type (key),
     GNUNET_SQ_query_param_uint32 (&type32),
@@ -339,13 +339,13 @@ sqlite_plugin_get (void *cls,
       GNUNET_SQ_reset (plugin->dbh, plugin->get_stmt);
       break;
     }
-    if (0 != psize % sizeof(struct GNUNET_PeerIdentity))
+    if (0 != psize % sizeof(struct GNUNET_DHT_PathElement))
     {
       GNUNET_break (0);
       psize = 0;
       path = NULL;
     }
-    psize /= sizeof(struct GNUNET_PeerIdentity);
+    psize /= sizeof(struct GNUNET_DHT_PathElement);
     cnt++;
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Found %u-byte result when processing GET for key `%s'\n",
@@ -476,7 +476,7 @@ sqlite_plugin_get_closest (void *cls,
   size_t psize;
   uint32_t type;
   struct GNUNET_HashCode hc;
-  struct GNUNET_PeerIdentity *path;
+  struct GNUNET_DHT_PathElement *path;
   struct GNUNET_SQ_QueryParam params[] =
   { GNUNET_SQ_query_param_auto_from_type (key),
     GNUNET_SQ_query_param_absolute_time (&now),
@@ -510,13 +510,13 @@ sqlite_plugin_get_closest (void *cls,
       GNUNET_break (0);
       break;
     }
-    if (0 != psize % sizeof(struct GNUNET_PeerIdentity))
+    if (0 != psize % sizeof(struct GNUNET_DHT_PathElement))
     {
       GNUNET_break (0);
       psize = 0;
       path = NULL;
     }
-    psize /= sizeof(struct GNUNET_PeerIdentity);
+    psize /= sizeof(struct GNUNET_DHT_PathElement);
     cnt++;
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Found %u-byte result at %s when processing GET_CLOSE\n",
diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c
index 09279f55c..231413ce9 100644
--- a/src/datacache/plugin_datacache_template.c
+++ b/src/datacache/plugin_datacache_template.c
@@ -63,7 +63,7 @@ template_plugin_put (void *cls,
                      enum GNUNET_BLOCK_Type type,
                      struct GNUNET_TIME_Absolute discard_time,
                      unsigned int path_info_len,
-                     const struct GNUNET_PeerIdentity *path_info)
+                     const struct GNUNET_DHT_PathElement *path_info)
 {
   GNUNET_break (0);
   return -1;
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 6f6e4eec1..5740d2b7d 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -46,7 +46,7 @@ checkIt (void *cls,
          enum GNUNET_BLOCK_Type type,
          struct GNUNET_TIME_Absolute exp,
          unsigned int path_len,
-         const struct GNUNET_PeerIdentity *path)
+         const struct GNUNET_DHT_PathElement *path)
 {
   (void) key;
   (void) type;
diff --git a/src/datacache/test_datacache_data_postgres.conf b/src/datacache/test_datacache_data_postgres.conf
index 47c954b55..92313157c 100644
--- a/src/datacache/test_datacache_data_postgres.conf
+++ b/src/datacache/test_datacache_data_postgres.conf
@@ -4,6 +4,4 @@ QUOTA = 1 MB
 DATABASE = postgres
 
 [datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunetcheck
-
-
+CONFIG = postgres:///gnunetcheck