sql related changes

diff --git a/src/dht/dht.h b/src/dht/dht.h
index 94276b8d5384215a110df7a6381d19de807ba369..56bb29934d7d56ce5da68ce2d92ced84802f53ff 100644 (file)
--- a/src/dht/dht.h
+++ b/src/dht/dht.h
@@ -38,11 +38,17 @@
 
 #define DHT_BLOOM_K 6
 
+/**
+ * How many requests to remember for forwarding responses.
+ */
 #define MAX_OUTSTANDING_FORWARDS 100
 
+/**
+ * How long to remember requests so we can forward responses.
+ */
 #define DHT_FORWARD_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
-#define DHT_REPUBLISH_FREQUENCY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
+#define DEFAULT_DHT_REPUBLISH_FREQUENCY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
 
 #define DHT_SEND_PRIORITY 4
 
@@ -230,22 +236,6 @@ struct GNUNET_DHT_P2PRouteMessage
    */
   char bloomfilter[DHT_BLOOM_SIZE];
 
-  /**
-   * FIXME: add DHT logging for analysis!
-   */
-#if LOG_SQL
-  /*
-   * Unique query id for sql database interaction.
-   */
-  uint64_t queryuid;
-
-  /*
-   * Unique trial id for sql database interaction
-   */
-  uint64_t trialuid;
-
-#endif
-
   /**
    * The key to search for
    */

diff --git a/src/dht/dhtlog.h b/src/dht/dhtlog.h
index ee594b2f11e603a4137e1b1c97214c0473dfd9aa..a9608ffd2ecc13604ef3b8cb6a92fc43d55739e8 100644 (file)
--- a/src/dht/dhtlog.h
+++ b/src/dht/dhtlog.h
@@ -274,6 +274,16 @@ struct GNUNET_DHTLOG_Handle
                        const char *name,
                        const char *section, uint64_t value);
 
+  /*
+   * Inserts the specified round into the dhttests.rounds table
+   *
+   * @param round_type the type of round that is being started
+   * @param round_count counter for the round (if applicable)
+   *
+   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+   */
+  int (*insert_round) (unsigned int round_type, unsigned int round_count);
+
   /*
    * Update dhttests.trials table with total connections information
    *