/*
This file is part of GNUnet.
(C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
-
+
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 3, 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.
-
+
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,
* this can calculate the expected number of peers in the network.
*/
#include "platform.h"
+#include <math.h>
#include "gnunet_util_lib.h"
#include "gnunet_constants.h"
#include "gnunet_protocols.h"
/**
* Over how many values do we calculate the weighted average?
*/
-#define HISTORY_SIZE 8
-
-/**
- * Size of the queue to core.
- */
-#define CORE_QUEUE_SIZE 2
+#define HISTORY_SIZE 64
/**
* Message priority to use.
*/
#define NSE_PRIORITY 5
+#if FREEBSD
+#define log2(a) (log(a)/log(2))
+#endif
+
/**
* Amount of work required (W-bit collisions) for NSE proofs, in collision-bits.
*/
/**
* Number of hops this message has taken so far.
*/
- uint32_t hop_count;
+ uint32_t hop_count GNUNET_PACKED;
/**
* Purpose.
* of timestamp and the initiator's public
* key.
*/
- uint32_t matching_bits;
+ uint32_t matching_bits GNUNET_PACKED;
/**
* Public key of the originator.
/**
* Proof of work, causing leading zeros when hashed with pkey.
*/
- uint64_t proof_of_work;
+ uint64_t proof_of_work GNUNET_PACKED;
/**
* Signature (over range specified in purpose).
/**
* The current network size estimate. Number of bits matching on
- * average thus far.
+ * average thus far.
*/
static double current_size_estimate;
setup_estimate_message (struct GNUNET_NSE_ClientMessage *em)
{
unsigned int i;
+ unsigned int j;
double mean;
double sum;
double std_dev;
double variance;
double val;
- double weight;
+ double nsize;
+
+ /* Weighted incremental algorithm for stddev according to West (1979) */
+#if WEST
double sumweight;
+ double weight;
double q;
double r;
double temp;
- /* Weighted incremental algorithm for stddev according to West (1979) */
mean = 0.0;
sum = 0.0;
sumweight = 0.0;
for (i = 0; i < estimate_count; i++)
{
- val = htonl (size_estimate_messages[(estimate_index - i + HISTORY_SIZE)
- % HISTORY_SIZE].matching_bits);
- weight = 1; /* was: estimate_count + 1 - i; */
+ j = (estimate_index - i + HISTORY_SIZE) % HISTORY_SIZE;
+ val = htonl (size_estimate_messages[j].matching_bits);
+ weight = 1.0; /* was: estimate_count + 1 - i; */
temp = weight + sumweight;
q = val - mean;
r = q * weight / temp;
- sum += sumweight * q * r;
mean += r;
+ sum += sumweight * q * r;
sumweight = temp;
}
- variance = sum / (sumweight - 1.0);
+ if (estimate_count > 0)
+ variance = (sum / sumweight) * estimate_count / (estimate_count - 1.0);
+#else
+ /* trivial version for debugging */
+ double vsq;
+
+ /* non-weighted trivial version */
+ sum = 0.0;
+ vsq = 0.0;
+ variance = 0.0;
+ mean = 0.0;
+
+ for (i = 0; i < estimate_count; i++)
+ {
+ j = (estimate_index - i + HISTORY_SIZE) % HISTORY_SIZE;
+ val = htonl (size_estimate_messages[j].matching_bits);
+ sum += val;
+ vsq += val * val;
+ }
+ if (0 != estimate_count)
+ {
+ mean = sum / estimate_count;
+ variance = (vsq - mean * sum) / (estimate_count - 1.0); // terrible for numerical stability...
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "(%f - %f) / %u = %f\n",
+ vsq, mean * sum, estimate_count - 1, variance);
+
+ }
+#endif
GNUNET_assert (variance >= 0);
std_dev = sqrt (variance);
current_std_dev = std_dev;
em->header.type = htons (GNUNET_MESSAGE_TYPE_NSE_ESTIMATE);
em->reserved = htonl (0);
em->timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
- em->size_estimate = mean - 1.0 / 3.0;
+ em->size_estimate = mean - 0.332747;
+ nsize = log2 (GNUNET_CONTAINER_multihashmap_size (peers) + 1);
+ if (em->size_estimate < nsize)
+ em->size_estimate = nsize;
em->std_deviation = std_dev;
- GNUNET_STATISTICS_set (stats,
- "# nodes in the network (estimate)",
+ GNUNET_STATISTICS_set (stats, "# nodes in the network (estimate)",
(uint64_t) pow (2, mean - 1.0 / 3.0), GNUNET_NO);
}
// f is frequency (gnunet_nse_interval)
// x is matching_bits
// p' is current_size_estimate
- return ((double) gnunet_nse_interval.rel_value / (double) 2.0)
- -
+ return ((double) gnunet_nse_interval.rel_value / (double) 2.0) -
((gnunet_nse_interval.rel_value / M_PI) *
atan (matching_bits - current_size_estimate));
}
* What delay randomization should we apply for a given number of matching bits?
*
* @param matching_bits number of matching bits
- * @return random delay to apply
+ * @return random delay to apply
*/
static struct GNUNET_TIME_Relative
get_delay_randomization (uint32_t matching_bits)
if (matching_bits == 0)
return GNUNET_TIME_UNIT_ZERO;
- ret.rel_value = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- (uint32_t) (get_matching_bits_delay
- (matching_bits -
- 1) /
- (double) (hop_count_max
- + 1)));
+ ret.rel_value =
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ (uint32_t) (get_matching_bits_delay
+ (matching_bits -
+ 1) / (double) (hop_count_max +
+ 1)));
return ret;
#else
return GNUNET_TIME_UNIT_ZERO;
{
GNUNET_HashCode timestamp_hash;
- GNUNET_CRYPTO_hash (×tamp.abs_value,
- sizeof (timestamp.abs_value), ×tamp_hash);
+ GNUNET_CRYPTO_hash (×tamp.abs_value, sizeof (timestamp.abs_value),
+ ×tamp_hash);
return GNUNET_CRYPTO_hash_matching_bits (×tamp_hash, &id->hashPubKey);
}
/**
- * Get the transmission delay that should be applied for a
+ * Get the transmission delay that should be applied for a
* particular round.
*
* @param round_offset -1 for the previous round (random delay between 0 and 50ms)
#endif
if (ntohl (size_estimate_messages[idx].hop_count) == 0)
GNUNET_STATISTICS_update (stats, "# flood messages started", 1, GNUNET_NO);
- GNUNET_STATISTICS_update (stats,
- "# flood messages transmitted", 1, GNUNET_NO);
- memcpy (buf,
- &size_estimate_messages[idx],
+ GNUNET_STATISTICS_update (stats, "# flood messages transmitted", 1,
+ GNUNET_NO);
+ memcpy (buf, &size_estimate_messages[idx],
sizeof (struct GNUNET_NSE_FloodMessage));
GNUNET_STATISTICS_update (stats, "# flood messages sent", 1, GNUNET_NO);
return sizeof (struct GNUNET_NSE_FloodMessage);
peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_assert (NULL == peer_entry->th);
- peer_entry->th
- = GNUNET_CORE_notify_transmit_ready (coreAPI,
- GNUNET_NO,
- NSE_PRIORITY,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &peer_entry->id,
- sizeof (struct
- GNUNET_NSE_FloodMessage),
- &transmit_ready, peer_entry);
+ peer_entry->th =
+ GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_NO, NSE_PRIORITY,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &peer_entry->id,
+ sizeof (struct
+ GNUNET_NSE_FloodMessage),
+ &transmit_ready, peer_entry);
}
fm->header.type = htons (GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD);
fm->hop_count = htonl (0);
fm->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_NSE_SEND);
- fm->purpose.size = htonl (sizeof (struct GNUNET_NSE_FloodMessage)
- - sizeof (struct GNUNET_MessageHeader)
- - sizeof (uint32_t)
- - sizeof (struct GNUNET_CRYPTO_RsaSignature));
+ fm->purpose.size =
+ htonl (sizeof (struct GNUNET_NSE_FloodMessage) -
+ sizeof (struct GNUNET_MessageHeader) - sizeof (uint32_t) -
+ sizeof (struct GNUNET_CRYPTO_RsaSignature));
fm->matching_bits = htonl (matching_bits);
fm->timestamp = GNUNET_TIME_absolute_hton (ts);
fm->pkey = my_public_key;
fm->proof_of_work = my_proof;
- GNUNET_CRYPTO_rsa_sign (my_private_key, &fm->purpose, &fm->signature);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CRYPTO_rsa_sign (my_private_key, &fm->purpose,
+ &fm->signature));
}
if (0 != offset.rel_value)
{
/* somehow run early, delay more */
- flood_task
- = GNUNET_SCHEDULER_add_delayed (offset, &update_flood_message, NULL);
+ flood_task =
+ GNUNET_SCHEDULER_add_delayed (offset, &update_flood_message, NULL);
return;
}
current_timestamp = next_timestamp;
- next_timestamp = GNUNET_TIME_absolute_add (current_timestamp,
- gnunet_nse_interval);
+ next_timestamp =
+ GNUNET_TIME_absolute_add (current_timestamp, gnunet_nse_interval);
estimate_index = (estimate_index + 1) % HISTORY_SIZE;
if (estimate_count < HISTORY_SIZE)
estimate_count++;
{
/* we received a message for this round way early, use it! */
size_estimate_messages[estimate_index] = next_message;
- size_estimate_messages[estimate_index].hop_count
- = htonl (1 + ntohl (next_message.hop_count));
+ size_estimate_messages[estimate_index].hop_count =
+ htonl (1 + ntohl (next_message.hop_count));
}
else
setup_flood_message (estimate_index, current_timestamp);
next_message.matching_bits = htonl (0); /* reset for 'next' round */
hop_count_max = 0;
for (i = 0; i < HISTORY_SIZE; i++)
- hop_count_max = GNUNET_MAX (ntohl (size_estimate_messages[i].hop_count),
- hop_count_max);
+ hop_count_max =
+ GNUNET_MAX (ntohl (size_estimate_messages[i].hop_count), hop_count_max);
GNUNET_CONTAINER_multihashmap_iterate (peers, &schedule_current_round, NULL);
flood_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
GNUNET_HashCode result;
memcpy (buf, &val, sizeof (val));
- memcpy (&buf[sizeof (val)],
- pkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ memcpy (&buf[sizeof (val)], pkey,
+ sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
GNUNET_CRYPTO_hash (buf, sizeof (buf), &result);
return (count_leading_zeroes (&result) >=
nse_work_required) ? GNUNET_YES : GNUNET_NO;
GNUNET_CONFIGURATION_get_value_filename (cfg, "NSE", "PROOFFILE", &proof))
return;
if (sizeof (my_proof) !=
- GNUNET_DISK_fn_write (proof,
- &my_proof,
- sizeof (my_proof),
+ GNUNET_DISK_fn_write (proof, &my_proof, sizeof (my_proof),
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", proof);
unsigned int i;
proof_task = GNUNET_SCHEDULER_NO_TASK;
- memcpy (&buf[sizeof (uint64_t)],
- &my_public_key,
+ memcpy (&buf[sizeof (uint64_t)], &my_public_key,
sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
i = 0;
counter = my_proof;
{
my_proof = counter;
#if DEBUG_NSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Proof of work found: %llu!\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Proof of work found: %llu!\n",
(unsigned long long) GNUNET_ntohll (counter));
#endif
for (i = 0; i < HISTORY_SIZE; i++)
if (ntohl (size_estimate_messages[i].hop_count) == 0)
{
size_estimate_messages[i].proof_of_work = my_proof;
- GNUNET_CRYPTO_rsa_sign (my_private_key,
- &size_estimate_messages[i].purpose,
- &size_estimate_messages[i].signature);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CRYPTO_rsa_sign (my_private_key,
+ &size_estimate_messages
+ [i].purpose,
+ &size_estimate_messages
+ [i].signature));
}
write_proof ();
return;
if (my_proof / (100 * ROUND_SIZE) < counter / (100 * ROUND_SIZE))
{
#if DEBUG_NSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Testing proofs currently at %llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing proofs currently at %llu\n",
(unsigned long long) counter);
#endif
/* remember progress every 100 rounds */
{
my_proof = counter;
}
- proof_task = GNUNET_SCHEDULER_add_delayed (proof_find_delay,
- &find_proof, NULL);
+ proof_task =
+ GNUNET_SCHEDULER_add_delayed (proof_find_delay, &find_proof, NULL);
}
check_proof_of_work (&incoming_flood->pkey,
incoming_flood->proof_of_work))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Proof of work invalid: %llu!\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Proof of work invalid: %llu!\n"),
(unsigned long long)
GNUNET_ntohll (incoming_flood->proof_of_work));
GNUNET_break_op (0);
return GNUNET_OK; /* trigger of the update */
if (peer_entry->previous_round == GNUNET_NO)
{
- /* still stuck in previous round, no point to update, check that
+ /* still stuck in previous round, no point to update, check that
* we are active here though... */
GNUNET_break ((peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK) ||
(peer_entry->th != NULL));
peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK;
}
delay = get_transmit_delay (0);
- peer_entry->transmit_task = GNUNET_SCHEDULER_add_delayed (delay,
- &transmit_task,
- peer_entry);
+ peer_entry->transmit_task =
+ GNUNET_SCHEDULER_add_delayed (delay, &transmit_task, peer_entry);
return GNUNET_OK;
}
* @param message message
* @param peer peer identity this message is from (ignored)
* @param atsi performance data (ignored)
- *
+ * @param atsi_count number of records in 'atsi'
*/
static int
-handle_p2p_size_estimate (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+handle_p2p_size_estimate (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
const struct GNUNET_NSE_FloodMessage *incoming_flood;
struct GNUNET_TIME_Absolute ts;
if (0 == (memcmp (peer, &my_identity, sizeof (struct GNUNET_PeerIdentity))))
{
/* send to self, update our own estimate IF this also comes from us! */
- if (0 == memcmp (&incoming_flood->pkey,
- &my_public_key, sizeof (my_public_key)))
+ if (0 ==
+ memcmp (&incoming_flood->pkey, &my_public_key, sizeof (my_public_key)))
update_network_size_estimate ();
return GNUNET_OK;
}
{
if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
- peer_entry->transmit_task = GNUNET_SCHEDULER_add_now (&transmit_task,
- peer_entry);
+ peer_entry->transmit_task =
+ GNUNET_SCHEDULER_add_now (&transmit_task, peer_entry);
}
/* Not closer than our most recent message, no need to do work here */
GNUNET_STATISTICS_update (stats,
update_network_size_estimate ();
/* flood to rest */
- GNUNET_CONTAINER_multihashmap_iterate (peers,
- &update_flood_times, peer_entry);
+ GNUNET_CONTAINER_multihashmap_iterate (peers, &update_flood_times,
+ peer_entry);
return GNUNET_OK;
}
* @param cls closure
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*/
static void
handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
struct NSEPeerEntry *peer_entry;
#if DEBUG_NSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' connected to us\n", GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected to us\n",
+ GNUNET_i2s (peer));
#endif
peer_entry = GNUNET_malloc (sizeof (struct NSEPeerEntry));
peer_entry->id = *peer;
- GNUNET_CONTAINER_multihashmap_put (peers,
- &peer->hashPubKey,
- peer_entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey, peer_entry,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
peer_entry->transmit_task =
GNUNET_SCHEDULER_add_delayed (get_transmit_delay (-1), &transmit_task,
peer_entry);
struct NSEPeerEntry *pos;
#if DEBUG_NSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' disconnected from us\n", GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected from us\n",
+ GNUNET_i2s (peer));
#endif
pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
if (NULL == pos)
return;
}
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (peers,
- &peer->hashPubKey, pos));
+ GNUNET_CONTAINER_multihashmap_remove (peers, &peer->hashPubKey,
+ pos));
if (pos->transmit_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (pos->transmit_task);
if (pos->th != NULL)
* @param cls service closure
* @param server handle to the server for this service
* @param identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Absolute prev_time;
}
estimate_index = HISTORY_SIZE - 1;
estimate_count = 2;
- flood_task
- =
+ flood_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
(next_timestamp), &update_flood_message,
NULL);
cfg = c;
if ((GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (cfg,
- "NSE", "INTERVAL",
+ GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "INTERVAL",
&gnunet_nse_interval)) ||
(GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (cfg,
- "NSE", "WORKDELAY",
+ GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "WORKDELAY",
&proof_find_delay)) ||
(GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
- "NSE", "WORKBITS",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "NSE", "WORKBITS",
&nse_work_required)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- "GNUNETD", "HOSTKEY", &keyfile))
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
+ &keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
nc = GNUNET_SERVER_notification_context_create (server, 1);
/* Connect to core service and register core handlers */
coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */
- CORE_QUEUE_SIZE, /* queue size */
+ 1,
NULL, /* Closure passed to functions */
&core_init, /* Call core_init once connected */
&handle_core_connect, /* Handle connects */
&handle_core_disconnect, /* Handle disconnects */
- NULL, /* Do we care about "status" updates? */
NULL, /* Don't want notified about all incoming messages */
GNUNET_NO, /* For header only inbound notification */
NULL, /* Don't want notified about all outbound messages */
GNUNET_NO, /* For header only outbound notification */
core_handlers); /* Register these handlers */
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
#if ENABLE_HISTOGRAM
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_filename (cfg, "NSE", "HISTOGRAM", &proof))
int
main (int argc, char *const *argv)
{
- return (GNUNET_OK == GNUNET_SERVICE_run (argc, argv,
- "nse",
- GNUNET_SERVICE_OPTION_NONE, &run,
- NULL)) ? 0 : 1;
+ return (GNUNET_OK ==
+ GNUNET_SERVICE_run (argc, argv, "nse", GNUNET_SERVICE_OPTION_NONE,
+ &run, NULL)) ? 0 : 1;
}
/* end of gnunet-service-nse.c */