doc: gnunet-c-tutorial: Add nodes.

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

diff --git a/src/nse/nse.h b/src/nse/nse.h
index ee9832dc6d62b2b11dfc336c953741cebc9e1964..e3a69cdeb4b70e65569109da11c8226c87b42221 100644 (file)
--- a/src/nse/nse.h
+++ b/src/nse/nse.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001-2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2001-2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -30,16 +30,7 @@
 
 #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];
-};
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Network size estimate sent from the service
@@ -51,69 +42,32 @@ struct GNUNET_Signed_Timestamp
 struct GNUNET_NSE_ClientMessage
 {
   /**
-   * Type:  GNUNET_MESSAGE_TYPE_NSE_UPDATE
+   * Type: GNUNET_MESSAGE_TYPE_NSE_ESTIMATE
    */
   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;
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif