/*
This file is part of GNUnet.
- (C)
+ Copyright (C)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_nse_service.h"
#include "rps.h"
+#include "gnunet-service-rps_sampler.h"
+
#include <math.h>
#include <inttypes.h>
// TODO modify @brief in every file
-// TODO take care that messages are not longer than 64k
-
// TODO check for overflows
// TODO align message structs
-// TODO multipeerlist indep of gossiped list
-
// (TODO api -- possibility of getting weak random peer immideately)
// TODO malicious peer
-// TODO switch Slist -> DLL
+// TODO connect to friends
+
+// TODO store peers somewhere
+
+// TODO ignore list?
+
+// hist_size_init, hist_size_max
/**
* Our configuration.
/**
* Our own identity.
*/
-struct GNUNET_PeerIdentity *own_identity;
+static struct GNUNET_PeerIdentity own_identity;
+
+
+ struct GNUNET_PeerIdentity *
+get_rand_peer_ignore_list (const struct GNUNET_PeerIdentity *peer_list, unsigned int size,
+ const struct GNUNET_PeerIdentity *ignore_list, unsigned int ignore_size);
+
+
+/***********************************************************************
+ * Housekeeping with peers
+***********************************************************************/
/**
- * Compare two peer identities. Taken from secretsharing.
- *
- * @param p1 Some peer identity.
- * @param p2 Some peer identity.
- * @return 1 if p1 > p2, -1 if p1 < p2 and 0 if p1 == p2.
+ * Struct used to store the context of a connected client.
*/
-static int
-peer_id_cmp (const void *p1, const void *p2)
+struct client_ctx
{
- return memcmp (p1, p2, sizeof (struct GNUNET_PeerIdentity));
-}
+ /**
+ * The message queue to communicate with the client.
+ */
+ struct GNUNET_MQ_Handle *mq;
+};
+
+/**
+ * Used to keep track in what lists single peerIDs are.
+ */
+enum PeerFlags
+{
+ PULL_REPLY_PENDING = 0x01,
+ IN_OTHER_GOSSIP_LIST = 0x02, // unneeded?
+ IN_OWN_SAMPLER_LIST = 0x04, // unneeded?
+ IN_OWN_GOSSIP_LIST = 0x08, // unneeded?
+
+ /**
+ * We set this bit when we can be sure the other peer is/was live.
+ */
+ LIVING = 0x10
+};
-/***********************************************************************
- * Sampler
- *
- * WARNING: This section needs to be reviewed regarding the use of
- * functions providing (pseudo)randomness!
-***********************************************************************/
-// TODO care about invalid input of the caller (size 0 or less...)
+/**
+ * Functions of this type can be used to be stored at a peer for later execution.
+ */
+typedef void (* PeerOp) (void *cls, const struct GNUNET_PeerIdentity *peer);
/**
- * A sampler sampling PeerIDs.
+ * Outstanding operation on peer consisting of callback and closure
*/
-struct Sampler
+struct PeerOutstandingOp
{
/**
- * Min-wise linear permutation used by this sampler.
- *
- * This is an key later used by a hmac.
+ * Callback
*/
- struct GNUNET_CRYPTO_AuthKey auth_key;
+ PeerOp op;
/**
- * The PeerID this sampler currently samples.
+ * Closure
*/
- struct GNUNET_PeerIdentity *peer_id;
+ void *op_cls;
+};
+
+/**
+ * Struct used to keep track of other peer's status
+ *
+ * This is stored in a multipeermap.
+ */
+struct PeerContext
+{
/**
- * The according hash value of this PeerID.
+ * In own gossip/sampler list, in other's gossip/sampler list
*/
- struct GNUNET_HashCode peer_id_hash;
+ uint32_t peer_flags;
/**
- * Samplers are kept in a linked list.
+ * Message queue open to client
*/
- struct Sampler *next;
+ struct GNUNET_MQ_Handle *mq;
/**
- * Samplers are kept in a linked list.
+ * Channel open to client.
*/
- struct Sampler *prev;
+ struct GNUNET_CADET_Channel *send_channel;
-};
+ /**
+ * Channel open from client.
+ */
+ struct GNUNET_CADET_Channel *recv_channel; // unneeded?
-/**
- * A n-tuple of samplers.
- */
-struct Samplers
-{
/**
- * Number of samplers we hold.
+ * Array of outstanding operations on this peer.
*/
- unsigned int size;
- //size_t size;
-
+ struct PeerOutstandingOp *outstanding_ops;
+
/**
- * All PeerIDs in one array.
+ * Number of outstanding operations.
*/
- struct GNUNET_PeerIdentity *peer_ids;
+ unsigned int num_outstanding_ops;
+ //size_t num_outstanding_ops;
/**
- * The head of the DLL.
+ * Handle to the callback given to cadet_ntfy_tmt_rdy()
+ *
+ * To be canceled on shutdown.
*/
- struct Sampler *head;
+ struct GNUNET_CADET_TransmitHandle *is_live_task;
/**
- * The tail of the DLL.
+ * Identity of the peer
*/
- struct Sampler *tail;
+ struct GNUNET_PeerIdentity peer_id;
+ /**
+ * This is pobably followed by 'statistical' data (when we first saw
+ * him, how did we get his ID, how many pushes (in a timeinterval),
+ * ...)
+ */
};
+/***********************************************************************
+ * /Housekeeping with peers
+***********************************************************************/
-typedef void (* SAMPLER_deleteCB) (void *cls, const struct GNUNET_PeerIdentity *id, struct GNUNET_HashCode hash);
+/***********************************************************************
+ * Globals
+***********************************************************************/
/**
- * (Re)Initialise given Sampler with random min-wise independent function.
- *
- * In this implementation this means choosing an auth_key for later use in
- * a hmac at random.
- *
- * @param id pointer to the place where this sampler will store the PeerID.
- * This will be overwritten.
+ * Sampler used for the Brahms protocol itself.
*/
- struct Sampler *
-SAMPLER_init(struct GNUNET_PeerIdentity *id)
-{
- struct Sampler *s;
-
- s = GNUNET_new(struct Sampler);
-
- // I guess I don't need to call GNUNET_CRYPTO_hmac_derive_key()...
- GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_STRONG,
- &(s->auth_key.key),
- GNUNET_CRYPTO_HASH_LENGTH);
-
- //s->peer_id = GNUNET_new( struct GNUNET_PeerIdentity );
- GNUNET_assert(NULL != id);
- s->peer_id = id;
- memcpy(s->peer_id, own_identity, sizeof(struct GNUNET_PeerIdentity));
- //s->peer_id = own_identity; // Maybe set to own PeerID. So we always have
- // a valid PeerID in the sampler.
- // Maybe take a PeerID as second argument.
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: initialised with PeerID %s (at %p) \n", GNUNET_i2s(s->peer_id), s->peer_id);
-
- GNUNET_CRYPTO_hmac(&s->auth_key, s->peer_id,
- sizeof(struct GNUNET_PeerIdentity),
- &s->peer_id_hash);
-
- s->prev = NULL;
- s->next = NULL;
-
- return s;
-}
+static struct RPS_Sampler *prot_sampler;
/**
- * Compare two hashes.
- *
- * Returns if the first one is smaller then the second.
- * Used by SAMPLER_next() to compare hashes.
+ * Sampler used for the clients.
*/
- int
-hash_cmp(struct GNUNET_HashCode hash1, struct GNUNET_HashCode hash2)
-{
- return memcmp( (const void *) &hash1, (const void *) & hash2, sizeof(struct GNUNET_HashCode));
-}
+static struct RPS_Sampler *client_sampler;
/**
- * Input an PeerID into the given sampler.
+ * Set of all peers to keep track of them.
*/
- static void
-SAMPLER_next(struct Sampler *s, const struct GNUNET_PeerIdentity *id, SAMPLER_deleteCB del_cb, void *cb_cls)
- // TODO set id in peer_ids
-{
- struct GNUNET_HashCode other_hash;
+static struct GNUNET_CONTAINER_MultiPeerMap *peer_map;
- if ( id == s->peer_id )
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Got PeerID %s\n",
- GNUNET_i2s(id));
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Have already PeerID %s\n",
- GNUNET_i2s(s->peer_id));
- }
- else
- {
- GNUNET_CRYPTO_hmac(&s->auth_key,
- id,
- sizeof(struct GNUNET_PeerIdentity),
- &other_hash);
-
- if ( NULL == s->peer_id )
- { // Or whatever is a valid way to say
- // "we have no PeerID at the moment"
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Got PeerID %s; Simply accepting (got NULL previously).\n",
- GNUNET_i2s(id));
- memcpy(s->peer_id, id, sizeof(struct GNUNET_PeerIdentity));
- //s->peer_id = id;
- s->peer_id_hash = other_hash;
- }
- else if ( 0 > hash_cmp(other_hash, s->peer_id_hash) )
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Got PeerID %s\n",
- GNUNET_i2s(id));
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Discarding old PeerID %s\n",
- GNUNET_i2s(s->peer_id));
- if ( NULL != del_cb )
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Removing old PeerID %s with the delete callback.\n",
- GNUNET_i2s(s->peer_id));
- del_cb(cb_cls, s->peer_id, s->peer_id_hash);
- }
+/**
+ * The gossiped list of peers.
+ */
+static struct GNUNET_PeerIdentity *gossip_list;
- memcpy(s->peer_id, id, sizeof(struct GNUNET_PeerIdentity));
- //s->peer_id = id;
- s->peer_id_hash = other_hash;
- }
- else
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Got PeerID %s\n",
- GNUNET_i2s(id), id);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER: Keeping old PeerID %s\n",
- GNUNET_i2s(s->peer_id), s->peer_id);
- }
- }
-}
+/**
+ * Size of the gossiped list
+ */
+//static unsigned int gossip_list_size;
+static uint32_t gossip_list_size;
/**
- * Initialise a tuple of samplers.
+ * The size of sampler we need to be able to satisfy the client's need of
+ * random peers.
*/
-struct Samplers *
-SAMPLER_samplers_init(size_t init_size)
-{
- struct Samplers *samplers;
- struct Sampler *s;
- uint64_t i;
+static unsigned int sampler_size_client_need;
- samplers = GNUNET_new(struct Samplers);
- samplers->size = 0;
- samplers->head = samplers->tail = NULL;
- samplers->peer_ids = NULL;
- //samplers->peer_ids = GNUNET_new_array(init_size, struct GNUNET_PeerIdentity);
+/**
+ * The size of sampler we need to be able to satisfy the Brahms protocol's
+ * need of random peers.
+ *
+ * This is directly taken as the #gossip_list_size on update of the
+ * #gossip_list
+ *
+ * This is one minimum size the sampler grows to.
+ */
+static unsigned int sampler_size_est_need;
- for ( i = 0 ; i < init_size ; i++ )
- {
- GNUNET_array_append(samplers->peer_ids,
- samplers->size,
- *own_identity);
- //samplers->size++;
- s = SAMPLER_init(&samplers->peer_ids[i]);
- GNUNET_CONTAINER_DLL_insert_tail(samplers->head,
- samplers->tail,
- s);
- }
- //samplers->size = init_size;
- GNUNET_assert(init_size == samplers->size);
- return samplers;
-}
+/**
+ * Percentage of total peer number in the gossip list
+ * to send random PUSHes to
+ */
+static float alpha;
/**
- * A fuction to update every sampler in the given list
+ * Percentage of total peer number in the gossip list
+ * to send random PULLs to
*/
- static void
-SAMPLER_update_list(struct Samplers *samplers, const struct GNUNET_PeerIdentity *id,
- SAMPLER_deleteCB del_cb, void *cb_cls)
-{
- struct Sampler *iter;
+static float beta;
+
+/**
+ * The percentage gamma of history updates.
+ * Simply 1 - alpha - beta
+ */
+
+
+/**
+ * Identifier for the main task that runs periodically.
+ */
+static struct GNUNET_SCHEDULER_Task *do_round_task;
+
+/**
+ * Time inverval the do_round task runs in.
+ */
+static struct GNUNET_TIME_Relative round_interval;
+
- iter = samplers->head;
- while ( NULL != iter->next )
- {
- SAMPLER_next(iter, id, del_cb, cb_cls);
- iter = iter->next;
- }
-
-}
/**
- * Get one random peer out of the sampled peers.
+ * List to store peers received through pushes temporary.
*
- * We might want to reinitialise this sampler after giving the
- * corrsponding peer to the client.
+ * TODO -> multipeermap
*/
- const struct GNUNET_PeerIdentity*
-SAMPLER_get_rand_peer (struct Samplers *samplers)
-{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "SAMPLER_get_rand_peer:\n");
+static struct GNUNET_PeerIdentity *push_list;
- if ( 0 == samplers->size )
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sgrp: List empty - Returning own PeerID %s\n", GNUNET_i2s(own_identity));
- return own_identity;
- }
- else
- {
- uint64_t index;
- struct Sampler *iter;
- uint64_t i;
- const struct GNUNET_PeerIdentity *peer;
-
- /**
- * Choose the index of the peer we want to give back
- * at random from the interval of the sampler list
- */
- index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
- samplers->size);
- // TODO check that it does not overflow
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sgrp: Length of Slist: %" PRIu64 ", index: %" PRIu64 "\n", samplers->size, index);
+/**
+ * Size of the push_list;
+ */
+static unsigned int push_list_size;
+//size_t push_list_size;
- iter = samplers->head;
- for ( i = 0 ; i < index ; i++ )
- {
- if ( NULL == iter->next )
- { // Maybe unneeded
- iter = samplers->head;
- }
- }
-
- // TODO something missing?
+/**
+ * List to store peers received through pulls temporary.
+ *
+ * TODO -> multipeermap
+ */
+static struct GNUNET_PeerIdentity *pull_list;
+
+/**
+ * Size of the pull_list;
+ */
+static unsigned int pull_list_size;
+//size_t pull_list_size;
- peer = iter->peer_id;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sgrp: Returning PeerID %s\n", GNUNET_i2s(peer));
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sgrp: (own ID: %s)\n", GNUNET_i2s(own_identity));
- return peer;
- }
-}
+/**
+ * Handler to NSE.
+ */
+static struct GNUNET_NSE_Handle *nse;
+
+/**
+ * Handler to CADET.
+ */
+static struct GNUNET_CADET_Handle *cadet_handle;
+
/**
- * Get n random peers out of the sampled peers.
+ * Request counter.
*
- * We might want to reinitialise this sampler after giving the
- * corrsponding peer to the client.
- * Random with or without consumption?
+ * Only needed in the beginning to check how many of the 64 deltas
+ * we already have
*/
- const struct GNUNET_PeerIdentity* // TODO give back simple array
-SAMPLER_get_n_rand_peers (struct Samplers *samplers, uint64_t n)
-{
- // TODO check if we have too much (distinct) sampled peers
- // If we are not ready yet maybe schedule for later
- struct GNUNET_PeerIdentity *peers;
- uint64_t i;
-
- peers = GNUNET_malloc(n * sizeof(struct GNUNET_PeerIdentity));
+static unsigned int req_counter;
- for ( i = 0 ; i < n ; i++ ) {
- //peers[i] = SAMPLER_get_rand_peer(samplers);
- memcpy(&peers[i], SAMPLER_get_rand_peer(samplers), sizeof(struct GNUNET_PeerIdentity));
- }
+/**
+ * Time of the last request we received.
+ *
+ * Used to compute the expected request rate.
+ */
+static struct GNUNET_TIME_Absolute last_request;
- // TODO something else missing?
- return peers;
-}
+/**
+ * Size of #request_deltas.
+ */
+#define REQUEST_DELTAS_SIZE 64
+static unsigned int request_deltas_size = REQUEST_DELTAS_SIZE;
/**
- * Counts how many Samplers currently hold a given PeerID.
+ * Last 64 deltas between requests
*/
- uint64_t
-SAMPLER_count_id ( struct Samplers *samplers, struct GNUNET_PeerIdentity *id )
-{
- struct Sampler *iter;
- uint64_t count;
+static struct GNUNET_TIME_Relative request_deltas[REQUEST_DELTAS_SIZE];
+
+/**
+ * The prediction of the rate of requests
+ */
+static struct GNUNET_TIME_Relative request_rate;
- iter = samplers->head;
- count = 0;
- while ( NULL != iter )
- {
- if ( peer_id_cmp( iter->peer_id, id) )
- count++;
- iter = iter->next;
- }
- return count;
-}
/**
- * Gow the size of the tuple of samplers.
+ * List with the peers we sent requests to.
*/
- void
-SAMPLER_samplers_grow (struct Samplers * samplers, size_t new_size)
-{
- uint64_t i;
- struct Sampler *sampler;
+struct GNUNET_PeerIdentity *pending_pull_reply_list;
- if ( new_size > samplers->size )
- {
- GNUNET_array_grow(samplers->peer_ids, samplers->size, new_size);
- for ( i = 0 ; i < new_size - samplers->size ; i++ )
- {
- sampler = SAMPLER_init(&samplers->peer_ids[samplers->size + i]);
- GNUNET_CONTAINER_DLL_insert_tail(samplers->head, samplers->tail, sampler);
- }
- }
- else if ( new_size < samplers->size )
- {
- for ( i = 0 ; i < samplers->size - new_size ; i++)
- {
- // TODO call delCB on elem?
- sampler = samplers->tail;
- GNUNET_CONTAINER_DLL_remove(samplers->head, samplers->tail, sampler);
- }
- GNUNET_array_grow(samplers->peer_ids, samplers->size, new_size);
- }
+/**
+ * Size of #pending_pull_reply_list.
+ */
+uint32_t pending_pull_reply_list_size;
+
+
+/**
+ * Number of history update tasks.
+ */
+uint32_t num_hist_update_tasks;
- samplers->size = new_size;
-}
/***********************************************************************
- * /Sampler
+ * /Globals
***********************************************************************/
-
/***********************************************************************
- * Housekeeping with peers
+ * Util functions
***********************************************************************/
/**
- * Struct used to store the context of a connected client.
+ * Check if peer is already in peer array.
*/
-struct client_ctx
+ int
+in_arr (const struct GNUNET_PeerIdentity *array,
+ unsigned int arr_size,
+ const struct GNUNET_PeerIdentity *peer)
{
- /**
- * The message queue to communicate with the client.
- */
- struct GNUNET_MQ_Handle *mq;
-};
+ GNUNET_assert (NULL != peer);
+
+ if (0 == arr_size)
+ return GNUNET_NO;
+
+ GNUNET_assert (NULL != array);
+
+ unsigned int i;
+
+ i = 0;
+ while (0 != GNUNET_CRYPTO_cmp_peer_identity (&array[i], peer) &&
+ i < arr_size)
+ i++;
+
+ if (i == arr_size)
+ return GNUNET_NO;
+ else
+ return GNUNET_YES;
+}
/**
- * Used to keep track in what lists single peerIDs are.
+ * Remove peer from list.
*/
-enum in_list_flag // probably unneeded
+ void
+rem_from_list (struct GNUNET_PeerIdentity *peer_list,
+ unsigned int *list_size,
+ const struct GNUNET_PeerIdentity *peer)
{
- in_other_sampler_list = 0x1,
- in_other_gossip_list = 0x2, // unneeded?
- in_own_sampler_list = 0x4,
- in_own_gossip_list = 0x8 // unneeded?
-};
+ unsigned int i;
+
+ for ( i = 0 ; i < *list_size ; i++ )
+ {
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&peer_list[i], peer))
+ {
+ if (i < *list_size -1)
+ { /* Not at the last entry -- shift peers left */
+ memcpy (&peer_list[i], &peer_list[i +1],
+ (*list_size - i -1) * sizeof (struct GNUNET_PeerIdentity));
+ }
+ /* Remove last entry (should be now useless PeerID) */
+ GNUNET_array_grow (peer_list, *list_size, *list_size -1);
+ }
+ }
+}
/**
- * Struct used to keep track of other peer's status
- *
- * This is stored in a multipeermap.
+ * Get random peer from the given list but don't return one from the @a ignore_list.
*/
-struct peer_context
+ struct GNUNET_PeerIdentity *
+get_rand_peer_ignore_list (const struct GNUNET_PeerIdentity *peer_list,
+ uint32_t list_size,
+ const struct GNUNET_PeerIdentity *ignore_list,
+ uint32_t ignore_size)
{
- /**
- * In own gossip/sampler list, in other's gossip/sampler list
- */
- uint32_t in_flags; // unneeded?
+ uint32_t r_index;
+ uint32_t tmp_size;
+ struct GNUNET_PeerIdentity *tmp_peer_list;
+ struct GNUNET_PeerIdentity *peer;
- /**
- * Message queue open to client
- */
- struct GNUNET_MQ_Handle *mq;
+ GNUNET_assert (NULL != peer_list);
+ if (0 == list_size)
+ return NULL;
- /**
- * Channel open to client.
- */
- struct GNUNET_CADET_Channel *to_channel;
+ tmp_size = 0;
+ tmp_peer_list = NULL;
+ GNUNET_array_grow (tmp_peer_list, tmp_size, list_size);
+ memcpy (tmp_peer_list, peer_list, list_size * sizeof (struct GNUNET_PeerIdentity));
+ peer = GNUNET_new (struct GNUNET_PeerIdentity);
- /**
- * Channel open from client.
+ /**;
+ * Choose the r_index of the peer we want to return
+ * at random from the interval of the gossip list
*/
- struct GNUNET_CADET_Channel *from_channel; // unneeded
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
+ tmp_size);
+ *peer = tmp_peer_list[r_index];
- /**
- * This is pobably followed by 'statistical' data (when we first saw
- * him, how did we get his ID, how many pushes (in a timeinterval),
- * ...)
- */
-};
+ while (in_arr (ignore_list, ignore_size, peer))
+ {
+ rem_from_list (tmp_peer_list, &tmp_size, peer);
-/***********************************************************************
- * /Housekeeping with peers
-***********************************************************************/
+ if (0 == tmp_size)
+ {
+ GNUNET_free (peer);
+ return NULL;
+ }
-/**
- * Set of all peers to keep track of them.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *peer_map;
+ /**;
+ * Choose the r_index of the peer we want to return
+ * at random from the interval of the gossip list
+ */
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
+ tmp_size);
+ *peer = tmp_peer_list[r_index];
+ }
-// -- gossip list length --
-// Depends on the (estimated) size of the
-// network. - Initial size might be the
-// number of peers cadet provides.
-// TODO other events to grow/shrink size?
+ GNUNET_array_grow (tmp_peer_list, tmp_size, 0);
+
+ return peer;
+}
-/**
- * List of samplers.
- */
-struct Samplers *sampler_list; // TODO rename to sampler_list
/**
- * Sampler list size // TODO get rid of that
- *
- * Adapts to the nse. Size should be in BigTheta(network_size)^(1/3).
+ * Get the context of a peer. If not existing, create.
*/
-size_t sampler_list_size;
+ struct PeerContext *
+get_peer_ctx (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct PeerContext *ctx;
+
+ if ( GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
+ {
+ ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
+ }
+ else
+ {
+ ctx = GNUNET_new (struct PeerContext);
+ ctx->peer_flags = 0;
+ ctx->mq = NULL;
+ ctx->send_channel = NULL;
+ ctx->recv_channel = NULL;
+ ctx->outstanding_ops = NULL;
+ ctx->num_outstanding_ops = 0;
+ (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer, ctx,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ }
+ return ctx;
+}
/**
- * The gossiped list of peers.
+ * Put random peer from sampler into the gossip list as history update.
*/
-struct GNUNET_PeerIdentity *gossip_list;
+ void
+hist_update (void *cls, struct GNUNET_PeerIdentity *ids, uint32_t num_peers)
+{
+ GNUNET_assert (1 == num_peers);
+
+ if (gossip_list_size < sampler_size_est_need)
+ GNUNET_array_append (gossip_list, gossip_list_size, *ids);
+
+ if (0 < num_hist_update_tasks)
+ num_hist_update_tasks--;
+}
+
/**
- * Size of the gossiped list
+ * Callback that is called when a channel was effectively established.
+ * This is given to ntfy_tmt_rdy and called when the channel was
+ * successfully established.
*/
-unsigned int gossip_list_size;
+static size_t
+peer_is_live (void *cls, size_t size, void *buf)
+{
+ struct PeerContext *ctx = cls;
+ struct GNUNET_PeerIdentity *peer;
+ struct PeerContext *peer_ctx;
+
+ //if (NULL == buf ||
+ // 0 == size)
+ // TODO check
+
+ ctx->is_live_task = NULL;
+ peer = &ctx->peer_id;
+ peer_ctx = get_peer_ctx (peer_map, peer);
+ peer_ctx->peer_flags |= LIVING;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer %s is live\n", GNUNET_i2s (peer));
+
+ if (0 != peer_ctx->num_outstanding_ops)
+ { /* Call outstanding operations */
+ unsigned int i;
+
+ for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; i++ )
+ peer_ctx->outstanding_ops[i].op (peer_ctx->outstanding_ops[i].op_cls, peer);
+ GNUNET_array_grow (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, 0);
+ }
+
+ //if (NULL != peer_ctx->is_live_task)
+ //{
+ // GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
+ // peer_ctx->is_live_task = NULL; // needed?
+ //}
+ return 0;
+}
+
/**
- * Min size of the gossip list
+ * Get the channel of a peer. If not existing, create.
*/
-uint64_t gossip_list_min_size;
+ struct GNUNET_CADET_Channel *
+get_channel (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct PeerContext *ctx;
+
+ ctx = get_peer_ctx (peer_map, peer);
+ if (NULL == ctx->send_channel)
+ {
+ ctx->send_channel = GNUNET_CADET_channel_create (cadet_handle, NULL, peer,
+ GNUNET_RPS_CADET_PORT,
+ GNUNET_CADET_OPTION_RELIABLE);
+
+ if (NULL == ctx->recv_channel)
+ {
+ ctx->peer_id = *peer;
+ ctx->is_live_task =
+ GNUNET_CADET_notify_transmit_ready (ctx->send_channel, GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ sizeof (struct GNUNET_MessageHeader),
+ peer_is_live, ctx);
+ }
-///**
-// * Max size of the gossip list
-// *
-// * This will probably be left to be set by the client.
-// */
-//uint64_t gossip_list_max_size;
+ // do I have to explicitly put it in the peer_map?
+ (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer, ctx,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+ }
+ return ctx->send_channel;
+}
/**
- * The estimated size of the network.
+ * Get the message queue of a specific peer.
*
- * Influenced by the stdev.
+ * If we already have a message queue open to this client,
+ * simply return it, otherways create one.
*/
-size_t est_size;
+ struct GNUNET_MQ_Handle *
+get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer_id)
+{
+ struct PeerContext *ctx;
+ ctx = get_peer_ctx (peer_map, peer_id);
+ if (NULL == ctx->mq)
+ {
+ (void) get_channel (peer_map, peer_id);
+ ctx->mq = GNUNET_CADET_mq_create (ctx->send_channel);
+ //do I have to explicitly put it in the peer_map?
+ (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer_id, ctx,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+ }
+ return ctx->mq;
+}
/**
- * Percentage of total peer number in the gossip list
- * to send random PUSHes to
- */
-float alpha;
+ * Sum all time relatives of an array.
+ */
+ struct GNUNET_TIME_Relative
+T_relative_sum (const struct GNUNET_TIME_Relative *rel_array, uint32_t arr_size)
+{
+ struct GNUNET_TIME_Relative sum;
+ uint32_t i;
+
+ sum = GNUNET_TIME_UNIT_ZERO;
+ for ( i = 0 ; i < arr_size ; i++ )
+ {
+ sum = GNUNET_TIME_relative_add (sum, rel_array[i]);
+ }
+ return sum;
+}
-/**
- * Percentage of total peer number in the gossip list
- * to send random PULLs to
- */
-float beta;
/**
- * The percentage gamma of history updates.
- * Simply 1 - alpha - beta
+ * Compute the average of given time relatives.
*/
-
-
+ struct GNUNET_TIME_Relative
+T_relative_avg (const struct GNUNET_TIME_Relative *rel_array, uint32_t arr_size)
+{
+ return GNUNET_TIME_relative_divide (T_relative_sum (rel_array, arr_size), arr_size);
+}
/**
- * Identifier for the main task that runs periodically.
+ * Insert PeerID in #pull_list
+ *
+ * Called once we know a peer is live.
*/
-GNUNET_SCHEDULER_TaskIdentifier do_round_task;
+ void
+insert_in_pull_list (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ if (GNUNET_NO == in_arr (pull_list, pull_list_size, peer))
+ GNUNET_array_append (pull_list, pull_list_size, *peer);
+}
/**
- * Time inverval the do_round task runs in.
+ * Check whether #insert_in_pull_list was already scheduled
*/
-struct GNUNET_TIME_Relative round_interval;
+ int
+insert_in_pull_list_scheduled (const struct PeerContext *peer_ctx)
+{
+ unsigned int i;
+ for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; i++ )
+ if (insert_in_pull_list == peer_ctx->outstanding_ops[i].op)
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
/**
- * List to store peers received through pushes temporary.
+ * Insert PeerID in #gossip_list
+ *
+ * Called once we know a peer is live.
*/
-struct GNUNET_PeerIdentity *push_list;
+ void
+insert_in_gossip_list (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ if (GNUNET_NO == in_arr (gossip_list, gossip_list_size, peer))
+ GNUNET_array_append (gossip_list, gossip_list_size, *peer);
+}
/**
- * Size of the push_list;
+ * Check whether #insert_in_pull_list was already scheduled
*/
-unsigned int push_list_size;
-//size_t push_list_size;
+ int
+insert_in_gossip_list_scheduled (const struct PeerContext *peer_ctx)
+{
+ unsigned int i;
+
+ for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; i++ )
+ if (insert_in_gossip_list == peer_ctx->outstanding_ops[i].op)
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
-/**
- * List to store peers received through pulls temporary.
- */
-struct GNUNET_PeerIdentity *pull_list;
/**
- * Size of the pull_list;
+ * Update sampler with given PeerID.
*/
-unsigned int pull_list_size;
-//size_t pull_list_size;
+ void
+insert_in_sampler (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ RPS_sampler_update (prot_sampler, peer);
+ RPS_sampler_update (client_sampler, peer);
+}
/**
- * Handler to NSE.
+ * Check whether #insert_in_sampler was already scheduled
*/
-struct GNUNET_NSE_Handle *nse;
+static int
+insert_in_sampler_scheduled (const struct PeerContext *peer_ctx)
+{
+ unsigned int i;
+
+ for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; i++ )
+ if (insert_in_sampler== peer_ctx->outstanding_ops[i].op)
+ return GNUNET_YES;
+ return GNUNET_NO;
+}
+
/**
- * Handler to CADET.
+ * Wrapper around #RPS_sampler_resize()
+ *
+ * If we do not have enough sampler elements, double current sampler size
+ * If we have more than enough sampler elements, halv current sampler size
*/
-struct GNUNET_CADET_Handle *cadet_handle;
-
+static void
+resize_wrapper (struct RPS_Sampler *sampler, uint32_t new_size)
+{
+ unsigned int sampler_size;
+
+ // TODO statistics
+ // TODO respect the min, max
+ sampler_size = RPS_sampler_get_size (sampler);
+ if (sampler_size > new_size * 4)
+ { /* Shrinking */
+ RPS_sampler_resize (sampler, sampler_size / 2);
+ }
+ else if (sampler_size < new_size)
+ { /* Growing */
+ RPS_sampler_resize (sampler, sampler_size * 2);
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size is now %u\n", sampler_size);
+}
-/***********************************************************************
- * Util functions
-***********************************************************************/
/**
- * Get random peer from the gossip list.
+ * Wrapper around #RPS_sampler_resize() resizing the client sampler
*/
- struct GNUNET_PeerIdentity *
-get_rand_gossip_peer()
+static void
+client_resize_wrapper ()
{
- uint64_t index;
- struct GNUNET_PeerIdentity *peer;
+ uint32_t bigger_size;
+ unsigned int sampler_size;
- // TODO find a better solution.
- // FIXME if we have only own ID in gossip list this will block
- // but then we might have a problem nevertheless ?
+ // TODO statistics
- do {
-
- /**;
- * Choose the index of the peer we want to return
- * at random from the interval of the gossip list
- */
- index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
- gossip_list_size);
+ sampler_size = RPS_sampler_get_size (client_sampler);
- peer = &(gossip_list[index]);
- } while ( own_identity == peer || NULL == peer );
+ if (sampler_size_est_need > sampler_size_client_need)
+ bigger_size = sampler_size_est_need;
+ else
+ bigger_size = sampler_size_client_need;
- return peer;
+ // TODO respect the min, max
+ resize_wrapper (client_sampler, bigger_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size is now %u\n", sampler_size);
}
+
/**
- * Get the message queue of a specific peer.
+ * Estimate request rate
*
- * If we already have a message queue open to this client,
- * simply return it, otherways create one.
+ * Called every time we receive a request from the client.
*/
- struct GNUNET_MQ_Handle *
-get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, struct GNUNET_PeerIdentity *peer_id)
+ void
+est_request_rate()
{
- struct peer_context *ctx;
- struct GNUNET_MQ_Handle * mq;
- struct GNUNET_CADET_Channel *channel;
-
- if ( GNUNET_OK != GNUNET_CONTAINER_multipeermap_contains( peer_map, peer_id ) ) {
-
- channel = GNUNET_CADET_channel_create(cadet_handle, NULL, peer_id,
- GNUNET_RPS_CADET_PORT,
- GNUNET_CADET_OPTION_RELIABLE);
- mq = GNUNET_CADET_mq_create(channel);
-
- ctx = GNUNET_malloc(sizeof(struct peer_context));
- ctx->in_flags = 0;
- ctx->to_channel = channel;
- ctx->mq = mq;
-
- GNUNET_CONTAINER_multipeermap_put(peer_map, peer_id, ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
- } else {
- ctx = GNUNET_CONTAINER_multipeermap_get(peer_map, peer_id);
- if ( NULL == ctx->mq ) {
- if ( NULL == ctx->to_channel ) {
- channel = GNUNET_CADET_channel_create(cadet_handle, NULL, peer_id,
- GNUNET_RPS_CADET_PORT,
- GNUNET_CADET_OPTION_RELIABLE);
- ctx->to_channel = channel;
- }
+ struct GNUNET_TIME_Relative max_round_duration;
- mq = GNUNET_CADET_mq_create(ctx->to_channel);
- ctx->mq = mq;
- }
+ if (request_deltas_size > req_counter)
+ req_counter++;
+ if ( 1 < req_counter)
+ {
+ /* Shift last request deltas to the right */
+ memcpy (&request_deltas[1],
+ request_deltas,
+ (req_counter - 1) * sizeof (struct GNUNET_TIME_Relative));
+
+ /* Add current delta to beginning */
+ request_deltas[0] =
+ GNUNET_TIME_absolute_get_difference (last_request,
+ GNUNET_TIME_absolute_get ());
+ request_rate = T_relative_avg (request_deltas, req_counter);
+
+ /* Compute the duration a round will maximally take */
+ max_round_duration =
+ GNUNET_TIME_relative_add (round_interval,
+ GNUNET_TIME_relative_divide (round_interval, 2));
+
+ /* Set the estimated size the sampler has to have to
+ * satisfy the current client request rate */
+ sampler_size_client_need =
+ max_round_duration.rel_value_us / request_rate.rel_value_us;
+
+ /* Resize the sampler */
+ client_resize_wrapper ();
}
-
- return ctx->mq;
+ last_request = GNUNET_TIME_absolute_get ();
}
* /Util functions
***********************************************************************/
+
+
+
+
/**
* Function called by NSE.
*
* accordingly.
*/
void
-nse_callback(void *cls, struct GNUNET_TIME_Absolute timestamp, double logestimate, double std_dev)
+nse_callback (void *cls, struct GNUNET_TIME_Absolute timestamp,
+ double logestimate, double std_dev)
{
double estimate;
//double scale; // TODO this might go gloabal/config
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Received a ns estimate - logest: %f, std_dev: %f\n", logestimate, std_dev);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received a ns estimate - logest: %f, std_dev: %f (old_size: %u)\n",
+ logestimate, std_dev, RPS_sampler_get_size (prot_sampler));
//scale = .01;
- estimate = 1 << (uint64_t) round(logestimate);
+ estimate = GNUNET_NSE_log_estimate_to_n (logestimate);
// GNUNET_NSE_log_estimate_to_n (logestimate);
- estimate = pow(estimate, 1./3);// * (std_dev * scale); // TODO add
- if ( 0 < estimate ) {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Changing estimate to %f\n", estimate);
- est_size = estimate;
- } else {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Not using estimate %f\n", estimate);
+ estimate = pow (estimate, 1.0 / 3);
+ // TODO add if std_dev is a number
+ // estimate += (std_dev * scale);
+ if (2 < ceil (estimate))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Changing estimate to %f\n", estimate);
+ sampler_size_est_need = estimate;
+ } else
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Not using estimate %f\n", estimate);
+
+ /* If the NSE has changed adapt the lists accordingly */
+ resize_wrapper (prot_sampler, sampler_size_est_need);
+ client_resize_wrapper ();
+}
+
+
+/**
+ * Callback called once the requested PeerIDs are ready.
+ *
+ * Sends those to the requesting client.
+ */
+void client_respond (void *cls,
+ struct GNUNET_PeerIdentity *ids, uint32_t num_peers)
+{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler returned %" PRIX32 " peers\n", num_peers);
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_RPS_CS_ReplyMessage *out_msg;
+ struct GNUNET_SERVER_Client *client;
+ uint32_t size_needed;
+ struct client_ctx *cli_ctx;
+
+ client = (struct GNUNET_SERVER_Client *) cls;
+
+ size_needed = sizeof (struct GNUNET_RPS_CS_ReplyMessage) +
+ num_peers * sizeof (struct GNUNET_PeerIdentity);
+
+ GNUNET_assert (GNUNET_SERVER_MAX_MESSAGE_SIZE >= size_needed);
+
+ ev = GNUNET_MQ_msg_extra (out_msg,
+ num_peers * sizeof (struct GNUNET_PeerIdentity),
+ GNUNET_MESSAGE_TYPE_RPS_CS_REPLY);
+ out_msg->num_peers = htonl (num_peers);
+
+ memcpy (&out_msg[1],
+ ids,
+ num_peers * sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_free (ids);
+
+ cli_ctx = GNUNET_SERVER_client_get_user_context (client, struct client_ctx);
+ if ( NULL == cli_ctx ) {
+ cli_ctx = GNUNET_new (struct client_ctx);
+ cli_ctx->mq = GNUNET_MQ_queue_for_server_client (client);
+ GNUNET_SERVER_client_set_user_context (client, cli_ctx);
}
+
+ GNUNET_MQ_send (cli_ctx->mq, ev);
}
+
/**
* Handle RPS request from the client.
*
* @param message the actual message
*/
static void
-// TODO rename
-handle_cs_request (void *cls,
+handle_client_request (void *cls,
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Client requested (a) random peer(s).\n");
-
struct GNUNET_RPS_CS_RequestMessage *msg;
- //unsigned int n_arr[sampler_list_size];// =
- //GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) sampler_list_size);
- //struct GNUNET_MQ_Handle *mq;
- struct client_ctx *cli_ctx;
- struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_RPS_CS_ReplyMessage *out_msg;
- uint64_t num_peers;
- uint64_t i;
+ uint32_t num_peers;
+ uint32_t size_needed;
+ uint32_t i;
- // TODO
msg = (struct GNUNET_RPS_CS_RequestMessage *) message;
- // Does not work because the compiler seems not to find it.
- cli_ctx = GNUNET_SERVER_client_get_user_context(client, struct client_ctx);
- if ( NULL == cli_ctx ) {
- cli_ctx = GNUNET_new(struct client_ctx);
- cli_ctx->mq = GNUNET_MQ_queue_for_server_client(client);
- GNUNET_SERVER_client_set_user_context(client, cli_ctx);
+
+ num_peers = ntohl (msg->num_peers);
+ size_needed = sizeof (struct GNUNET_RPS_CS_ReplyMessage) +
+ num_peers * sizeof (struct GNUNET_PeerIdentity);
+
+ if (GNUNET_SERVER_MAX_MESSAGE_SIZE < size_needed)
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ for (i = 0 ; i < num_peers ; i++)
+ est_request_rate();
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Client requested %" PRIX32 " random peer(s).\n", num_peers);
+
+ RPS_sampler_get_n_rand_peers (client_sampler, client_respond,
+ client, num_peers, GNUNET_YES);
+
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+}
+
+
+/**
+ * Handle seed from the client.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the actual message
+ */
+ static void
+handle_client_seed (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct GNUNET_RPS_CS_SeedMessage *in_msg;
+ struct GNUNET_PeerIdentity *peers;
+ uint32_t i;
+
+ if (sizeof (struct GNUNET_RPS_CS_SeedMessage) < ntohs (message->size))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
}
-
- //mq = GNUNET_MQ_queue_for_server_client(client);
-
- // TODO How many peers do we give back?
- // Wait until we have enough random peers?
-
- ev = GNUNET_MQ_msg_extra(out_msg,
- GNUNET_ntohll(msg->num_peers) * sizeof(struct GNUNET_PeerIdentity),
- GNUNET_MESSAGE_TYPE_RPS_CS_REPLY);
- out_msg->num_peers = GNUNET_ntohll(msg->num_peers);
-
- num_peers = GNUNET_ntohll(msg->num_peers);
- //&out_msg[1] = SAMPLER_get_n_rand_peers(sampler_list, num_peers);
- for ( i = 0 ; i < num_peers ; i++ ) {
- memcpy(&out_msg[1] + i * sizeof(struct GNUNET_PeerIdentity),
- SAMPLER_get_rand_peer(sampler_list),
- sizeof(struct GNUNET_PeerIdentity));
+ in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message;
+ if ((ntohs (message->size) - sizeof (struct GNUNET_RPS_CS_SeedMessage)) /
+ sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
}
-
- GNUNET_MQ_send(cli_ctx->mq, ev);
- //GNUNET_MQ_send(mq, ev);
- //GNUNET_MQ_destroy(mq);
+
+ in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message;
+ peers = (struct GNUNET_PeerIdentity *) &message[1];
+
+ for ( i = 0 ; i < ntohl (in_msg->num_peers) ; i++ )
+ RPS_sampler_update (prot_sampler, &peers[i]);
+ RPS_sampler_update (client_sampler, &peers[i]);
GNUNET_SERVER_receive_done (client,
GNUNET_OK);
}
+
/**
* Handle a PUSH message from another peer.
*
void **channel_ctx,
const struct GNUNET_MessageHeader *msg)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "PUSH received\n");
+ const struct GNUNET_PeerIdentity *peer;
- struct GNUNET_PeerIdentity *peer;
+ // (check the proof of work)
+
+ peer = (const struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER);
+ // FIXME wait for cadet to change this function
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "PUSH received (%s)\n", GNUNET_i2s (peer));
- // TODO check the proof of work
- // and check limit for PUSHes
- // IF we count per peer PUSHes
- // maybe remove from gossip/sampler list
-
- peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info( channel, GNUNET_CADET_OPTION_PEER );
-
/* Add the sending peer to the push_list */
- GNUNET_array_append(push_list, push_list_size, *peer);
- push_list_size ++;
+ if (GNUNET_NO == in_arr (push_list, pull_list_size, peer))
+ GNUNET_array_append (push_list, push_list_size, *peer);
return GNUNET_OK;
}
void **channel_ctx,
const struct GNUNET_MessageHeader *msg)
{
-
struct GNUNET_PeerIdentity *peer;
+ uint32_t send_size;
struct GNUNET_MQ_Handle *mq;
- //struct GNUNET_RPS_P2P_PullRequestMessage *in_msg;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_RPS_P2P_PullReplyMessage *out_msg;
- // TODO find some way to keep one peer from spamming with pull requests
- // allow only one request per time interval ?
- // otherwise remove from peerlist?
- peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info(channel, GNUNET_CADET_OPTION_PEER);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "PULL REQUEST from peer %s received\n", GNUNET_i2s(peer));
+ peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (channel,
+ GNUNET_CADET_OPTION_PEER);
+ // FIXME wait for cadet to change this function
- mq = GNUNET_CADET_mq_create(channel); // TODO without mq?
- //mq = get_mq(peer_map, peer);
+ /* Compute actual size */
+ send_size = sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) +
+ gossip_list_size * sizeof (struct GNUNET_PeerIdentity);
- //in_msg = (struct GNUNET_RPS_P2P_PullRequestMessage *) msg;
- // TODO how many peers do we actually send?
- // GNUNET_ntohll(in_msg->num_peers)
- ev = GNUNET_MQ_msg_extra(out_msg,
- gossip_list_size * sizeof(struct GNUNET_PeerIdentity),
- GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY);
- out_msg->num_peers = GNUNET_htonll(gossip_list_size);
- memcpy(&out_msg[1], gossip_list,
- gossip_list_size * sizeof(struct GNUNET_PeerIdentity));
+ if (GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE < send_size)
+ /* Compute number of peers to send
+ * If too long, simply truncate */
+ send_size = (GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE -
+ sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) /
+ sizeof (struct GNUNET_PeerIdentity);
+ else
+ send_size = gossip_list_size;
- GNUNET_MQ_send(mq, ev);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "PULL REQUEST from peer %s received, going to send %u peers\n",
+ GNUNET_i2s (peer), send_size);
- GNUNET_MQ_destroy(mq);
+ mq = get_mq (peer_map, peer);
+
+ ev = GNUNET_MQ_msg_extra (out_msg,
+ send_size * sizeof (struct GNUNET_PeerIdentity),
+ GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY);
+ //out_msg->num_peers = htonl (gossip_list_size);
+ out_msg->num_peers = htonl (send_size);
+ memcpy (&out_msg[1], gossip_list,
+ send_size * sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_MQ_send (mq, ev);
return GNUNET_OK;
}
* @param channel_ctx The context associated with this channel
* @param msg The message header
*/
-static int
+ static int
handle_peer_pull_reply (void *cls,
struct GNUNET_CADET_Channel *channel,
void **channel_ctx,
const struct GNUNET_MessageHeader *msg)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "PULL REPLY received\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "PULL REPLY received\n");
struct GNUNET_RPS_P2P_PullReplyMessage *in_msg;
struct GNUNET_PeerIdentity *peers;
- uint64_t i;
-
- // TODO check that we sent a request and that it is the first reply
+ struct PeerContext *peer_ctx;
+ struct GNUNET_PeerIdentity *sender;
+ struct PeerContext *sender_ctx;
+ struct PeerOutstandingOp out_op;
+ uint32_t i;
+ if (sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) > ntohs (msg->size))
+ {
+ GNUNET_break_op (0); // At the moment our own implementation seems to break that.
+ return GNUNET_SYSERR;
+ }
in_msg = (struct GNUNET_RPS_P2P_PullReplyMessage *) msg;
- peers = (struct GNUNET_PeerIdentity *) &msg[1];
- for ( i = 0 ; i < GNUNET_ntohll(in_msg->num_peers) ; i++ ) {
- GNUNET_array_append(pull_list, pull_list_size, peers[i]);
- pull_list_size++;
+ if ((ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, "message says it sends %" PRIu64 " peers, have space for %i peers\n",
+ ntohl (in_msg->num_peers),
+ (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
}
- // TODO maybe a disconnect happens here
-
- return GNUNET_OK;
-}
-
+ sender = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (
+ (struct GNUNET_CADET_Channel *) channel, GNUNET_CADET_OPTION_PEER);
+ // Guess simply casting isn't the nicest way...
+ // FIXME wait for cadet to change this function
+ sender_ctx = get_peer_ctx (peer_map, sender);
-/**
- * Callback called when a Sampler is updated.
- */
- void
-delete_cb (void *cls, struct GNUNET_PeerIdentity *id, struct GNUNET_HashCode hash)
-{
- size_t s;
+ if (0 == (sender_ctx->peer_flags || PULL_REPLY_PENDING))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
- s = SAMPLER_count_id(sampler_list, id);
- if ( 1 >= s ) {
- // TODO cleanup peer
- GNUNET_CONTAINER_multipeermap_remove_all( peer_map, id);
+ peers = (struct GNUNET_PeerIdentity *) &msg[1];
+ for ( i = 0 ; i < ntohl (in_msg->num_peers) ; i++ )
+ {
+ peer_ctx = get_peer_ctx (peer_map, &peers[i]);
+ if ((0 != (peer_ctx->peer_flags && LIVING)) ||
+ NULL != peer_ctx->recv_channel)
+ {
+ if (GNUNET_NO == in_arr (pull_list, pull_list_size, &peers[i]))
+ GNUNET_array_append (pull_list, pull_list_size, peers[i]);
+ }
+ else if (GNUNET_NO == insert_in_pull_list_scheduled (peer_ctx))
+ {
+ out_op.op = insert_in_pull_list;
+ out_op.op_cls = NULL;
+ GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op);
+ }
}
+
+ sender_ctx->peer_flags &= (~PULL_REPLY_PENDING);
+ rem_from_list (pending_pull_reply_list, &pending_pull_reply_list_size, sender);
+
+ return GNUNET_OK;
}
* This is executed regylary.
*/
static void
-do_round(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round\n");
- uint64_t i;
- //unsigned int *n_arr;
- struct GNUNET_RPS_P2P_PushMessage *push_msg;
- struct GNUNET_RPS_P2P_PullRequestMessage *pull_msg; // FIXME Send empty message
+ uint32_t i;
+ unsigned int *permut;
+ unsigned int n_peers; /* Number of peers we send pushes/pulls to */
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_PeerIdentity *peer;
-
- // TODO print lists, ...
- // TODO cleanup peer_map
-
-
- /* If the NSE has changed adapt the lists accordingly */
- // TODO check nse == 0!
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Checking size estimate.\n");
- SAMPLER_samplers_grow(sampler_list, est_size);
-
- GNUNET_array_grow(gossip_list, gossip_list_size, est_size); // FIXME Do conversion correct or change type
-
- gossip_list_size = sampler_list_size = est_size;
-
-
+ struct GNUNET_PeerIdentity peer;
+ struct GNUNET_PeerIdentity *tmp_peer;
+ struct GNUNET_MQ_Handle *mq;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Printing gossip list:\n");
+ for (i = 0 ; i < gossip_list_size ; i++)
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "\t%s\n", GNUNET_i2s (&gossip_list[i]));
+ // TODO log lists, ...
/* Would it make sense to have one shuffeled gossip list and then
* to send PUSHes to first alpha peers, PULL requests to next beta peers and
- * use the rest to update sampler? */
+ * use the rest to update sampler?
+ * in essence get random peers with consumption */
/* Send PUSHes */
- //n_arr = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) gossip_list_size);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Going to send pushes to %f (%f * %" PRIu64 ") peers.\n",
- alpha * gossip_list_size, alpha, gossip_list_size);
- for ( i = 0 ; i < alpha * gossip_list_size ; i++ ) { // TODO compute length
- peer = get_rand_gossip_peer();
- // TODO check NULL == peer
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PUSH to peer %s of gossiped list.\n", GNUNET_i2s(peer));
-
- ev = GNUNET_MQ_msg(push_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PUSH);
- //ev = GNUNET_MQ_msg_extra();
- /* TODO Compute proof of work here
- push_msg; */
- push_msg->placeholder = 0;
- GNUNET_MQ_send( get_mq(peer_map, peer), ev );
-
- // TODO modify in_flags of respective peer?
+ if (0 < gossip_list_size)
+ {
+ permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
+ (unsigned int) gossip_list_size);
+ n_peers = ceil (alpha * gossip_list_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to send pushes to %u ceil (%f * %u) peers.\n",
+ n_peers, alpha, gossip_list_size);
+ for (i = 0 ; i < n_peers ; i++)
+ {
+ peer = gossip_list[permut[i]];
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer)) // TODO
+ { // FIXME if this fails schedule/loop this for later
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending PUSH to peer %s of gossiped list.\n",
+ GNUNET_i2s (&peer));
+
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PUSH);
+ mq = get_mq (peer_map, &peer);
+ GNUNET_MQ_send (mq, ev);
+ }
+ }
+ GNUNET_free (permut);
}
/* Send PULL requests */
- // TODO
- //n_arr = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) sampler_list_size);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Going to send pulls to %f (%f * %" PRIu64 ") peers.\n",
- beta * gossip_list_size, beta, gossip_list_size);
- for ( i = 0 ; i < beta * gossip_list_size ; i++ ){ // TODO compute length
- peer = get_rand_gossip_peer();
- // TODO check NULL == peer
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PULL request to peer %s of gossiped list.\n", GNUNET_i2s(peer));
-
- ev = GNUNET_MQ_msg(pull_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST);
- //ev = GNUNET_MQ_msg_extra();
- pull_msg->placeholder = 0;
- GNUNET_MQ_send( get_mq(peer_map, peer), ev );
- // TODO modify in_flags of respective peer?
- }
+ //permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) sampler_list->size);
+ n_peers = ceil (beta * gossip_list_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to send pulls to %u ceil (%f * %u) peers.\n",
+ n_peers, beta, gossip_list_size);
+ for (i = 0 ; i < n_peers ; i++)
+ {
+ tmp_peer = get_rand_peer_ignore_list (gossip_list, gossip_list_size,
+ pending_pull_reply_list, pending_pull_reply_list_size);
+ if (NULL != tmp_peer)
+ {
+ peer = *tmp_peer;
+ GNUNET_free (tmp_peer);
+
+ GNUNET_array_append (pending_pull_reply_list, pending_pull_reply_list_size, peer);
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer))
+ { // FIXME if this fails schedule/loop this for later
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending PULL request to peer %s of gossiped list.\n",
+ GNUNET_i2s (&peer));
+ ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST);
+ mq = get_mq (peer_map, &peer);
+ GNUNET_MQ_send (mq, ev);
+ }
+ }
+ }
/* Update gossip list */
- uint64_t tmp_index;
- uint64_t index;
+ uint32_t r_index;
if ( push_list_size <= alpha * gossip_list_size &&
push_list_size != 0 &&
- pull_list_size != 0 ) {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Update of the gossip list. ()\n");
+ pull_list_size != 0 )
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Update of the gossip list.\n");
+
+ uint32_t first_border;
+ uint32_t second_border;
+
+ first_border = ceil (alpha * sampler_size_est_need);
+ second_border = first_border + ceil (beta * sampler_size_est_need);
- for ( i = 0 ; i < alpha * gossip_list_size ; i++ ) { // TODO use SAMPLER_get_n_rand_peers
+ GNUNET_array_grow (gossip_list, gossip_list_size, second_border);
+
+ for (i = 0 ; i < first_border ; i++)
+ { // TODO use RPS_sampler_get_n_rand_peers
/* Update gossip list with peers received through PUSHes */
- index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
push_list_size);
- gossip_list[i] = push_list[index];
- // TODO change the in_flags accordingly
+ gossip_list[i] = push_list[r_index];
+ // TODO change the peer_flags accordingly
}
- for ( i = 0 ; i < beta * gossip_list_size ; i++ ) {
+ for (i = first_border ; i < second_border ; i++)
+ {
/* Update gossip list with peers received through PULLs */
- tmp_index = i + round(alpha * gossip_list_size);
- index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
pull_list_size);
- gossip_list[tmp_index] = pull_list[index];
- // TODO change the in_flags accordingly
+ gossip_list[i] = pull_list[r_index];
+ // TODO change the peer_flags accordingly
}
- for ( i = 0 ; i < (1 - (alpha + beta)) * gossip_list_size ; i++ ) {
+ for (i = second_border ; i < sampler_size_est_need ; i++)
+ {
/* Update gossip list with peers from history */
- tmp_index = i + round((alpha + beta) * gossip_list_size);
- index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
- sampler_list->size);
- gossip_list[tmp_index] = sampler_list->peer_ids[index];
- // TODO change the in_flags accordingly
+ RPS_sampler_get_n_rand_peers (prot_sampler, hist_update, NULL, 1, GNUNET_NO);
+ num_hist_update_tasks++;
+ // TODO change the peer_flags accordingly
}
- } else {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list. ()\n");
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list.\n");
}
// TODO independent of that also get some peers from CADET_get_peers()?
-
/* Update samplers */
for ( i = 0 ; i < push_list_size ; i++ )
{
- SAMPLER_update_list(sampler_list, &push_list[i], NULL, NULL);
+ RPS_sampler_update (prot_sampler, &push_list[i]);
+ RPS_sampler_update (client_sampler, &push_list[i]);
// TODO set in_flag?
}
for ( i = 0 ; i < pull_list_size ; i++ )
{
- SAMPLER_update_list(sampler_list, &pull_list[i], NULL, NULL);
+ RPS_sampler_update (prot_sampler, &push_list[i]);
+ RPS_sampler_update (client_sampler, &push_list[i]);
// TODO set in_flag?
}
- // TODO go over whole peer_map and do cleanups
- // delete unneeded peers, set in_flags, check channel/mq
-
-
/* Empty push/pull lists */
- GNUNET_array_grow(push_list, push_list_size, 0);
- push_list_size = 0;
- GNUNET_array_grow(pull_list, pull_list_size, 0);
- pull_list_size = 0;
+ GNUNET_array_grow (push_list, push_list_size, 0);
+ GNUNET_array_grow (pull_list, pull_list_size, 0);
+
+ struct GNUNET_TIME_Relative time_next_round;
+ struct GNUNET_TIME_Relative half_round_interval;
+ unsigned int rand_delay;
+ /* Compute random time value between .5 * round_interval and 1.5 *round_interval */
+ half_round_interval = GNUNET_TIME_relative_divide (round_interval, 2);
+ do
+ {
+ /*
+ * Compute random value between (0 and 1) * round_interval
+ * via multiplying round_interval with a 'fraction' (0 to value)/value
+ */
+ rand_delay = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT_MAX/10);
+ time_next_round = GNUNET_TIME_relative_multiply (round_interval, rand_delay);
+ time_next_round = GNUNET_TIME_relative_divide (time_next_round, UINT_MAX/10);
+ time_next_round = GNUNET_TIME_relative_add (time_next_round, half_round_interval);
+ } while (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == time_next_round.rel_value_us);
/* Schedule next round */
- // TODO
- do_round_task = GNUNET_SCHEDULER_add_delayed( round_interval, &do_round, NULL );
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Finished round\n");
+ do_round_task = GNUNET_SCHEDULER_add_delayed (round_interval, &do_round, NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished round\n");
+}
+
+
+/**
+ * Open a connection to given peer and store channel and mq.
+ */
+ void
+insertCB (void *cls, struct RPS_Sampler *sampler,
+ const struct GNUNET_PeerIdentity *id)
+{
+ // We open a channel to be notified when this peer goes down.
+ (void) get_channel (peer_map, id);
+}
+
+
+/**
+ * Close the connection to given peer and delete channel and mq.
+ */
+ void
+removeCB (void *cls, struct RPS_Sampler *sampler,
+ const struct GNUNET_PeerIdentity *id)
+{
+ size_t s;
+ struct PeerContext *ctx;
+
+ s = RPS_sampler_count_id (sampler, id);
+ if ( 1 >= s )
+ {
+ if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, id))
+ {
+ ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, id);
+ if (NULL != ctx->send_channel)
+ {
+ if (NULL != ctx->mq)
+ {
+ GNUNET_MQ_destroy (ctx->mq);
+ }
+ // may already be freed at shutdown of cadet
+ //GNUNET_CADET_channel_destroy (ctx->send_channel);
+ }
+ // TODO cleanup peer
+ (void) GNUNET_CONTAINER_multipeermap_remove_all (peer_map, id);
+ }
+ }
}
static void
unsigned int best_path) // "How long is the best path?
// (0 = unknown, 1 = ourselves, 2 = neighbor)"
{
- // FIXME use the magic 0000 PeerID
- if ( NULL != peer ) {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Got peer %s (at %p) from CADET\n", GNUNET_i2s(peer), peer);
- SAMPLER_update_list(sampler_list, peer, NULL, NULL);
- if ( GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains( peer_map, peer ) ) {
- } else {
- struct peer_context *ctx;
-
- ctx = GNUNET_malloc(sizeof(struct peer_context));
- ctx->in_flags = 0;
- ctx->mq = NULL;
- ctx->to_channel = NULL;
- ctx->from_channel = NULL;
- GNUNET_CONTAINER_multipeermap_put( peer_map, peer, ctx, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ struct GNUNET_SERVER_Handle *server;
+ struct PeerOutstandingOp out_op;
+ struct PeerContext *peer_ctx;
+
+ server = (struct GNUNET_SERVER_Handle *) cls;
+ if ( NULL != peer )
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got peer %s (at %p) from CADET (gossip_list_size: %u)\n",
+ GNUNET_i2s (peer), peer, gossip_list_size);
+
+ // maybe create a function for that
+ peer_ctx = get_peer_ctx (peer_map, peer);
+ if (GNUNET_NO == insert_in_sampler_scheduled (peer_ctx))
+ {
+ out_op.op = insert_in_sampler;
+ GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op);
}
- uint64_t i;
- i = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG, gossip_list_size);
- gossip_list[i] = *peer;
- // TODO send push/pull to each of those peers?
- } else {
- rps_start( (struct GNUNET_SERVER_Handle *) cls);
+ if (GNUNET_NO == insert_in_gossip_list_scheduled (peer_ctx))
+ {
+ out_op.op = insert_in_gossip_list;
+ out_op.op_cls = NULL;
+ GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op);
+ }
+
+ /* Issue livelyness test on peer */
+ (void) get_channel (peer_map, peer);
+
+ // send push/pull to each of those peers?
}
+ else
+ rps_start (server);
}
+/**
+ * Callback used to clean the multipeermap.
+ */
+ int
+peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+{
+ struct PeerContext *peer_ctx;
+ const struct GNUNET_CADET_Channel *ch = (const struct GNUNET_CADET_Channel *) cls;
+ struct GNUNET_CADET_Channel *recv;
+ struct GNUNET_CADET_Channel *send;
+
+ peer_ctx = (struct PeerContext *) value;
+
+ if (0 != peer_ctx->num_outstanding_ops)
+ GNUNET_array_grow (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, 0);
+
+ if (NULL != peer_ctx->mq)
+ GNUNET_MQ_destroy (peer_ctx->mq);
+
+ if (NULL != peer_ctx->is_live_task)
+ {
+ GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
+ peer_ctx->is_live_task = NULL;
+ }
+
+ send = peer_ctx->send_channel;
+ peer_ctx->send_channel = NULL;
+ recv = peer_ctx->send_channel;
+ peer_ctx->recv_channel = NULL;
+
+ if (NULL != send
+ && ch != send)
+ {
+ GNUNET_CADET_channel_destroy (send);
+ }
+
+ if (NULL != recv
+ && ch != recv)
+ {
+ GNUNET_CADET_channel_destroy (recv);
+ }
+
+ if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_remove_all (peer_map, key))
+ LOG (GNUNET_ERROR_TYPE_WARNING, "removing peer from peer_map failed\n");
+ else
+ GNUNET_free (peer_ctx);
+
+ return GNUNET_YES;
+}
/**
shutdown_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n");
- if ( GNUNET_SCHEDULER_NO_TASK != do_round_task )
+ if ( NULL != do_round_task )
{
GNUNET_SCHEDULER_cancel (do_round_task);
- do_round_task = GNUNET_SCHEDULER_NO_TASK;
+ do_round_task = NULL;
+ }
+
+
+ {
+ if (GNUNET_SYSERR == GNUNET_CONTAINER_multipeermap_iterate (peer_map, peer_remove_cb, NULL))
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Iterating over peers to disconnect from them was cancelled\n");
}
- GNUNET_NSE_disconnect(nse);
- GNUNET_CADET_disconnect(cadet_handle);
- GNUNET_free(own_identity);
- //GNUNET_free(round_interval);
- //GNUNET_free(est_size);
- //GNUNET_free(gossip_list_size);
- //GNUNET_free(sampler_list_size);
- GNUNET_free(gossip_list);
- // TODO for i in sampler_list free sampler
- // TODO destroy sampler_list
- // TODO destroy push/pull_list
- // TODO delete global data
+ GNUNET_NSE_disconnect (nse);
+ GNUNET_CADET_disconnect (cadet_handle);
+ RPS_sampler_destroy (prot_sampler);
+ RPS_sampler_destroy (client_sampler);
+ GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (peer_map));
+ GNUNET_CONTAINER_multipeermap_destroy (peer_map);
+ GNUNET_array_grow (gossip_list, gossip_list_size, 0);
+ GNUNET_array_grow (push_list, push_list_size, 0);
+ GNUNET_array_grow (pull_list, pull_list_size, 0);
}
handle_client_disconnect (void *cls,
struct GNUNET_SERVER_Client * client)
{
- // TODO reinitialise that sampler
}
+
/**
* Handle the channel a peer opens to us.
*
uint32_t port,
enum GNUNET_CADET_ChannelOption options)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us.\n");
-
- GNUNET_assert( NULL != channel );
+ struct PeerContext *ctx;
- // TODO we might even not store the from_channel
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "New channel was established to us (Peer %s).\n",
+ GNUNET_i2s (initiator));
- if ( GNUNET_CONTAINER_multipeermap_contains( peer_map, initiator ) ) {
- ((struct peer_context *) GNUNET_CONTAINER_multipeermap_get( peer_map, initiator ))->from_channel = channel;
- // FIXME there might already be an established channel
- } else {
- struct peer_context *ctx;
+ GNUNET_assert (NULL != channel);
- ctx = GNUNET_malloc( sizeof(struct peer_context));
- ctx->in_flags = in_other_gossip_list;
- ctx->mq = NULL; // TODO create mq?
- ctx->from_channel = channel;
+ // we might not even store the recv_channel
- GNUNET_CONTAINER_multipeermap_put( peer_map, initiator, ctx, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ ctx = get_peer_ctx (peer_map, initiator);
+ if (NULL != ctx->recv_channel)
+ {
+ ctx->recv_channel = channel;
}
+
+ ctx->peer_flags |= LIVING;
+
+ //ctx->peer_flags = IN_OTHER_GOSSIP_LIST;
+ ctx->mq = NULL;
+
+ (void) GNUNET_CONTAINER_multipeermap_put (peer_map, initiator, ctx,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+
return NULL; // TODO
}
+
/**
* This is called when a remote peer destroys a channel.
*
* @param channel The channel being closed
* @param channel_ctx The context associated with this channel
*/
-static void
-cleanup_channel(void *cls,
+ static void
+cleanup_channel (void *cls,
const struct GNUNET_CADET_Channel *channel,
void *channel_ctx)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Channel was destroyed by remote peer.\n");
+ struct GNUNET_PeerIdentity *peer;
+ struct PeerContext *peer_ctx;
+
+ peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (
+ (struct GNUNET_CADET_Channel *) channel, GNUNET_CADET_OPTION_PEER);
+ // Guess simply casting isn't the nicest way...
+ // FIXME wait for cadet to change this function
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up channel to peer %s\n",
+ GNUNET_i2s (peer));
+
+ RPS_sampler_reinitialise_by_value (prot_sampler, peer);
+ RPS_sampler_reinitialise_by_value (client_sampler, peer);
+
+ if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
+ {
+ peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
+
+ if (NULL == peer_ctx) /* It could have been removed by shutdown_task */
+ return;
+
+ /* Somwewhat {ab,re}use the iterator function */
+ /* Cast to void is ok, because it's used as void in peer_remove_cb */
+ (void) peer_remove_cb ((void *) channel, peer, peer_ctx);
+ }
}
+
/**
* Actually start the service.
*/
-static void
+ static void
rps_start (struct GNUNET_SERVER_Handle *server)
{
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&handle_cs_request, NULL, GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST, 0},
+ {&handle_client_request, NULL, GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST,
+ sizeof (struct GNUNET_RPS_CS_RequestMessage)},
+ {&handle_client_seed, NULL, GNUNET_MESSAGE_TYPE_RPS_CS_SEED, 0},
{NULL, NULL, 0, 0}
};
GNUNET_SERVER_disconnect_notify (server,
&handle_client_disconnect,
NULL);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Ready to receive requests from clients\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Ready to receive requests from clients\n");
+ num_hist_update_tasks = 0;
- do_round_task = GNUNET_SCHEDULER_add_delayed( round_interval, &do_round, NULL);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
+ do_round_task = GNUNET_SCHEDULER_add_now (&do_round, NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
}
-
/**
* Process statistics requests.
*
* @param server the initialized server
* @param c configuration to use
*/
-static void
+ static void
run (void *cls,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
// TODO check what this does -- copied from gnunet-boss
// - seems to work as expected
- GNUNET_log_setup("rps", GNUNET_error_type_to_string(GNUNET_ERROR_TYPE_DEBUG), NULL);
-
- LOG(GNUNET_ERROR_TYPE_DEBUG, "RPS started\n");
-
+ GNUNET_log_setup ("rps", GNUNET_error_type_to_string (GNUNET_ERROR_TYPE_DEBUG), NULL);
cfg = c;
- own_identity = GNUNET_new(struct GNUNET_PeerIdentity);
-
- GNUNET_CRYPTO_get_peer_identity(cfg, own_identity); // TODO check return value
-
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Own identity is %s (at %p).\n", GNUNET_i2s(own_identity), own_identity);
-
+ /* Get own ID */
+ GNUNET_CRYPTO_get_peer_identity (cfg, &own_identity); // TODO check return value
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "STARTING SERVICE (rps) for peer [%s]\n",
+ GNUNET_i2s (&own_identity));
/* Get time interval from the configuration */
"ROUNDINTERVAL",
&round_interval))
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Failed to read ROUNDINTERVAL from config\n");
- GNUNET_SCHEDULER_shutdown();
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to read ROUNDINTERVAL from config\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
/* Get initial size of sampler/gossip list from the configuration */
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, "RPS",
"INITSIZE",
- (long long unsigned int *) &est_size))
+ (long long unsigned int *) &sampler_size_est_need))
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Failed to read INITSIZE from config\n");
- GNUNET_SCHEDULER_shutdown();
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to read INITSIZE from config\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- LOG(GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %" PRIu64 "\n", est_size);
-
- gossip_list_size = sampler_list_size = est_size; // TODO rename est_size
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %" PRIu64 "\n", sampler_size_est_need);
gossip_list = NULL;
- static unsigned int tmp = 0;
-
- GNUNET_array_grow(gossip_list, tmp, gossip_list_size);
-
-
/* connect to NSE */
- nse = GNUNET_NSE_connect(cfg, nse_callback, NULL);
+ nse = GNUNET_NSE_connect (cfg, nse_callback, NULL);
// TODO check whether that was successful
- // TODO disconnect on shutdown
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Connected to NSE\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to NSE\n");
alpha = 0.45;
beta = 0.45;
- // TODO initialise thresholds - ?
- ///* Get alpha from the configuration */
- //if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_float (cfg, "RPS",
- // "ALPHA",
- // &alpha))
- //{
- // LOG(GNUNET_ERROR_TYPE_DEBUG, "No ALPHA specified in the config\n");
- //}
- //LOG(GNUNET_ERROR_TYPE_DEBUG, "ALPHA is %f\n", alpha);
-
- ///* Get beta from the configuration */
- //if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_float (cfg, "RPS",
- // "BETA",
- // &beta))
- //{
- // LOG(GNUNET_ERROR_TYPE_DEBUG, "No BETA specified in the config\n");
- //}
- //LOG(GNUNET_ERROR_TYPE_DEBUG, "BETA is %f\n", beta);
+ peer_map = GNUNET_CONTAINER_multipeermap_create (sampler_size_est_need, GNUNET_NO);
+ /* Initialise cadet */
+ static const struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
+ {&handle_peer_push , GNUNET_MESSAGE_TYPE_RPS_PP_PUSH ,
+ sizeof (struct GNUNET_MessageHeader)},
+ {&handle_peer_pull_request, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST,
+ sizeof (struct GNUNET_MessageHeader)},
+ {&handle_peer_pull_reply , GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY , 0},
+ {NULL, 0, 0}
+ };
+ const uint32_t ports[] = {GNUNET_RPS_CADET_PORT, 0}; // _PORT specified in src/rps/rps.h
+ cadet_handle = GNUNET_CADET_connect (cfg,
+ cls,
+ &handle_inbound_channel,
+ &cleanup_channel,
+ cadet_handlers,
+ ports);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to CADET\n");
- peer_map = GNUNET_CONTAINER_multipeermap_create(est_size, GNUNET_NO);
+ /* Initialise sampler */
+ struct GNUNET_TIME_Relative half_round_interval;
+ struct GNUNET_TIME_Relative max_round_interval;
- /* Initialise sampler and gossip list */
+ half_round_interval = GNUNET_TIME_relative_multiply (round_interval, .5);
+ max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval);
- sampler_list = SAMPLER_samplers_init(est_size);
+ prot_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval,
+ insertCB, NULL, removeCB, NULL);
+ client_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval,
+ insertCB, NULL, removeCB, NULL);
+ /* Initialise push and pull maps */
push_list = NULL;
push_list_size = 0;
pull_list = NULL;
pull_list_size = 0;
+ pending_pull_reply_list = NULL;
+ pending_pull_reply_list_size = 0;
- static const struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
- {&handle_peer_push , GNUNET_MESSAGE_TYPE_RPS_PP_PUSH , 0},
- {&handle_peer_pull_request, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST, 0},
- {&handle_peer_pull_reply , GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY , 0},
- {NULL, 0, 0}
- };
-
- const uint32_t ports[] = {GNUNET_RPS_CADET_PORT, 0}; // _PORT specified in src/rps/rps.h
- cadet_handle = GNUNET_CADET_connect(cfg,
- cls,
- &handle_inbound_channel,
- &cleanup_channel,
- cadet_handlers,
- ports);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Connected to CADET\n");
-
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n");
- GNUNET_CADET_get_peers(cadet_handle, &init_peer_cb, server);
- // FIXME use magic 0000 PeerID to _start_ the service
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n");
+ GNUNET_CADET_get_peers (cadet_handle, &init_peer_cb, server);
// TODO send push/pull to each of those peers?
}
* @param argv command line arguments
* @return 0 ok, 1 on error
*/
-int
+ int
main (int argc, char *const *argv)
{
return (GNUNET_OK ==
projects / oweals / gnunet.git / blobdiff