add statistic to track estimated network diameter

[oweals/gnunet.git] / src / nse / nse.h

diff --git a/src/nse/nse.h b/src/nse/nse.h
index ee9832dc6d62b2b11dfc336c953741cebc9e1964..91b629657c0829dddfd2300feca5cc233853e3d7 100644 (file)
--- a/src/nse/nse.h
+++ b/src/nse/nse.h
@@ -30,16 +30,10 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_NSE GNUNET_YES
-
-#define SIGNED_TIMESTAMP_SIZE sizeof(struct GNUNET_TIME_Absolute)
-
-/** FIXME: define NSE message types here. */
-
-struct GNUNET_Signed_Timestamp
-{
-  char data[SIGNED_TIMESTAMP_SIZE];
-};
+/**
+ * Generate debug-level log messages?
+ */
+#define DEBUG_NSE GNUNET_EXTRA_LOGGING
 
 /**
  * Network size estimate sent from the service
@@ -51,69 +45,32 @@ struct GNUNET_Signed_Timestamp
 struct GNUNET_NSE_ClientMessage
 {
   /**
-   * Type:  GNUNET_MESSAGE_TYPE_NSE_UPDATE
+   * Type: GNUNET_MESSAGE_TYPE_NSE_UPDATE
    */
   struct GNUNET_MessageHeader header;
 
-  /*
-   * The current estimated network size.
-   */
-  double size_estimate;
-
   /**
-   * The standard deviation (rounded down
-   * to the nearest integer) of size
-   * estimations.
+   * For alignment.
    */
-  double std_deviation;
-};
+  uint32_t reserved GNUNET_PACKED;
 
-/**
- * Network size estimate reply; sent when "this"
- * peer's timer has run out before receiving a
- * valid reply from another peer.
- *
- * FIXME: Is this the right way to do this?
- * I think we need to include both the public
- * key and the timestamp signed by the private
- * key.  This way a recipient
- * can verify that the peer at least generated
- * the public/private key pair, and that the
- * timestamp matches what the current peer
- * believes it should be.  The receiving peer
- * would then check whether the XOR of the peer
- * identity and the timestamp is within a
- * reasonable range of the current time
- * (+/- N seconds).  If a closer message which
- * also verifies hasn't been received (or this
- * message is a duplicate), the peer
- * calculates the size estimate and forwards
- * the request to all other peers.
- *
- * Hmm... Is it enought to *just* send the peer
- * identity?  Obviously this is smaller, but it
- * doesn't allow us to verify that the
- * public/private key pair were generated, right?
- */
-struct GNUNET_NSE_ReplyMessage
-{
   /**
-   * Type: GNUNET_MESSAGE_TYPE_NSE_REPLY
+   * Timestamp at which the server received the message.
    */
-  struct GNUNET_MessageHeader header;
+  struct GNUNET_TIME_AbsoluteNBO timestamp;
 
   /**
-   * The current timestamp value (which all
-   * peers should agree on) signed by the
-   * private key of the initiating peer.
+   * The current estimated network size.
    */
-  struct GNUNET_Signed_Timestamp timestamp;
+  double size_estimate GNUNET_PACKED;
 
   /**
-   * Public key of the originator, signed timestamp
-   * is decrypted by this.
+   * The standard deviation (rounded down
+   * to the nearest integer) of size
+   * estimations.
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+  double std_deviation GNUNET_PACKED;
 };
 
+
 #endif