uncrustify as demanded.

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

diff --git a/src/nse/nse.h b/src/nse/nse.h
index 245bd4ca7981c0ceee96cd29b9900f06dcfb1cc2..b0129addd435784d5c0677d713d44a7c1e23d09d 100644 (file)
--- a/src/nse/nse.h
+++ b/src/nse/nse.h
@@ -1,22 +1,22 @@
 /*
      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
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
 
-     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.
-*/
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
 
 /**
  * @author Nathan Evans
@@ -30,10 +30,7 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_NSE GNUNET_NO
-
-#define VERIFY_CRYPTO GNUNET_NO
-
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Network size estimate sent from the service
@@ -42,92 +39,34 @@
  * standard deviation of known estimates.
  *
  */
-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.
- *
- * 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_FloodMessage
-{
+struct GNUNET_NSE_ClientMessage {
   /**
-   * Type: GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD
+   * Type: GNUNET_MESSAGE_TYPE_NSE_ESTIMATE
    */
   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;
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif