/*
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
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.
*/
/**
#include "gnunet_common.h"
-#define DEBUG_NSE GNUNET_YES
-
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Network size estimate sent from the service
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
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD
+ * Type: GNUNET_MESSAGE_TYPE_NSE_ESTIMATE
*/
struct GNUNET_MessageHeader header;
/**
- * Magic header code(?)
- */
- uint16_t enc_type;
-
- /**
- * Number of matching bits between the hash
- * of timestamp and the initiator's public
- * key.
+ * For alignment.
*/
- uint16_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