add republish support in dht (default once an hour, just like kademlia), improved next hop selection (or so I think), use 'TrialInfo' struct in dhtlog testcase

1 files changed, 68 insertions, 10 deletions

diff --git a/src/dht/test_dhtlog.c b/src/dht/test_dhtlog.c
index c2c5ccf72..08ac6af65 100644
--- a/src/dht/test_dhtlog.c
+++ b/src/dht/test_dhtlog.c
@@ -28,7 +28,7 @@
 #include "gnunet_protocols.h"
 #include "dhtlog.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 static int ok;
 
@@ -43,13 +43,11 @@ test (struct GNUNET_DHTLOG_Handle * api)
   struct GNUNET_PeerIdentity p2;
   struct GNUNET_PeerIdentity p3;
   struct GNUNET_PeerIdentity p4;
-
+  struct GNUNET_DHTLOG_TrialInfo trial_info;
   GNUNET_HashCode k1;
   GNUNET_HashCode k2;
-
   int ret;
   unsigned int i = 42;
-  unsigned long long trialuid;
   unsigned long long sqlqueryuid;
   unsigned long long sqlrouteuid = 0;
   unsigned long long nodeuid = 0;
@@ -62,15 +60,42 @@ test (struct GNUNET_DHTLOG_Handle * api)
 
   memset (&k1, 0, sizeof (GNUNET_HashCode));
   memset (&k2, 1, sizeof (GNUNET_HashCode));
-
+  memset(&trial_info, 0, sizeof(struct GNUNET_DHTLOG_TrialInfo));
+  trial_info.other_identifier = 777;
+  trial_info.num_nodes = i;
+  trial_info.topology = 5;
+  trial_info.blacklist_topology = 4;
+  trial_info.connect_topology = 3;
+  trial_info.connect_topology_option = 2;
+  trial_info.connect_topology_option_modifier = .75;
+  trial_info.topology_percentage = .25;
+  trial_info.topology_probability = .5;
+  trial_info.puts = 42;
+  trial_info.gets = 14;
+  trial_info.concurrent = 5;
+  trial_info.settle_time = 1;
+  trial_info.num_rounds = 12;
+  trial_info.malicious_getters = 0;
+  trial_info.malicious_putters = 0;
+  trial_info.malicious_droppers = 0;
+  trial_info.malicious_get_frequency = 1;
+  trial_info.malicious_put_frequency = 0;
+  trial_info.stop_closest = 1;
+  trial_info.stop_found = 0;
+  trial_info.strict_kademlia = 1;
+  trial_info.message = GNUNET_strdup("TEST INSERT_TRIAL");
   ret =
-    api->insert_trial (&trialuid, i, 5, 4, 3, 2,
-                       .75, .25, .5, 42, 14,
-                       5, 1, 12, 0, 0, 0, 1, 0, 1,
-                       0, 1, 0, "TEST INSERT TRIAL");
+    api->insert_trial (&trial_info);
+  GNUNET_free(trial_info.message);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert trial succeeded!\n");
+#endif
   ret = api->insert_topology(500);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert topology succeeded!\n");
+#endif
   ret = api->insert_node (&nodeuid, &p1);
   CHECK(ret);
   ret = api->insert_node (&nodeuid, &p2);
@@ -79,22 +104,43 @@ test (struct GNUNET_DHTLOG_Handle * api)
   CHECK(ret);
   ret = api->insert_node (&nodeuid, &p4);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert node succeeded!\n");
+#endif
   ret = api->set_malicious(&p1);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Set malicious succeeded!\n");
+#endif
   ret = api->insert_topology(0);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert topology succeeded!\n");
+#endif
   ret = api->insert_extended_topology(&p1, &p2);
   CHECK(ret);
   ret = api->insert_extended_topology(&p3, &p4);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert extended topology succeeded!\n");
+#endif
   ret = api->update_topology(101);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Update topology succeeded!\n");
+#endif
   ret = api->insert_dhtkey (&dhtkeyuid, &k1);
   CHECK(ret);
   ret = api->insert_dhtkey (&dhtkeyuid, &k2);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert dhtkey succeeded!\n");
+#endif
   ret = api->insert_query (&sqlqueryuid, internaluid, 2, 4, 0, &p2, &k1);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert query succeeded!\n");
+#endif
   ret =
     api->insert_route (&sqlrouteuid, sqlqueryuid, 1, 1, DHTLOG_GET, &p1, &k2,
                        &p4, &p3);
@@ -111,15 +157,27 @@ test (struct GNUNET_DHTLOG_Handle * api)
     api->insert_route (&sqlrouteuid, sqlqueryuid, 4, 7, DHTLOG_ROUTE, &p3, &k2,
                        NULL, NULL);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert route succeeded!\n");
+#endif
   sleep (1);
   ret = api->insert_stat(&p1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
   CHECK(ret);
   ret = api->insert_stat(&p2, 12, 23, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27);
   CHECK(ret);
-  ret = api->update_trial (trialuid, 787);
+#if VERBOSE
+  fprintf(stderr, "Insert stat succeeded!\n");
+#endif
+  ret = api->update_trial (trial_info.trialuid, 787);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Update trial succeeded!\n");
+#endif
   ret = api->add_generic_stat (&p2, "nonsense", "section", 77765);
   CHECK(ret);
+#if VERBOSE
+  fprintf(stderr, "Insert generic stat succeeded!\n");
+#endif
   return 0;
 }