/**
* 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
/**
* 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.
/**
* 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.
* @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 */,
* @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->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_PeerIdentity * 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;
* @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;
}
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->origin.public_key)))
* @return #GNUNET_OK (continue to iterate)
*/
static int
-update_flood_times (void *cls,
- const struct GNUNET_PeerIdentity *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)
{
char pred[5];
struct GNUNET_PeerIdentity os;
- GNUNET_snprintf (origin,
- sizeof (origin),
- "%4s",
+ GNUNET_snprintf (origin,
+ sizeof (origin),
+ "%4s",
GNUNET_i2s (&incoming_flood->origin));
- GNUNET_snprintf (pred,
- sizeof (pred),
+ GNUNET_snprintf (pred,
+ sizeof (pred),
"%4s",
GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
#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->origin,
+ 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;
}
* @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;
* @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)
{
* @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;
* @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_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,
+ 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))
_
("NSE service is lacking key configuration settings. Exiting.\n"));
GNUNET_free (my_private_key);
- my_private_key = NULL;
+ my_private_key = NULL;
GNUNET_SCHEDULER_shutdown ();
return;
}
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