/**
* Should messages be delayed randomly? This option should be set to
- * #GNUNET_NO only for experiments, not in production.
+ * #GNUNET_NO only for experiments, not in production.
*/
#define USE_RANDOM_DELAYS GNUNET_YES
/**
* Message priority to use.
*/
-#define NSE_PRIORITY 5
+#define NSE_PRIORITY GNUNET_CORE_PRIO_CRITICAL_CONTROL
#if FREEBSD
#define log2(a) (log(a)/log(2))
static struct GNUNET_TIME_Relative proof_find_delay;
#if ENABLE_NSE_HISTOGRAM
+
+/**
+ * Handle to test if testbed logger service is running or not
+ */
+struct GNUNET_CLIENT_TestHandle *logger_test;
+
/**
* Handle for writing when we received messages to disk.
*/
static struct GNUNET_TESTBED_LOGGER_Handle *lh;
+
+/**
+ * Handle for writing message received timestamp information to disk.
+ */
+static struct GNUNET_BIO_WriteHandle *histogram;
+
#endif
/**
* Public key of the originator.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+ struct GNUNET_PeerIdentity origin;
/**
* Proof of work, causing leading zeros when hashed with pkey.
/**
* Signature (over range specified in purpose).
*/
- struct GNUNET_CRYPTO_EccSignature signature;
+ struct GNUNET_CRYPTO_EddsaSignature signature;
};
GNUNET_NETWORK_STRUCT_END
/**
* Handle to the core service.
*/
-static struct GNUNET_CORE_Handle *coreAPI;
+static struct GNUNET_CORE_Handle *core_api;
/**
* Map of all connected peers.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *peers;
+static struct GNUNET_CONTAINER_MultiPeerMap *peers;
/**
* The current network size estimate. Number of bits matching on
*/
static struct GNUNET_TIME_Absolute current_timestamp;
-/**
- * The public key of this peer.
- */
-static struct GNUNET_CRYPTO_EccPublicSignKey my_public_key;
-
/**
* The private key of this peer.
*/
-static struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
/**
* The peer identity of this peer.
em->reserved = htonl (0);
em->timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
double se = mean - 0.332747;
- nsize = log2 (GNUNET_CONTAINER_multihashmap_size (peers) + 1);
+ nsize = log2 (GNUNET_CONTAINER_multipeermap_size (peers) + 1);
em->size_estimate = GNUNET_hton_double (GNUNET_MAX (se, nsize));
em->std_deviation = GNUNET_hton_double (std_dev);
GNUNET_STATISTICS_set (stats, "# nodes in the network (estimate)",
* @param message the message received
*/
static void
-handle_start_message (void *cls,
+handle_start_message (void *cls,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct GNUNET_NSE_ClientMessage em;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received START message from client\n");
GNUNET_SERVER_notification_context_add (nc, client);
setup_estimate_message (&em);
size_t buf_len,
struct GNUNET_HashCode *result)
{
- GNUNET_break (0 ==
+ GNUNET_break (0 ==
gcry_kdf_derive (buf, buf_len,
GCRY_KDF_SCRYPT,
1 /* subalgo */,
const struct GNUNET_PeerIdentity *id)
{
struct GNUNET_HashCode timestamp_hash;
+ struct GNUNET_HashCode pid_hash;
GNUNET_CRYPTO_hash (×tamp.abs_value_us, sizeof (timestamp.abs_value_us),
×tamp_hash);
- return GNUNET_CRYPTO_hash_matching_bits (×tamp_hash, &id->hashPubKey);
+ GNUNET_CRYPTO_hash (id, sizeof (struct GNUNET_PeerIdentity), &pid_hash);
+ return GNUNET_CRYPTO_hash_matching_bits (×tamp_hash, &pid_hash);
}
* @param tc scheduler context
*/
static void
-transmit_task_cb (void *cls,
+transmit_task_cb (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc);
* @return number of bytes written to @a buf
*/
static size_t
-transmit_ready (void *cls,
+transmit_ready (void *cls,
size_t size,
void *buf)
{
GNUNET_NO);
#if ENABLE_NSE_HISTOGRAM
peer_entry->transmitted_messages++;
- peer_entry->last_transmitted_size =
+ peer_entry->last_transmitted_size =
ntohl(size_estimate_messages[idx].matching_bits);
#endif
memcpy (buf, &size_estimate_messages[idx],
* @param tc scheduler context
*/
static void
-transmit_task_cb (void *cls,
+transmit_task_cb (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct NSEPeerEntry *peer_entry = cls;
GNUNET_assert (NULL == peer_entry->th);
peer_entry->th =
- GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_NO, NSE_PRIORITY,
+ GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO,
+ NSE_PRIORITY,
GNUNET_TIME_UNIT_FOREVER_REL,
&peer_entry->id,
sizeof (struct
struct GNUNET_NSE_ClientMessage em;
setup_estimate_message (&em);
- GNUNET_SERVER_notification_context_broadcast (nc,
- &em.header,
+ GNUNET_SERVER_notification_context_broadcast (nc,
+ &em.header,
GNUNET_YES);
}
fm->purpose.size =
htonl (sizeof (struct GNUNET_NSE_FloodMessage) -
sizeof (struct GNUNET_MessageHeader) - sizeof (uint32_t) -
- sizeof (struct GNUNET_CRYPTO_EccSignature));
+ sizeof (struct GNUNET_CRYPTO_EddsaSignature));
fm->matching_bits = htonl (matching_bits);
fm->timestamp = GNUNET_TIME_absolute_hton (ts);
- fm->pkey = my_public_key;
+ fm->origin = my_identity;
fm->proof_of_work = my_proof;
if (nse_work_required > 0)
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_ecc_sign (my_private_key, &fm->purpose,
+ GNUNET_CRYPTO_eddsa_sign (my_private_key, &fm->purpose,
&fm->signature));
else
memset (&fm->signature, 0, sizeof (fm->signature));
* @return #GNUNET_OK (continue to iterate)
*/
static int
-schedule_current_round (void *cls,
- const struct GNUNET_HashCode * key,
+schedule_current_round (void *cls,
+ const struct GNUNET_PeerIdentity * key,
void *value)
{
struct NSEPeerEntry *peer_entry = value;
* @param tc context for this message
*/
static void
-update_flood_message (void *cls,
+update_flood_message (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TIME_Relative offset;
for (i = 0; i < HISTORY_SIZE; i++)
hop_count_max =
GNUNET_MAX (ntohl (size_estimate_messages[i].hop_count), hop_count_max);
- GNUNET_CONTAINER_multihashmap_iterate (peers, &schedule_current_round, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (peers, &schedule_current_round, NULL);
flood_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining
(next_timestamp), &update_flood_message,
unsigned int hash_count;
hash_count = 0;
- while ((0 == GNUNET_CRYPTO_hash_get_bit (hash, hash_count)))
+ while (0 == GNUNET_CRYPTO_hash_get_bit (hash, hash_count))
hash_count++;
return hash_count;
}
* @return #GNUNET_YES if valid, #GNUNET_NO if not
*/
static int
-check_proof_of_work (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
+check_proof_of_work (const struct GNUNET_CRYPTO_EddsaPublicKey *pkey,
uint64_t val)
{
- char buf[sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) +
+ char buf[sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) +
sizeof (val)] GNUNET_ALIGN;
struct GNUNET_HashCode result;
memcpy (buf, &val, sizeof (val));
memcpy (&buf[sizeof (val)], pkey,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
+ sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
pow_hash (buf, sizeof (buf), &result);
return (count_leading_zeroes (&result) >=
nse_work_required) ? GNUNET_YES : GNUNET_NO;
{
#define ROUND_SIZE 10
uint64_t counter;
- char buf[sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) +
+ char buf[sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) +
sizeof (uint64_t)] GNUNET_ALIGN;
struct GNUNET_HashCode result;
unsigned int i;
proof_task = GNUNET_SCHEDULER_NO_TASK;
- memcpy (&buf[sizeof (uint64_t)], &my_public_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey));
+ memcpy (&buf[sizeof (uint64_t)], &my_identity,
+ sizeof (struct GNUNET_PeerIdentity));
i = 0;
counter = my_proof;
while ((counter != UINT64_MAX) && (i < ROUND_SIZE))
verify_message_crypto (const struct GNUNET_NSE_FloodMessage *incoming_flood)
{
if (GNUNET_YES !=
- check_proof_of_work (&incoming_flood->pkey,
+ check_proof_of_work (&incoming_flood->origin.public_key,
incoming_flood->proof_of_work))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Proof of work invalid: %llu!\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Proof of work invalid: %llu!\n",
(unsigned long long)
GNUNET_ntohll (incoming_flood->proof_of_work));
GNUNET_break_op (0);
}
if ((nse_work_required > 0) &&
(GNUNET_OK !=
- GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_NSE_SEND,
+ GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_NSE_SEND,
&incoming_flood->purpose,
&incoming_flood->signature,
- &incoming_flood->pkey)))
+ &incoming_flood->origin.public_key)))
{
GNUNET_break_op (0);
return GNUNET_NO;
* @return #GNUNET_OK (continue to iterate)
*/
static int
-update_flood_times (void *cls,
- const struct GNUNET_HashCode *key,
+update_flood_times (void *cls,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct NSEPeerEntry *exclude = cls;
* @param peer peer identity this message is from (ignored)
*/
static int
-handle_p2p_size_estimate (void *cls,
+handle_p2p_size_estimate (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
uint64_t t;
t = GNUNET_TIME_absolute_get().abs_value_us;
- GNUNET_TESTBED_LOGGER_write (lh, &t, sizeof (uint64_t));
+ if (NULL != lh)
+ GNUNET_TESTBED_LOGGER_write (lh, &t, sizeof (uint64_t));
+ if (NULL != histogram)
+ GNUNET_BIO_write_int64 (histogram, t);
}
#endif
incoming_flood = (const struct GNUNET_NSE_FloodMessage *) message;
char pred[5];
struct GNUNET_PeerIdentity os;
- GNUNET_CRYPTO_hash (&incoming_flood->pkey,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
- &os.hashPubKey);
- GNUNET_snprintf (origin, sizeof (origin), "%s", GNUNET_i2s (&os));
- GNUNET_snprintf (pred, sizeof (pred), "%s", GNUNET_i2s (peer));
+ GNUNET_snprintf (origin,
+ sizeof (origin),
+ "%4s",
+ GNUNET_i2s (&incoming_flood->origin));
+ GNUNET_snprintf (pred,
+ sizeof (pred),
+ "%4s",
+ GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Flood at %s from `%s' via `%s' at `%s' with bits %u\n",
GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (incoming_flood->timestamp)),
}
#endif
- peer_entry = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
+ peer_entry = GNUNET_CONTAINER_multipeermap_get (peers, peer);
if (NULL == peer_entry)
{
GNUNET_break (0);
}
#if ENABLE_NSE_HISTOGRAM
peer_entry->received_messages++;
- if (peer_entry->transmitted_messages > 0 &&
+ if (peer_entry->transmitted_messages > 0 &&
peer_entry->last_transmitted_size >= matching_bits)
GNUNET_STATISTICS_update(stats, "# cross messages", 1, GNUNET_NO);
#endif
{
/* 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)))
+ memcmp (&incoming_flood->origin,
+ &my_identity, sizeof (my_identity)))
update_network_size_estimate ();
return GNUNET_OK;
}
peer_entry->previous_round = GNUNET_YES;
if (idx != estimate_index)
{
- /* do not transmit information for the previous round to this peer
+ /* do not transmit information for the previous round to this peer
anymore (but allow current round) */
return GNUNET_OK;
}
update_network_size_estimate ();
/* flood to rest */
- GNUNET_CONTAINER_multihashmap_iterate (peers, &update_flood_times,
+ GNUNET_CONTAINER_multipeermap_iterate (peers, &update_flood_times,
peer_entry);
return GNUNET_OK;
}
peer_entry = GNUNET_new (struct NSEPeerEntry);
peer_entry->id = *peer;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (peers, &peer->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (peers, peer,
peer_entry,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
peer_entry->transmit_task =
* @param peer peer identity this notification is about
*/
static void
-handle_core_disconnect (void *cls,
+handle_core_disconnect (void *cls,
const struct GNUNET_PeerIdentity *peer)
{
struct NSEPeerEntry *pos;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer `%s' disconnected from us\n",
GNUNET_i2s (peer));
- pos = GNUNET_CONTAINER_multihashmap_get (peers, &peer->hashPubKey);
+ pos = GNUNET_CONTAINER_multipeermap_get (peers, peer);
if (NULL == pos)
{
GNUNET_break (0);
return;
}
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (peers, &peer->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (peers, peer,
pos));
if (pos->transmit_task != GNUNET_SCHEDULER_NO_TASK) {
GNUNET_SCHEDULER_cancel (pos->transmit_task);
* @param cls NULL
* @param size the amount of data sent (ignored)
*/
-static void
-flush_comp_cb (void *cls,
+static void
+flush_comp_cb (void *cls,
size_t size)
{
GNUNET_TESTBED_LOGGER_disconnect (lh);
GNUNET_SERVER_notification_context_destroy (nc);
nc = NULL;
}
- if (NULL != coreAPI)
+ if (NULL != core_api)
{
- GNUNET_CORE_disconnect (coreAPI);
- coreAPI = NULL;
+ GNUNET_CORE_disconnect (core_api);
+ core_api = NULL;
}
if (NULL != stats)
{
}
if (NULL != peers)
{
- GNUNET_CONTAINER_multihashmap_destroy (peers);
+ GNUNET_CONTAINER_multipeermap_destroy (peers);
peers = NULL;
}
if (NULL != my_private_key)
my_private_key = NULL;
}
#if ENABLE_NSE_HISTOGRAM
- struct GNUNET_TIME_Relative timeout;
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
- GNUNET_TESTBED_LOGGER_flush (lh, timeout, &flush_comp_cb, NULL);
+ if (NULL != logger_test)
+ {
+ GNUNET_CLIENT_service_test_cancel (logger_test);
+ logger_test = NULL;
+ }
+ if (NULL != lh)
+ {
+ struct GNUNET_TIME_Relative timeout;
+ timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30);
+ GNUNET_TESTBED_LOGGER_flush (lh, timeout, &flush_comp_cb, NULL);
+ }
+ if (NULL != histogram)
+ {
+ GNUNET_BIO_write_close (histogram);
+ histogram = NULL;
+ }
#endif
}
* @param identity the public identity of this peer
*/
static void
-core_init (void *cls,
+core_init (void *cls,
const struct GNUNET_PeerIdentity *identity)
{
struct GNUNET_TIME_Absolute now;
GNUNET_TIME_absolute_add (current_timestamp, gnunet_nse_interval);
estimate_index = HISTORY_SIZE - 1;
estimate_count = 0;
- if (GNUNET_YES == check_proof_of_work (&my_public_key, my_proof))
+ if (GNUNET_YES == check_proof_of_work (&my_identity.public_key, my_proof))
{
int idx = (estimate_index + HISTORY_SIZE - 1) % HISTORY_SIZE;
prev_time.abs_value_us =
NULL);
}
+#if ENABLE_NSE_HISTOGRAM
+/**
+ * Function called with the status of the testbed logger service
+ *
+ * @param cls NULL
+ * @param status GNUNET_YES if the service is running,
+ * GNUNET_NO if the service is not running
+ * GNUNET_SYSERR if the configuration is invalid
+ */
+static void
+status_cb (void *cls, int status)
+{
+ logger_test = NULL;
+ if (GNUNET_YES != status)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed logger not running\n");
+ return;
+ }
+ if (NULL == (lh = GNUNET_TESTBED_LOGGER_connect (cfg)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Cannot connect to the testbed logger. Exiting.\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
+}
+#endif
+
/**
* Handle network size estimate clients.
* @param c configuration to use
*/
static void
-run (void *cls,
+run (void *cls,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
{NULL, 0, 0}
};
char *proof;
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
cfg = c;
- srv = server;
+ srv = server;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "INTERVAL",
&gnunet_nse_interval))
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "WORKDELAY",
- &proof_find_delay))
+ &proof_find_delay))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"NSE", "WORKDELAY");
GNUNET_SCHEDULER_shutdown ();
return;
}
-
+
#if ENABLE_NSE_HISTOGRAM
- if (NULL == (lh = GNUNET_TESTBED_LOGGER_connect (cfg)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot connect to the testbed logger. Exiting.\n");
- GNUNET_SCHEDULER_shutdown ();
- return;
+ char *histogram_dir;
+ char *histogram_fn;
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "NSE", "HISTOGRAM_DIR",
+ &histogram_dir))
+ {
+ GNUNET_assert (0 < GNUNET_asprintf (&histogram_fn, "%s/timestamps",
+ histogram_dir));
+ GNUNET_free (histogram_dir);
+ histogram = GNUNET_BIO_write_open (histogram_fn);
+ GNUNET_free (histogram_fn);
+ if (NULL == histogram)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to open histogram file\n");
+ }
+ logger_test =
+ GNUNET_CLIENT_service_test ("testbed-logger", cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &status_cb, NULL);
+
}
#endif
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
- pk = GNUNET_CRYPTO_ecc_key_create_from_configuration (cfg);
+ pk = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
GNUNET_assert (NULL != pk);
my_private_key = pk;
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, &my_public_key);
- GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
- &my_identity.hashPubKey);
+ GNUNET_CRYPTO_eddsa_key_get_public (my_private_key,
+ &my_identity.public_key);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, "NSE", "PROOFFILE", &proof))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("NSE service is lacking key configuration settings. Exiting.\n"));
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "NSE", "PROOFFILE");
GNUNET_free (my_private_key);
- my_private_key = NULL;
+ my_private_key = NULL;
GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
&find_proof, NULL);
- peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
+ peers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
GNUNET_SERVER_add_handlers (srv, handlers);
nc = GNUNET_SERVER_notification_context_create (srv, 1);
/* Connect to core service and register core handlers */
- coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */
+ core_api = GNUNET_CORE_connect (cfg, /* Main configuration */
NULL, /* Closure passed to functions */
&core_init, /* Call core_init once connected */
&handle_core_connect, /* Handle connects */
NULL, /* Don't want notified about all outbound messages */
GNUNET_NO, /* For header only outbound notification */
core_handlers); /* Register these handlers */
- if (NULL == coreAPI)
+ if (NULL == core_api)
{
GNUNET_SCHEDULER_shutdown ();
return;
* @return 0 ok, 1 on error
*/
int
-main (int argc,
+main (int argc,
char *const *argv)
{
return (GNUNET_OK ==
/**
* MINIMIZE heap size (way below 128k) since this process doesn't need much.
*/
-void __attribute__ ((constructor))
+void __attribute__ ((constructor))
GNUNET_ARM_memory_init ()
{
mallopt (M_TRIM_THRESHOLD, 4 * 1024);
projects / oweals / gnunet.git / blobdiff