-do not send previous round messages if we are just going online and did not setup...

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

diff --git a/src/nse/nse.h b/src/nse/nse.h
index a1bf2b1dd4aff8a2818777e48a718c2ddcdecb5b..91b629657c0829dddfd2300feca5cc233853e3d7 100644 (file)
--- a/src/nse/nse.h
+++ b/src/nse/nse.h
@@ -30,10 +30,10 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_NSE GNUNET_YES
-
-#define VERIFY_CRYPTO GNUNET_NO
-
+/**
+ * Generate debug-level log messages?
+ */
+#define DEBUG_NSE GNUNET_EXTRA_LOGGING
 
 /**
  * Network size estimate sent from the service
@@ -45,67 +45,32 @@
 struct GNUNET_NSE_ClientMessage
 {
   /**
-   * 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.
-   */
-  double std_deviation;
-};
-
-/**
- * Network size estimate reply; sent when "this"
- * peer's timer has run out before receiving a
- * valid reply from another peer.
- */
-struct GNUNET_NSE_FloodMessage
-{
-  /**
-   * Type: GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD
+   * Type: GNUNET_MESSAGE_TYPE_NSE_UPDATE
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * Purpose.
-   */
-  struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
-
-  /**
-   * Number of matching bits between the hash
-   * of timestamp and the initiator's public
-   * key.
+   * For alignment.
    */
-  uint32_t distance;
+  uint32_t reserved GNUNET_PACKED;
 
   /**
-   * The current timestamp value (which all
-   * peers should agree on).
+   * Timestamp at which the server received the message.
    */
   struct GNUNET_TIME_AbsoluteNBO timestamp;
 
   /**
-   * Public key of the originator.
-   */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
-
-  /**
-   * FIXME: use, document.
+   * The current estimated network size.
    */
-  uint32_t proof_of_work;
+  double size_estimate GNUNET_PACKED;
 
   /**
-   * FIXME: use, document.
+   * The standard deviation (rounded down
+   * to the nearest integer) of size
+   * estimations.
    */
-  struct GNUNET_CRYPTO_RsaSignature signature;
+  double std_deviation GNUNET_PACKED;
 };
 
+
 #endif