/*
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
// 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 malicious peer
-// TODO Change API to accept initialisation peers
-
-// TODO Change API to accept good peers 'friends'
+// TODO connect to friends
// TODO store peers somewhere
-// TODO check that every id we get is valid - is it reachable?
-
-// TODO ignore list
+// TODO ignore list?
// hist_size_init, hist_size_max
/**
* Our own identity.
*/
-static struct GNUNET_PeerIdentity *own_identity;
-
-/**
- * Closure to the callback cadet calls on each peer it passes to us
- */
-struct init_peer_cls
-{
- /**
- * The server handle to later listen to client requests
- */
- struct GNUNET_SERVER_Handle *server;
-
- /**
- * Counts how many peers cadet already passed to us
- */
- uint32_t i;
-};
+static struct GNUNET_PeerIdentity own_identity;
struct GNUNET_PeerIdentity *
-get_rand_peer (const struct GNUNET_PeerIdentity *peer_list, unsigned int size);
+get_rand_peer_ignore_list (const struct GNUNET_PeerIdentity *peer_list, unsigned int size,
+ const struct GNUNET_PeerIdentity *ignore_list, unsigned int ignore_size);
/***********************************************************************
/**
* Used to keep track in what lists single peerIDs are.
*/
-enum in_list_flag // probably unneeded
+enum PeerFlags
{
- in_other_sampler_list = 0x1,
- in_other_gossip_list = 0x2, // unneeded?
- in_own_sampler_list = 0x4,
- in_own_gossip_list = 0x8 // unneeded?
+ 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
};
+
+/**
+ * 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);
+
+/**
+ * Outstanding operation on peer consisting of callback and closure
+ */
+struct PeerOutstandingOp
+{
+ /**
+ * Callback
+ */
+ PeerOp op;
+
+ /**
+ * Closure
+ */
+ void *op_cls;
+};
+
+
/**
* Struct used to keep track of other peer's status
*
* This is stored in a multipeermap.
*/
-struct peer_context
+struct PeerContext
{
/**
* In own gossip/sampler list, in other's gossip/sampler list
*/
- uint32_t in_flags; // unneeded?
+ uint32_t peer_flags;
/**
* Message queue open to client
/**
* Channel open to client.
*/
- struct GNUNET_CADET_Channel *to_channel;
+ struct GNUNET_CADET_Channel *send_channel;
/**
* Channel open from client.
*/
- struct GNUNET_CADET_Channel *from_channel; // unneeded
+ struct GNUNET_CADET_Channel *recv_channel; // unneeded?
+
+ /**
+ * Array of outstanding operations on this peer.
+ */
+ struct PeerOutstandingOp *outstanding_ops;
+
+ /**
+ * Number of outstanding operations.
+ */
+ unsigned int num_outstanding_ops;
+ //size_t num_outstanding_ops;
+
+ /**
+ * Handle to the callback given to cadet_ntfy_tmt_rdy()
+ *
+ * To be canceled on shutdown.
+ */
+ struct GNUNET_CADET_TransmitHandle *is_live_task;
+
+ /**
+ * Identity of the peer
+ */
+ struct GNUNET_PeerIdentity peer_id;
/**
* This is pobably followed by 'statistical' data (when we first saw
* Globals
***********************************************************************/
+/**
+ * Sampler used for the Brahms protocol itself.
+ */
+static struct RPS_Sampler *prot_sampler;
+
+/**
+ * Sampler used for the clients.
+ */
+static struct RPS_Sampler *client_sampler;
+
/**
* Set of all peers to keep track of them.
*/
/**
* Size of the gossiped list
*/
-static unsigned int gossip_list_size;
+//static unsigned int gossip_list_size;
+static uint32_t gossip_list_size;
/**
- * The size Brahms needs according to the network size.
- *
- * This is directly taken as the #gossip_list_size on update of the
- * #gossip_list
- * This is the minimum size the sampler grows to.
+ * The size of sampler we need to be able to satisfy the client's need of
+ * random peers.
*/
-static unsigned int sampler_size;
-//size_t sampler_size;
+static unsigned int sampler_size_client_need;
/**
- * The size of sampler we need to be able to satisfy the client's need of
- * random peers.
+ * 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_client_need;
+static unsigned int sampler_size_est_need;
/**
* Percentage of total peer number in the gossip list
* to send random PUSHes to
- *
- * TODO do not read from configuration
*/
static float alpha;
/**
* Percentage of total peer number in the gossip list
* to send random PULLs to
- *
- * TODO do not read from configuration
*/
static float beta;
/**
* Identifier for the main task that runs periodically.
*/
-static struct GNUNET_SCHEDULER_Task * do_round_task;
+static struct GNUNET_SCHEDULER_Task *do_round_task;
/**
* Time inverval the do_round task runs in.
*/
static struct GNUNET_CADET_Handle *cadet_handle;
-/**
- * Global counter
- */
-uint64_t g_i = 0;
-
/**
* Request counter.
static struct GNUNET_TIME_Relative request_rate;
+/**
+ * List with the peers we sent requests to.
+ */
+struct GNUNET_PeerIdentity *pending_pull_reply_list;
+
+/**
+ * Size of #pending_pull_reply_list.
+ */
+uint32_t pending_pull_reply_list_size;
+
+
+/**
+ * Number of history update tasks.
+ */
+uint32_t num_hist_update_tasks;
+
+
/***********************************************************************
* /Globals
***********************************************************************/
return GNUNET_YES;
}
+/**
+ * Remove peer from list.
+ */
+ void
+rem_from_list (struct GNUNET_PeerIdentity *peer_list,
+ unsigned int *list_size,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ 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);
+ }
+ }
+}
/**
- * Get random peer from the gossip list.
+ * Get random peer from the given list but don't return one from the @a ignore_list.
*/
struct GNUNET_PeerIdentity *
-get_rand_peer(const struct GNUNET_PeerIdentity *peer_list, unsigned int list_size)
+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)
{
- uint64_t r_index;
+ uint32_t r_index;
+ uint32_t tmp_size;
+ struct GNUNET_PeerIdentity *tmp_peer_list;
struct GNUNET_PeerIdentity *peer;
- peer = GNUNET_new(struct GNUNET_PeerIdentity);
- // FIXME if we have only NULL in gossip list this will block
- // but then we might have a problem nevertheless
+ GNUNET_assert (NULL != peer_list);
+ if (0 == list_size)
+ return NULL;
- do
+ 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);
+
+ /**;
+ * 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];
+
+ while (in_arr (ignore_list, ignore_size, peer))
{
+ rem_from_list (tmp_peer_list, &tmp_size, peer);
+
+ if (0 == tmp_size)
+ {
+ GNUNET_free (peer);
+ return NULL;
+ }
/**;
* 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,
- list_size);
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
+ tmp_size);
+ *peer = tmp_peer_list[r_index];
+ }
- *peer = peer_list[r_index];
- } while (NULL == peer);
+
+ GNUNET_array_grow (tmp_peer_list, tmp_size, 0);
return peer;
}
/**
* Get the context of a peer. If not existing, create.
*/
- struct peer_context *
-get_peer_ctx (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, const struct GNUNET_PeerIdentity *peer)
+ struct PeerContext *
+get_peer_ctx (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct peer_context *ctx;
+ struct PeerContext *ctx;
if ( GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
{
}
else
{
- ctx = GNUNET_new (struct peer_context);
- ctx->in_flags = 0;
+ ctx = GNUNET_new (struct PeerContext);
+ ctx->peer_flags = 0;
ctx->mq = NULL;
- ctx->to_channel = NULL;
- ctx->from_channel = NULL;
- (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer, ctx, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ 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;
}
+/**
+ * Put random peer from sampler into the gossip list as history update.
+ */
+ 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--;
+}
+
+
+/**
+ * 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.
+ */
+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;
+}
+
+
/**
* Get the channel of a peer. If not existing, create.
*/
struct GNUNET_CADET_Channel *
-get_channel (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, const struct GNUNET_PeerIdentity *peer)
+get_channel (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct peer_context *ctx;
+ struct PeerContext *ctx;
ctx = get_peer_ctx (peer_map, peer);
- if (NULL == ctx->to_channel)
+ if (NULL == ctx->send_channel)
{
- ctx->to_channel = GNUNET_CADET_channel_create (cadet_handle, NULL, peer,
- GNUNET_RPS_CADET_PORT,
- GNUNET_CADET_OPTION_RELIABLE);
+ 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);
+ }
+
// do I have to explicitly put it in the peer_map?
(void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer, ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
}
- return ctx->to_channel;
+ return ctx->send_channel;
}
* simply return it, otherways create one.
*/
struct GNUNET_MQ_Handle *
-get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, const struct GNUNET_PeerIdentity *peer_id)
+get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
+ const struct GNUNET_PeerIdentity *peer_id)
{
- struct peer_context *ctx;
+ 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->to_channel);
+ 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);
* Sum all time relatives of an array.
*/
struct GNUNET_TIME_Relative
-T_relative_sum (const struct GNUNET_TIME_Relative *rel_array, uint64_t arr_size)
+T_relative_sum (const struct GNUNET_TIME_Relative *rel_array, uint32_t arr_size)
{
struct GNUNET_TIME_Relative sum;
- uint64_t i;
+ uint32_t i;
sum = GNUNET_TIME_UNIT_ZERO;
for ( i = 0 ; i < arr_size ; i++ )
* Compute the average of given time relatives.
*/
struct GNUNET_TIME_Relative
-T_relative_avg (const struct GNUNET_TIME_Relative *rel_array, uint64_t arr_size)
+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);
+}
+
+
+/**
+ * Insert PeerID in #pull_list
+ *
+ * Called once we know a peer is live.
+ */
+ 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);
+}
+
+/**
+ * Check whether #insert_in_pull_list was already scheduled
+ */
+ 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;
+}
+
+
+/**
+ * Insert PeerID in #gossip_list
+ *
+ * Called once we know a peer is live.
+ */
+ 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);
+}
+
+/**
+ * Check whether #insert_in_pull_list was already scheduled
+ */
+ 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;
+}
+
+
+/**
+ * Update sampler with given PeerID.
+ */
+ void
+insert_in_sampler (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+ RPS_sampler_update (prot_sampler, peer);
+ RPS_sampler_update (client_sampler, peer);
+}
+
+
+/**
+ * Check whether #insert_in_sampler was already scheduled
+ */
+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;
+}
+
+
+/**
+ * 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
+ */
+static void
+resize_wrapper (struct RPS_Sampler *sampler, uint32_t new_size)
{
- return GNUNET_TIME_relative_divide (T_relative_sum (rel_array, arr_size), arr_size); // FIXME find a way to devide that by arr_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);
+}
+
+
+/**
+ * Wrapper around #RPS_sampler_resize() resizing the client sampler
+ */
+static void
+client_resize_wrapper ()
+{
+ uint32_t bigger_size;
+ unsigned int sampler_size;
+
+ // TODO statistics
+
+ sampler_size = RPS_sampler_get_size (client_sampler);
+
+ if (sampler_size_est_need > sampler_size_client_need)
+ bigger_size = sampler_size_est_need;
+ else
+ bigger_size = sampler_size_client_need;
+
+ // TODO respect the min, max
+ resize_wrapper (client_sampler, bigger_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size is now %u\n", sampler_size);
+}
+
+
+/**
+ * Estimate request rate
+ *
+ * Called every time we receive a request from the client.
+ */
+ void
+est_request_rate()
+{
+ struct GNUNET_TIME_Relative max_round_duration;
+
+ 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 ();
+ }
+ 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;
- unsigned int old_est;
//double scale; // TODO this might go gloabal/config
- old_est = sampler_size;
-
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received a ns estimate - logest: %f, std_dev: %f (old_est: %f)\n",
- logestimate, std_dev, old_est);
+ "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 = GNUNET_NSE_log_estimate_to_n (logestimate);
// GNUNET_NSE_log_estimate_to_n (logestimate);
- estimate = pow (estimate, 1./3);
+ estimate = pow (estimate, 1.0 / 3);
// TODO add if std_dev is a number
// estimate += (std_dev * scale);
- if ( 0 < estimate ) {
+ if (2 < ceil (estimate))
+ {
LOG (GNUNET_ERROR_TYPE_DEBUG, "Changing estimate to %f\n", estimate);
- sampler_size = 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 */
- // TODO respect the request rate, min, max
- if (old_est > sampler_size*4)
- { /* Shrinking */
- RPS_sampler_resize (old_est/2);
- }
- else if (old_est < sampler_size)
- { /* Growing */
- if (sampler_size < old_est*2)
- RPS_sampler_resize (old_est*2);
- else
- RPS_sampler_resize (sampler_size);
+ 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.
*
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;
- const struct GNUNET_PeerIdentity *peers;
- //uint64_t i;
-
+ uint32_t num_peers;
+ uint32_t size_needed;
+ uint32_t i;
- /* Estimate request rate */
- 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);
- }
- last_request = GNUNET_TIME_absolute_get();
- // TODO resize the size of the extended_samplers
+ msg = (struct GNUNET_RPS_CS_RequestMessage *) message;
+ num_peers = ntohl (msg->num_peers);
+ size_needed = sizeof (struct GNUNET_RPS_CS_ReplyMessage) +
+ num_peers * sizeof (struct GNUNET_PeerIdentity);
- // TODO check message size
- msg = (struct GNUNET_RPS_CS_RequestMessage *) message;
- 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);
+ if (GNUNET_SERVER_MAX_MESSAGE_SIZE < size_needed)
+ {
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
}
-
- // How many peers do we give back?
- // Wait until we have enough random peers?
- num_peers = GNUNET_ntohll (msg->num_peers);
+ for (i = 0 ; i < num_peers ; i++)
+ est_request_rate();
- ev = GNUNET_MQ_msg_extra (out_msg,
- num_peers * sizeof (struct GNUNET_PeerIdentity),
- GNUNET_MESSAGE_TYPE_RPS_CS_REPLY);
- out_msg->num_peers = msg->num_peers; // No conversion between network and network order
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Client requested %" PRIX32 " random peer(s).\n", num_peers);
- //&out_msg[1] = RPS_sampler_get_n_rand_peers (num_peers);
- peers = RPS_sampler_get_n_rand_peers (num_peers);
- memcpy(&out_msg[1],
- peers,
- num_peers * sizeof (struct GNUNET_PeerIdentity));
-
- GNUNET_MQ_send (cli_ctx->mq, ev);
- //GNUNET_MQ_destroy(mq);
+ RPS_sampler_get_n_rand_peers (client_sampler, client_respond,
+ client, num_peers, GNUNET_YES);
GNUNET_SERVER_receive_done (client,
GNUNET_OK);
{
struct GNUNET_RPS_CS_SeedMessage *in_msg;
struct GNUNET_PeerIdentity *peers;
- uint64_t i;
+ uint32_t i;
if (sizeof (struct GNUNET_RPS_CS_SeedMessage) < ntohs (message->size))
{
GNUNET_SYSERR);
}
in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message;
- if (ntohs (message->size) - sizeof (struct GNUNET_RPS_CS_SeedMessage) /
- sizeof (struct GNUNET_PeerIdentity) != GNUNET_ntohll (in_msg->num_peers))
+ 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,
in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message;
peers = (struct GNUNET_PeerIdentity *) &message[1];
- for ( i = 0 ; i < GNUNET_ntohll (in_msg->num_peers) ; i++ )
- RPS_sampler_update_list (&peers[i]);
+ 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);
{
const struct GNUNET_PeerIdentity *peer;
- // (check the proof of work)
-
- // TODO accept empty message
- if (ntohs(msg->size) != sizeof (struct GNUNET_RPS_P2P_PushMessage))
- {
- GNUNET_break_op (0); // At the moment our own implementation seems to break that.
- return GNUNET_SYSERR;
- }
+ // (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));
-
+
/* Add the sending peer to the push_list */
if (GNUNET_NO == in_arr (push_list, pull_list_size, peer))
GNUNET_array_append (push_list, push_list_size, *peer);
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_PeerIdentity *peer;
+ uint32_t send_size;
struct GNUNET_MQ_Handle *mq;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_RPS_P2P_PullReplyMessage *out_msg;
- // assert that msg->size is 0
-
- // TODO accept empty message
- if (ntohs(msg->size) != sizeof (struct GNUNET_RPS_P2P_PullRequestMessage))
- {
- GNUNET_break_op (0); // At the moment our own implementation seems to break that.
- return GNUNET_SYSERR;
- }
- peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER);
+ peer = (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, "PULL REQUEST from peer %s received\n", GNUNET_i2s (peer));
+
+ /* Compute actual size */
+ send_size = sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) +
+ 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;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "PULL REQUEST from peer %s received, going to send %u peers\n",
+ GNUNET_i2s (peer), send_size);
mq = get_mq (peer_map, peer);
ev = GNUNET_MQ_msg_extra (out_msg,
- gossip_list_size * sizeof (struct GNUNET_PeerIdentity),
+ send_size * sizeof (struct GNUNET_PeerIdentity),
GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY);
- out_msg->num_peers = GNUNET_htonll (gossip_list_size);
+ //out_msg->num_peers = htonl (gossip_list_size);
+ out_msg->num_peers = htonl (send_size);
memcpy (&out_msg[1], gossip_list,
- gossip_list_size * sizeof (struct GNUNET_PeerIdentity));
+ send_size * sizeof (struct GNUNET_PeerIdentity));
GNUNET_MQ_send (mq, ev);
* @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,
struct GNUNET_RPS_P2P_PullReplyMessage *in_msg;
struct GNUNET_PeerIdentity *peers;
- uint64_t i;
+ 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))
+ 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;
- if (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) / sizeof (struct GNUNET_PeerIdentity) != GNUNET_ntohll (in_msg->num_peers))
+ 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 check that we sent a request and that it is the first reply
+ 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);
+
+ if (0 == (sender_ctx->peer_flags || PULL_REPLY_PENDING))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
peers = (struct GNUNET_PeerIdentity *) &msg[1];
- for ( i = 0 ; i < GNUNET_ntohll (in_msg->num_peers) ; i++ )
+ for ( i = 0 ; i < ntohl (in_msg->num_peers) ; i++ )
{
- if (GNUNET_NO == in_arr(pull_list, pull_list_size, &peers[i]))
- GNUNET_array_append (pull_list, pull_list_size, 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);
+ }
}
- // TODO check that id is valid - whether it is reachable
+ sender_ctx->peer_flags &= (~PULL_REPLY_PENDING);
+ rem_from_list (pending_pull_reply_list, &pending_pull_reply_list_size, sender);
return GNUNET_OK;
}
static void
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;
+ uint32_t i;
+ unsigned int *permut;
unsigned int n_peers; /* Number of peers we send pushes/pulls to */
- struct GNUNET_RPS_P2P_PushMessage *push_msg;
- struct GNUNET_RPS_P2P_PullRequestMessage *pull_msg; // FIXME Send empty message
struct GNUNET_MQ_Envelope *ev;
- const struct GNUNET_PeerIdentity *peer;
+ struct GNUNET_PeerIdentity peer;
+ struct GNUNET_PeerIdentity *tmp_peer;
struct GNUNET_MQ_Handle *mq;
- // TODO print lists, ...
- // TODO randomise and spread calls herein over time
-
+ 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
* in essence get random peers with consumption */
/* Send PUSHes */
- //n_arr = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) gossip_list_size);
- n_peers = round (alpha * gossip_list_size);
- if (0 == n_peers)
- n_peers = 1;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Going to send pushes to %u (%f * %u) peers.\n",
- n_peers, alpha, gossip_list_size);
- for ( i = 0 ; i < n_peers ; i++ )
+ if (0 < gossip_list_size)
{
- peer = get_rand_peer (gossip_list, gossip_list_size);
- if (own_identity != peer)
- { // 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 (push_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PUSH);
- push_msg = NULL;
- // FIXME sometimes it returns a pointer to a freed mq
- mq = get_mq (peer_map, peer);
- GNUNET_MQ_send (mq, ev);
+ 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 */
- //n_arr = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) sampler_list->size);
- n_peers = round (beta * gossip_list_size);
- if (0 == n_peers)
- n_peers = 1;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to send pulls to %u (%f * %u) peers.\n",
- n_peers, beta, gossip_list_size);
- for ( i = 0 ; i < n_peers ; i++ )
+ //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++)
{
- peer = get_rand_peer (gossip_list, gossip_list_size);
- if (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 (pull_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST);
- pull_msg = NULL;
- mq = get_mq (peer_map, peer);
- GNUNET_MQ_send (mq, ev);
+ 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 r_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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Update of the gossip list.\n");
+
+ uint32_t first_border;
+ uint32_t second_border;
- uint64_t first_border;
- uint64_t second_border;
-
- GNUNET_array_grow(gossip_list, gossip_list_size, sampler_size);
+ first_border = ceil (alpha * sampler_size_est_need);
+ second_border = first_border + ceil (beta * sampler_size_est_need);
- first_border = round(alpha * gossip_list_size);
- for ( i = 0 ; i < first_border ; i++ )
+ 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 */
- r_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[r_index];
- // TODO change the in_flags accordingly
+ // TODO change the peer_flags accordingly
}
- second_border = first_border + round(beta * gossip_list_size);
- for ( i = first_border ; i < second_border ; i++ )
+ for (i = first_border ; i < second_border ; i++)
{
/* Update gossip list with peers received through PULLs */
- r_index = GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_STRONG,
+ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
pull_list_size);
gossip_list[i] = pull_list[r_index];
- // TODO change the in_flags accordingly
+ // TODO change the peer_flags accordingly
}
- for ( i = second_border ; i < gossip_list_size ; i++ )
+ for (i = second_border ; i < sampler_size_est_need ; i++)
{
/* Update gossip list with peers from history */
- peer = RPS_sampler_get_n_rand_peers (1),
- gossip_list[i] = *peer;
- // 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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list.\n");
}
// TODO independent of that also get some peers from CADET_get_peers()?
for ( i = 0 ; i < push_list_size ; i++ )
{
- RPS_sampler_update_list (&push_list[i]);
+ 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++ )
{
- RPS_sampler_update_list (&pull_list[i]);
+ RPS_sampler_update (prot_sampler, &push_list[i]);
+ RPS_sampler_update (client_sampler, &push_list[i]);
// TODO set in_flag?
}
* Open a connection to given peer and store channel and mq.
*/
void
-insertCB (void *cls, const struct GNUNET_PeerIdentity *id)
+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, const struct GNUNET_PeerIdentity *id)
+removeCB (void *cls, struct RPS_Sampler *sampler,
+ const struct GNUNET_PeerIdentity *id)
{
size_t s;
- struct peer_context *ctx;
+ struct PeerContext *ctx;
- s = RPS_sampler_count_id (id);
+ 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->to_channel)
+ 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->to_channel);
+ //GNUNET_CADET_channel_destroy (ctx->send_channel);
}
// TODO cleanup peer
(void) GNUNET_CONTAINER_multipeermap_remove_all (peer_map, id);
unsigned int best_path) // "How long is the best path?
// (0 = unknown, 1 = ourselves, 2 = neighbor)"
{
- struct init_peer_cls *ipc;
+ struct GNUNET_SERVER_Handle *server;
+ struct PeerOutstandingOp out_op;
+ struct PeerContext *peer_ctx;
- ipc = (struct init_peer_cls *) cls;
+ server = (struct GNUNET_SERVER_Handle *) cls;
if ( NULL != peer )
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got %" PRIX32 ". peer %s (at %p) from CADET (gossip_list_size: %u)\n",
- ipc->i, GNUNET_i2s (peer), peer, gossip_list_size);
- RPS_sampler_update_list (peer);
- (void) get_peer_ctx (peer_map, peer); // unneeded? -> insertCB
+ "Got peer %s (at %p) from CADET (gossip_list_size: %u)\n",
+ GNUNET_i2s (peer), peer, gossip_list_size);
- if (ipc->i < 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))
{
- gossip_list[ipc->i] = *peer; // FIXME sometimes we're writing to invalid space here
- // not sure whether fixed
- ipc->i++;
+ out_op.op = insert_in_sampler;
+ GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op);
}
+ 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)
{
- if (ipc->i < gossip_list_size)
- {
- memcpy(&gossip_list[ipc->i],
- RPS_sampler_get_n_rand_peers (1),
- (gossip_list_size - ipc->i) * sizeof(struct GNUNET_PeerIdentity));
- }
- rps_start (ipc->server);
- GNUNET_free (ipc);
+ 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 ( NULL != do_round_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);
- RPS_sampler_destroy ();
- GNUNET_array_grow (request_deltas, request_deltas_size, 0);
+ 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 the channel a peer opens to us.
*
uint32_t port,
enum GNUNET_CADET_ChannelOption options)
{
- struct peer_context *ctx;
+ struct PeerContext *ctx;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us (Peer %s).\n", GNUNET_i2s(initiator));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "New channel was established to us (Peer %s).\n",
+ GNUNET_i2s (initiator));
- GNUNET_assert( NULL != channel );
+ GNUNET_assert (NULL != channel);
- // we might not even store the from_channel
+ // we might not even store the recv_channel
- ctx = get_peer_ctx(peer_map, initiator);
- if (NULL != ctx->from_channel)
+ ctx = get_peer_ctx (peer_map, initiator);
+ if (NULL != ctx->recv_channel)
{
- ctx->from_channel = channel;
+ ctx->recv_channel = channel;
}
- // FIXME there might already be an established channel
+ ctx->peer_flags |= LIVING;
- //ctx->in_flags = in_other_gossip_list;
- ctx->mq = NULL; // TODO create mq?
+ //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)
{
struct GNUNET_PeerIdentity *peer;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Channel to remote peer was destroyed.\n");
+ 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
- RPS_sampler_reinitialise_by_value (peer);
+ 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[] = {
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_now (&do_round, NULL);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
* @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");
-
- struct init_peer_cls *ipc;
-
cfg = c;
/* Get own ID */
- own_identity = GNUNET_new (struct GNUNET_PeerIdentity);
- GNUNET_CRYPTO_get_peer_identity (cfg, own_identity); // TODO check return value
- GNUNET_assert (NULL != own_identity);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Own identity is %s (at %p).\n", GNUNET_i2s(own_identity), own_identity);
+ 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 */
&round_interval))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to read ROUNDINTERVAL from config\n");
- GNUNET_SCHEDULER_shutdown();
+ 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 *) &sampler_size))
+ (long long unsigned int *) &sampler_size_est_need))
{
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", sampler_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %" PRIu64 "\n", sampler_size_est_need);
- //gossip_list_size = sampler_size; // TODO rename sampler_size
gossip_list = NULL;
- GNUNET_array_grow (gossip_list, gossip_list_size, sampler_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);
-
- // TODO check that alpha + beta < 1
- peer_map = GNUNET_CONTAINER_multipeermap_create (sampler_size, GNUNET_NO);
+ 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 , 0},
- {&handle_peer_pull_request, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST, 0},
+ {&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);
+ cls,
+ &handle_inbound_channel,
+ &cleanup_channel,
+ cadet_handlers,
+ ports);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Connected to CADET\n");
/* Initialise sampler */
- RPS_sampler_init (sampler_size, own_identity, insertCB, NULL, removeCB, NULL);
+ struct GNUNET_TIME_Relative half_round_interval;
+ struct GNUNET_TIME_Relative max_round_interval;
+
+ half_round_interval = GNUNET_TIME_relative_multiply (round_interval, .5);
+ max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval);
+
+ 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;
- ipc = GNUNET_new (struct init_peer_cls);
- ipc->server = server;
- ipc->i = 0;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n");
- GNUNET_CADET_get_peers (cadet_handle, &init_peer_cb, ipc);
+ 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