/*
This file is part of GNUnet.
- Copyright (C)
+ Copyright (C) 2013-2015 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Julius Bünger
*/
#include "platform.h"
+#include "gnunet_applications.h"
#include "gnunet_util_lib.h"
#include "gnunet_cadet_service.h"
+#include "gnunet_peerinfo_service.h"
#include "gnunet_nse_service.h"
#include "rps.h"
-
+#include "rps-test_util.h"
#include "gnunet-service-rps_sampler.h"
+#include "gnunet-service-rps_custommap.h"
+#include "gnunet-service-rps_peers.h"
+#include "gnunet-service-rps_view.h"
#include <math.h>
#include <inttypes.h>
// TODO blacklist? (-> mal peer detection on top of brahms)
-// TODO API request_cancel
-
// hist_size_init, hist_size_max
/**
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
+ * Housekeeping with clients
***********************************************************************/
/**
- * Struct used to store the context of a connected client.
+ * Closure used to pass the client and the id to the callback
+ * that replies to a client's request
*/
-struct ClientContext
+struct ReplyCls
{
/**
- * The message queue to communicate with the client.
+ * DLL
*/
- 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?
+ struct ReplyCls *next;
+ struct ReplyCls *prev;
/**
- * We set this bit when we can be sure the other peer is/was live.
+ * The identifier of the request
*/
- VALID = 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);
+ uint32_t id;
-/**
- * Outstanding operation on peer consisting of callback and closure
- */
-struct PeerOutstandingOp
-{
/**
- * Callback
+ * The handle to the request
*/
- PeerOp op;
+ struct RPS_SamplerRequestHandle *req_handle;
/**
- * Closure
+ * The client handle to send the reply to
*/
- void *op_cls;
+ struct ClientContext *cli_ctx;
};
/**
- * Struct used to keep track of other peer's status
- *
- * This is stored in a multipeermap.
+ * Struct used to store the context of a connected client.
*/
-struct PeerContext
+struct ClientContext
{
/**
- * In own gossip/sampler list, in other's gossip/sampler list
+ * DLL
*/
- uint32_t peer_flags;
+ struct ClientContext *next;
+ struct ClientContext *prev;
/**
- * Message queue open to client
+ * The message queue to communicate with the client.
*/
struct GNUNET_MQ_Handle *mq;
/**
- * Channel open to client.
- */
- struct GNUNET_CADET_Channel *send_channel;
-
- /**
- * Channel open from client.
- */
- 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.
+ * DLL with handles to single requests from the client
*/
- struct GNUNET_CADET_TransmitHandle *is_live_task;
+ struct ReplyCls *rep_cls_head;
+ struct ReplyCls *rep_cls_tail;
/**
- * Identity of the peer
- */
- 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),
- * ...)
+ * The client handle to send the reply to
*/
+ struct GNUNET_SERVICE_Client *client;
};
+/**
+ * DLL with all clients currently connected to us
+ */
+struct ClientContext *cli_ctx_head;
+struct ClientContext *cli_ctx_tail;
+
/***********************************************************************
- * /Housekeeping with peers
+ * /Housekeeping with clients
***********************************************************************/
static struct RPS_Sampler *client_sampler;
/**
- * Set of all peers to keep track of them.
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *peer_map;
-
-
-/**
- * The gossiped list of peers.
+ * Name to log view to
*/
-static struct GNUNET_PeerIdentity *gossip_list;
-
-/**
- * Size of the gossiped list
- */
-//static unsigned int gossip_list_size;
-static uint32_t gossip_list_size;
-
+static char *file_name_view_log;
/**
- * 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 client's need
+ * of random peers.
*/
static unsigned int sampler_size_client_need;
* 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;
-
/**
- * Percentage of total peer number in the gossip list
+ * Percentage of total peer number in the view
* to send random PUSHes to
*/
static float alpha;
/**
- * Percentage of total peer number in the gossip list
+ * Percentage of total peer number in the view
* to send random PULLs to
*/
static float beta;
-/**
- * The percentage gamma of history updates.
- * Simply 1 - alpha - beta
- */
-
-
/**
* Identifier for the main task that runs periodically.
*/
*/
static struct GNUNET_TIME_Relative round_interval;
-
-
/**
* List to store peers received through pushes temporary.
- *
- * TODO -> multipeermap
*/
-static struct GNUNET_PeerIdentity *push_list;
-
-/**
- * Size of the push_list;
- */
-static unsigned int push_list_size;
-//size_t push_list_size;
+static struct CustomPeerMap *push_map;
/**
* 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;
-
+static struct CustomPeerMap *pull_map;
/**
* Handler to NSE.
*/
static struct GNUNET_CADET_Handle *cadet_handle;
+/**
+ * Handler to PEERINFO.
+ */
+static struct GNUNET_PEERINFO_Handle *peerinfo_handle;
+
+/**
+ * Handle for cancellation of iteration over peers.
+ */
+static struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify_handle;
/**
* Request counter.
*
+ * Counts how many requets clients already issued.
* Only needed in the beginning to check how many of the 64 deltas
* we already have
*/
/**
* The prediction of the rate of requests
*/
-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;
-
-
-/**
- * Closure used to pass the client and the id to the callback
- * that replies to a client's request
- */
-struct ReplyCls
-{
- /**
- * The identifier of the request
- */
- uint32_t id;
-
- /**
- * The client handle to send the reply to
- */
- struct GNUNET_SERVER_Client *client;
-};
+static struct GNUNET_TIME_Relative request_rate;
#ifdef ENABLE_MALICIOUS
* 2 Try to partition the network
* 3 Combined attack
*/
-uint32_t mal_type = 0;
+static uint32_t mal_type;
/**
* Other malicious peers
*/
-static struct GNUNET_PeerIdentity *mal_peers = NULL;
+static struct GNUNET_PeerIdentity *mal_peers;
/**
* Hashmap of malicious peers used as set.
* Used to more efficiently check whether we know that peer.
*/
-static struct GNUNET_CONTAINER_MultiPeerMap *mal_peer_set = NULL;
+static struct GNUNET_CONTAINER_MultiPeerMap *mal_peer_set;
/**
* Number of other malicious peers
*/
-static uint32_t num_mal_peers = 0;
+static uint32_t num_mal_peers;
/**
/**
* If type is 2 this is the DLL of attacked peers
*/
-static struct AttackedPeer *att_peers_head = NULL;
-static struct AttackedPeer *att_peers_tail = NULL;
+static struct AttackedPeer *att_peers_head;
+static struct AttackedPeer *att_peers_tail;
/**
* This index is used to point to an attacked peer to
* implement the round-robin-ish way to select attacked peers.
*/
-static struct AttackedPeer *att_peer_index = NULL;
+static struct AttackedPeer *att_peer_index;
/**
* Hashmap of attacked peers used as set.
* Used to more efficiently check whether we know that peer.
*/
-static struct GNUNET_CONTAINER_MultiPeerMap *att_peer_set = NULL;
+static struct GNUNET_CONTAINER_MultiPeerMap *att_peer_set;
/**
* Number of attacked peers
*/
-static uint32_t num_attacked_peers = 0;
-
+static uint32_t num_attacked_peers;
/**
* If type is 1 this is the attacked peer
***********************************************************************/
-
-
-
-
/***********************************************************************
* Util functions
***********************************************************************/
-/**
- * Set a peer flag of given peer context.
- */
-#define set_peer_flag(peer_ctx, mask) (peer_ctx->peer_flags |= mask)
-
-/**
- * Get peer flag of given peer context.
- */
-#define get_peer_flag(peer_ctx, mask) (peer_ctx->peer_flags & mask ? GNUNET_YES : GNUNET_NO)
-
-/**
- * Unset flag of given peer context.
- */
-#define unset_peer_flag(peer_ctx, mask) (peer_ctx->peer_flags &= (~mask))
-
-/**
- * Clean the send channel of a peer
- */
-void
-peer_clean (const struct GNUNET_PeerIdentity *peer);
-
-
-/**
- * Check if peer is already in peer array.
- */
- int
-in_arr (const struct GNUNET_PeerIdentity *array,
- unsigned int arr_size,
- const struct GNUNET_PeerIdentity *peer)
-{
- GNUNET_assert (NULL != peer);
-
- if (0 == arr_size)
- return GNUNET_NO;
-
- GNUNET_assert (NULL != array);
-
- unsigned int i;
-
- for (i = 0; i < arr_size ; i++)
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&array[i], peer))
- return GNUNET_YES;
- return GNUNET_NO;
-}
-
/**
* Print peerlist to log.
*/
-void
-print_peer_list (struct GNUNET_PeerIdentity *list, unsigned int len)
+static void
+print_peer_list (struct GNUNET_PeerIdentity *list,
+ unsigned int len)
{
unsigned int i;
/**
* Remove peer from list.
*/
- void
+static void
rem_from_list (struct GNUNET_PeerIdentity **peer_list,
unsigned int *list_size,
const struct GNUNET_PeerIdentity *peer)
{
if (i < *list_size -1)
{ /* Not at the last entry -- shift peers left */
- memcpy (&tmp[i], &tmp[i +1],
+ memmove (&tmp[i], &tmp[i +1],
((*list_size) - i -1) * sizeof (struct GNUNET_PeerIdentity));
}
/* Remove last entry (should be now useless PeerID) */
*peer_list = tmp;
}
-/**
- * Get random peer from the given list but don't return one from the @a ignore_list.
- */
- 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)
-{
- uint32_t r_index;
- uint32_t tmp_size;
- struct GNUNET_PeerIdentity *tmp_peer_list;
- struct GNUNET_PeerIdentity *peer;
-
- GNUNET_assert (NULL != peer_list);
- if (0 == list_size)
- return NULL;
-
- 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);
-
- print_peer_list (tmp_peer_list, tmp_size);
-
- 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,
- tmp_size);
- *peer = tmp_peer_list[r_index];
- }
-
-
- GNUNET_array_grow (tmp_peer_list, tmp_size, 0);
-
- return peer;
-}
-
-
-/**
- * Get the context of a peer. If not existing, create.
- */
- 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;
- ctx->is_live_task = NULL;
- ctx->peer_id = *peer;
- (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--;
-}
-
-
-/**
- * Set the peer flag to living and call the outstanding operations on this peer.
- */
-static size_t
-peer_is_live (struct PeerContext *peer_ctx)
-{
- struct GNUNET_PeerIdentity *peer;
-
- /* Cancle is_live_task if still scheduled */
- if (NULL != peer_ctx->is_live_task)
- {
- GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
- peer_ctx->is_live_task = NULL;
- }
-
- peer = &peer_ctx->peer_id;
- set_peer_flag (peer_ctx, VALID);
-
- 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);
- }
-
- return 0;
-}
-
-
-/**
- * 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
-cadet_ntfy_tmt_rdy_cb (void *cls, size_t size, void *buf)
-{
- struct PeerContext *peer_ctx = (struct PeerContext *) cls;
-
- peer_ctx->is_live_task = NULL;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Set ->is_live_task = NULL for peer %s\n",
- GNUNET_i2s (&peer_ctx->peer_id));
-
- if (NULL != buf
- && 0 != size)
- {
- peer_is_live (peer_ctx);
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Problems establishing a connection to peer %s in order to check liveliness\n",
- GNUNET_i2s (&peer_ctx->peer_id));
- // TODO reschedule? cleanup?
- }
-
- //if (NULL != peer_ctx->is_live_task)
- //{
- // LOG (GNUNET_ERROR_TYPE_DEBUG,
- // "Trying to cancle is_live_task for peer %s\n",
- // GNUNET_i2s (&peer_ctx->peer_id));
- // GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
- // peer_ctx->is_live_task = NULL;
- //}
-
- 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)
-{
- struct PeerContext *peer_ctx;
-
- peer_ctx = get_peer_ctx (peer_map, peer);
-
- if (NULL == peer_ctx->send_channel)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to establish channel to peer %s\n",
- GNUNET_i2s (peer));
-
- peer_ctx->send_channel =
- GNUNET_CADET_channel_create (cadet_handle,
- NULL,
- peer,
- GNUNET_RPS_CADET_PORT,
- GNUNET_CADET_OPTION_RELIABLE);
-
- // do I have to explicitly put it in the peer_map?
- (void) GNUNET_CONTAINER_multipeermap_put
- (peer_map,
- peer,
- peer_ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
- }
- return peer_ctx->send_channel;
-}
-
-
-/**
- * Get the message queue of a specific peer.
- *
- * If we already have a message queue open to this client,
- * simply return it, otherways create one.
- */
- struct GNUNET_MQ_Handle *
-get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
- const struct GNUNET_PeerIdentity *peer_id)
-{
- struct PeerContext *peer_ctx;
-
- peer_ctx = get_peer_ctx (peer_map, peer_id);
-
- GNUNET_assert (NULL == peer_ctx->is_live_task);
-
- if (NULL == peer_ctx->mq)
- {
- (void) get_channel (peer_map, peer_id);
- peer_ctx->mq = GNUNET_CADET_mq_create (peer_ctx->send_channel);
- //do I have to explicitly put it in the peer_map?
- (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer_id, peer_ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
- }
- return peer_ctx->mq;
-}
-
-
-/**
- * Issue check whether peer is live
- *
- * @param peer_ctx the context of the peer
- */
-void
-check_peer_live (struct PeerContext *peer_ctx)
-{
- (void) get_channel (peer_map, &peer_ctx->peer_id);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Get informed about peer %s getting live\n",
- GNUNET_i2s (&peer_ctx->peer_id));
- if (NULL == peer_ctx->is_live_task)
- {
- peer_ctx->is_live_task =
- GNUNET_CADET_notify_transmit_ready (peer_ctx->send_channel,
- GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sizeof (struct GNUNET_MessageHeader),
- cadet_ntfy_tmt_rdy_cb,
- peer_ctx);
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Already waiting for notification\n");
- }
-}
-
/**
* 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)
+ */
+static 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;
/**
* 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);
-}
-
-
-/**
- * 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);
-
- peer_clean (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;
+ */
+static 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);
}
/**
- * Insert PeerID in #gossip_list
+ * Insert PeerID in #view
*
* Called once we know a peer is live.
+ * Implements #PeerOp
+ *
+ * @return GNUNET_OK if peer was actually inserted
+ * GNUNET_NO if peer was not inserted
*/
- 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);
-
- (void) get_channel (peer_map, peer);
-}
+static void
+insert_in_view_op (void *cls,
+ const struct GNUNET_PeerIdentity *peer);
/**
- * Check whether #insert_in_gossip_list was already scheduled
+ * Insert PeerID in #view
+ *
+ * Called once we know a peer is live.
+ *
+ * @return GNUNET_OK if peer was actually inserted
+ * GNUNET_NO if peer was not inserted
*/
- int
-insert_in_gossip_list_scheduled (const struct PeerContext *peer_ctx)
+static int
+insert_in_view (const struct GNUNET_PeerIdentity *peer)
{
- 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;
-}
-
+ int online;
-/**
- * Update sampler with given PeerID.
- */
- void
-insert_in_sampler (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Updating samplers with peer %s from insert_in_sampler()\n",
- GNUNET_i2s (peer));
- RPS_sampler_update (prot_sampler, peer);
- RPS_sampler_update (client_sampler, peer);
+ online = Peers_check_peer_flag (peer, Peers_ONLINE);
+ if ( (GNUNET_NO == online) ||
+ (GNUNET_SYSERR == online) ) /* peer is not even known */
+ {
+ (void) Peers_issue_peer_liveliness_check (peer);
+ (void) Peers_schedule_operation (peer, insert_in_view_op);
+ return GNUNET_NO;
+ }
+ /* Open channel towards peer to keep connection open */
+ Peers_indicate_sending_intention (peer);
+ return View_put (peer);
}
-
/**
- * Check whether #insert_in_sampler was already scheduled
+ * Put random peer from sampler into the view as history update.
*/
-static int
-insert_in_sampler_scheduled (const struct PeerContext *peer_ctx)
+static void
+hist_update (void *cls,
+ struct GNUNET_PeerIdentity *ids,
+ uint32_t num_peers)
{
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;
+ for (i = 0; i < num_peers; i++)
+ {
+ (void) insert_in_view (&ids[i]);
+ to_file (file_name_view_log,
+ "+%s\t(hist)",
+ GNUNET_i2s_full (ids));
+ }
}
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;
+ bigger_size = GNUNET_MAX (sampler_size_est_need, 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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size_client is now %" PRIu32 "\n",
+ bigger_size);
}
*
* Called every time we receive a request from the client.
*/
- void
+static void
est_request_rate()
{
struct GNUNET_TIME_Relative max_round_duration;
if ( 1 < req_counter)
{
/* Shift last request deltas to the right */
- memcpy (&request_deltas[1],
+ memmove (&request_deltas[1],
request_deltas,
(req_counter - 1) * sizeof (struct GNUNET_TIME_Relative));
GNUNET_TIME_absolute_get_difference (last_request,
GNUNET_TIME_absolute_get ());
request_rate = T_relative_avg (request_deltas, req_counter);
+ request_rate = (request_rate.rel_value_us < 1) ?
+ GNUNET_TIME_relative_get_unit_ () : request_rate;
/* Compute the duration a round will maximally take */
max_round_duration =
{
unsigned int i;
if (NULL == peer_map)
- peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers + 1,
- GNUNET_NO);
- for (i = 0 ; i < num_peers ; i++)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Trying to add peers to non-existing peermap.\n");
+ return;
+ }
+
+ for (i = 0; i < num_peers; i++)
{
GNUNET_CONTAINER_multipeermap_put (peer_map,
&peer_array[i],
unsigned int num_peer_ids)
{
uint32_t send_size;
- struct GNUNET_MQ_Handle *mq;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_RPS_P2P_PullReplyMessage *out_msg;
send_size = num_peer_ids;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "PULL REQUEST from peer %s received, going to send %u peers\n",
- GNUNET_i2s (peer_id), send_size);
-
- mq = get_mq (peer_map, peer_id);
+ "Going to send PULL REPLY with %u peers to %s\n",
+ send_size, GNUNET_i2s (peer_id));
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 (send_size);
- memcpy (&out_msg[1], peer_ids,
+ GNUNET_memcpy (&out_msg[1], peer_ids,
send_size * sizeof (struct GNUNET_PeerIdentity));
- GNUNET_MQ_send (mq, ev);
+ Peers_send_message (peer_id, ev, "PULL REPLY");
}
/**
- * This function is called on new peer_ids from 'external' sources
- * (client seed, cadet get_peers(), ...)
+ * Insert PeerID in #pull_map
*
- * @param peer_id the new peer_id
+ * Called once we know a peer is live.
*/
static void
-new_peer_id (const struct GNUNET_PeerIdentity *peer_id)
+insert_in_pull_map (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct PeerOutstandingOp out_op;
- struct PeerContext *peer_ctx;
+ CustomPeerMap_put (pull_map, peer);
+}
- if (NULL != peer_id
- && 0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, peer_id))
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got peer_id %s (at %p, gossip_list_size: %u)\n",
- GNUNET_i2s (peer_id),
- peer_id,
- gossip_list_size);
- peer_ctx = get_peer_ctx (peer_map, peer_id);
- if (GNUNET_YES != get_peer_flag (peer_ctx, VALID))
- {
- if (GNUNET_NO == insert_in_sampler_scheduled (peer_ctx))
- {
- out_op.op = insert_in_sampler;
- out_op.op_cls = NULL;
- GNUNET_array_append (peer_ctx->outstanding_ops,
- peer_ctx->num_outstanding_ops,
- out_op);
- }
+/**
+ * Insert PeerID in #view
+ *
+ * Called once we know a peer is live.
+ * Implements #PeerOp
+ */
+static void
+insert_in_view_op (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ (void) insert_in_view (peer);
+}
- 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);
- }
- /* Trigger livelyness test on peer */
- check_peer_live (peer_ctx);
+/**
+ * Update sampler with given PeerID.
+ * Implements #PeerOp
+ */
+static void
+insert_in_sampler (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating samplers with peer %s from insert_in_sampler()\n",
+ GNUNET_i2s (peer));
+ RPS_sampler_update (prot_sampler, peer);
+ RPS_sampler_update (client_sampler, peer);
+ if (0 < RPS_sampler_count_id (prot_sampler, peer))
+ {
+ /* Make sure we 'know' about this peer */
+ (void) Peers_issue_peer_liveliness_check (peer);
+ /* Establish a channel towards that peer to indicate we are going to send
+ * messages to it */
+ //Peers_indicate_sending_intention (peer);
+ }
+}
+
+/**
+ * @brief This is called on peers from external sources (cadet, peerinfo, ...)
+ * If the peer is not known, liveliness check is issued and it is
+ * scheduled to be inserted in sampler and view.
+ *
+ * "External sources" refer to every source except the gossip.
+ *
+ * @param peer peer to insert
+ */
+static void
+got_peer (const struct GNUNET_PeerIdentity *peer)
+{
+ /* If we did not know this peer already, insert it into sampler and view */
+ if (GNUNET_YES == Peers_issue_peer_liveliness_check (peer))
+ {
+ Peers_schedule_operation (peer, insert_in_sampler);
+ Peers_schedule_operation (peer, insert_in_view_op);
+ }
+}
+
+/**
+ * @brief Checks if there is a sending channel and if it is needed
+ *
+ * @param peer the peer whose sending channel is checked
+ * @return GNUNET_YES if sending channel exists and is still needed
+ * GNUNET_NO otherwise
+ */
+static int
+check_sending_channel_needed (const struct GNUNET_PeerIdentity *peer)
+{
+ /* struct GNUNET_CADET_Channel *channel; */
+ if (GNUNET_NO == Peers_check_peer_known (peer))
+ {
+ return GNUNET_NO;
+ }
+ if (GNUNET_YES == Peers_check_sending_channel_exists (peer))
+ {
+ if ( (0 < RPS_sampler_count_id (prot_sampler, peer)) ||
+ (GNUNET_YES == View_contains_peer (peer)) ||
+ (GNUNET_YES == CustomPeerMap_contains_peer (push_map, peer)) ||
+ (GNUNET_YES == CustomPeerMap_contains_peer (pull_map, peer)) ||
+ (GNUNET_YES == Peers_check_peer_flag (peer, Peers_PULL_REPLY_PENDING)))
+ { /* If we want to keep the connection to peer open */
+ return GNUNET_YES;
}
- // else...?
+ return GNUNET_NO;
+ }
+ return GNUNET_NO;
+}
+
+/**
+ * @brief remove peer from our knowledge, the view, push and pull maps and
+ * samplers.
+ *
+ * @param peer the peer to remove
+ */
+static void
+remove_peer (const struct GNUNET_PeerIdentity *peer)
+{
+ (void) View_remove_peer (peer);
+ CustomPeerMap_remove_peer (pull_map, peer);
+ CustomPeerMap_remove_peer (push_map, peer);
+ RPS_sampler_reinitialise_by_value (prot_sampler, peer);
+ RPS_sampler_reinitialise_by_value (client_sampler, peer);
+ Peers_remove_peer (peer);
+}
+
- // send push/pull to each of those peers?
+/**
+ * @brief Remove data that is not needed anymore.
+ *
+ * If the sending channel is no longer needed it is destroyed.
+ *
+ * @param peer the peer whose data is about to be cleaned
+ */
+static void
+clean_peer (const struct GNUNET_PeerIdentity *peer)
+{
+ if (GNUNET_NO == check_sending_channel_needed (peer))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to remove send channel to peer %s\n",
+ GNUNET_i2s (peer));
+ #ifdef ENABLE_MALICIOUS
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer))
+ (void) Peers_destroy_sending_channel (peer);
+ #else /* ENABLE_MALICIOUS */
+ (void) Peers_destroy_sending_channel (peer);
+ #endif /* ENABLE_MALICIOUS */
+ }
+
+ if ( (GNUNET_NO == Peers_check_peer_send_intention (peer)) &&
+ (GNUNET_NO == View_contains_peer (peer)) &&
+ (GNUNET_NO == CustomPeerMap_contains_peer (push_map, peer)) &&
+ (GNUNET_NO == CustomPeerMap_contains_peer (push_map, peer)) &&
+ (0 == RPS_sampler_count_id (prot_sampler, peer)) &&
+ (0 == RPS_sampler_count_id (client_sampler, peer)) &&
+ (GNUNET_NO != Peers_check_removable (peer)) )
+ { /* We can safely remove this peer */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to remove peer %s\n",
+ GNUNET_i2s (peer));
+ remove_peer (peer);
+ return;
}
}
+/**
+ * @brief This is called when a channel is destroyed.
+ *
+ * Removes peer completely from our knowledge if the send_channel was destroyed
+ * Otherwise simply delete the recv_channel
+ * Also check if the knowledge about this peer is still needed.
+ * If not, remove this peer from our knowledge.
+ *
+ * @param cls The closure
+ * @param channel The channel being closed
+ * @param channel_ctx The context associated with this channel
+ */
+static void
+cleanup_destroyed_channel (void *cls,
+ const struct GNUNET_CADET_Channel *channel,
+ void *channel_ctx)
+{
+ struct GNUNET_PeerIdentity *peer;
+
+ peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (
+ (struct GNUNET_CADET_Channel *) channel, GNUNET_CADET_OPTION_PEER);
+ // FIXME wait for cadet to change this function
+
+ if (GNUNET_NO == Peers_check_peer_known (peer))
+ { /* We don't know a context to that peer */
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "channel (%s) without associated context was destroyed\n",
+ GNUNET_i2s (peer));
+ return;
+ }
+
+ if (GNUNET_YES == Peers_check_peer_flag (peer, Peers_TO_DESTROY))
+ { /* We are in the middle of removing that peer from our knowledge. In this
+ case simply make sure that the channels are cleaned. */
+ Peers_cleanup_destroyed_channel (cls, channel, channel_ctx);
+ to_file (file_name_view_log,
+ "-%s\t(cleanup channel, ourself)",
+ GNUNET_i2s_full (peer));
+ return;
+ }
+
+ if (GNUNET_YES ==
+ Peers_check_channel_role (peer, channel, Peers_CHANNEL_ROLE_SENDING))
+ { /* Channel used for sending was destroyed */
+ /* Possible causes of channel destruction:
+ * - ourselves -> cleaning send channel -> clean context
+ * - other peer -> peer probably went down -> remove
+ */
+ if (GNUNET_YES == Peers_check_channel_flag (channel_ctx, Peers_CHANNEL_CLEAN))
+ { /* We are about to clean the sending channel. Clean the respective
+ * context */
+ Peers_cleanup_destroyed_channel (cls, channel, channel_ctx);
+ return;
+ }
+ else
+ { /* Other peer destroyed our sending channel that he is supposed to keep
+ * open. It probably went down. Remove it from our knowledge. */
+ Peers_cleanup_destroyed_channel (cls, channel, channel_ctx);
+ remove_peer (peer);
+ return;
+ }
+ }
+ else if (GNUNET_YES ==
+ Peers_check_channel_role (peer, channel, Peers_CHANNEL_ROLE_RECEIVING))
+ { /* Channel used for receiving was destroyed */
+ /* Possible causes of channel destruction:
+ * - ourselves -> peer tried to establish channel twice -> clean context
+ * - other peer -> peer doesn't want to send us data -> clean
+ */
+ if (GNUNET_YES ==
+ Peers_check_channel_flag (channel_ctx, Peers_CHANNEL_ESTABLISHED_TWICE))
+ { /* Other peer tried to establish a channel to us twice. We do not accept
+ * that. Clean the context. */
+ Peers_cleanup_destroyed_channel (cls, channel, channel_ctx);
+ return;
+ }
+ else
+ { /* Other peer doesn't want to send us data anymore. We are free to clean
+ * it. */
+ Peers_cleanup_destroyed_channel (cls, channel, channel_ctx);
+ clean_peer (peer);
+ return;
+ }
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Destroyed channel is neither sending nor receiving channel\n");
+ }
+}
/***********************************************************************
* /Util functions
***********************************************************************/
+static void
+destroy_reply_cls (struct ReplyCls *rep_cls)
+{
+ struct ClientContext *cli_ctx;
+
+ cli_ctx = rep_cls->cli_ctx;
+ GNUNET_assert (NULL != cli_ctx);
+ if (NULL != rep_cls->req_handle)
+ {
+ RPS_sampler_request_cancel (rep_cls->req_handle);
+ }
+ GNUNET_CONTAINER_DLL_remove (cli_ctx->rep_cls_head,
+ cli_ctx->rep_cls_tail,
+ rep_cls);
+ GNUNET_free (rep_cls);
+}
+static void
+destroy_cli_ctx (struct ClientContext *cli_ctx)
+{
+ GNUNET_assert (NULL != cli_ctx);
+ if (NULL != cli_ctx->rep_cls_head)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Trying to destroy the context of a client that still has pending requests. Going to clean those\n");
+ while (NULL != cli_ctx->rep_cls_head)
+ destroy_reply_cls (cli_ctx->rep_cls_head);
+ }
+ GNUNET_CONTAINER_DLL_remove (cli_ctx_head,
+ cli_ctx_tail,
+ cli_ctx);
+ GNUNET_free (cli_ctx);
+}
/**
* Function called by NSE.
*
- * Updates sizes of sampler list and gossip list and adapt those lists
+ * Updates sizes of sampler list and view and adapt those lists
* accordingly.
*/
- void
-nse_callback (void *cls, struct GNUNET_TIME_Absolute timestamp,
+static void
+nse_callback (void *cls,
+ struct GNUNET_TIME_Absolute timestamp,
double logestimate, double std_dev)
{
double estimate;
*
* Sends those to the requesting client.
*/
-void client_respond (void *cls,
- struct GNUNET_PeerIdentity *peer_ids, uint32_t num_peers)
+static void
+client_respond (void *cls,
+ struct GNUNET_PeerIdentity *peer_ids,
+ uint32_t num_peers)
{
+ struct ReplyCls *reply_cls = cls;
+ uint32_t i;
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_RPS_CS_ReplyMessage *out_msg;
- struct ReplyCls *reply_cls = (struct ReplyCls *) cls;
uint32_t size_needed;
struct ClientContext *cli_ctx;
+ GNUNET_assert (NULL != reply_cls);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "sampler returned %" PRIu32 " peers\n",
+ "sampler returned %" PRIu32 " peers:\n",
num_peers);
+ for (i = 0; i < num_peers; i++)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " %" PRIu32 ": %s\n",
+ i,
+ GNUNET_i2s (&peer_ids[i]));
+ }
size_needed = sizeof (struct GNUNET_RPS_CS_ReplyMessage) +
num_peers * sizeof (struct GNUNET_PeerIdentity);
out_msg->num_peers = htonl (num_peers);
out_msg->id = htonl (reply_cls->id);
- memcpy (&out_msg[1],
+ GNUNET_memcpy (&out_msg[1],
peer_ids,
num_peers * sizeof (struct GNUNET_PeerIdentity));
GNUNET_free (peer_ids);
- cli_ctx = GNUNET_SERVER_client_get_user_context (reply_cls->client, struct ClientContext);
- if (NULL == cli_ctx) {
- cli_ctx = GNUNET_new (struct ClientContext);
- cli_ctx->mq = GNUNET_MQ_queue_for_server_client (reply_cls->client);
- GNUNET_SERVER_client_set_user_context (reply_cls->client, cli_ctx);
- }
-
- GNUNET_free (reply_cls);
-
+ cli_ctx = reply_cls->cli_ctx;
+ GNUNET_assert (NULL != cli_ctx);
+ reply_cls->req_handle = NULL;
+ destroy_reply_cls (reply_cls);
GNUNET_MQ_send (cli_ctx->mq, ev);
}
*/
static void
handle_client_request (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_RPS_CS_RequestMessage *msg)
{
- struct GNUNET_RPS_CS_RequestMessage *msg;
+ struct ClientContext *cli_ctx = cls;
uint32_t num_peers;
uint32_t size_needed;
struct ReplyCls *reply_cls;
uint32_t i;
- msg = (struct GNUNET_RPS_CS_RequestMessage *) message;
-
num_peers = ntohl (msg->num_peers);
size_needed = sizeof (struct GNUNET_RPS_CS_RequestMessage) +
num_peers * sizeof (struct GNUNET_PeerIdentity);
if (GNUNET_SERVER_MAX_MESSAGE_SIZE < size_needed)
{
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Message received from client has size larger than expected\n");
+ GNUNET_SERVICE_client_drop (cli_ctx->client);
return;
}
reply_cls = GNUNET_new (struct ReplyCls);
reply_cls->id = ntohl (msg->id);
- reply_cls->client = client;
+ reply_cls->cli_ctx = cli_ctx;
+ reply_cls->req_handle = RPS_sampler_get_n_rand_peers (client_sampler,
+ client_respond,
+ reply_cls,
+ num_peers);
+
+ GNUNET_assert (NULL != cli_ctx);
+ GNUNET_CONTAINER_DLL_insert (cli_ctx->rep_cls_head,
+ cli_ctx->rep_cls_tail,
+ reply_cls);
+ GNUNET_SERVICE_client_continue (cli_ctx->client);
+}
+
+
+/**
+ * @brief Handle a message that requests the cancellation of a request
+ *
+ * @param cls unused
+ * @param client the client that requests the cancellation
+ * @param message the message containing the id of the request
+ */
+static void
+handle_client_request_cancel (void *cls,
+ const struct GNUNET_RPS_CS_RequestCancelMessage *msg)
+{
+ struct ClientContext *cli_ctx = cls;
+ struct ReplyCls *rep_cls;
+
+ GNUNET_assert (NULL != cli_ctx);
+ GNUNET_assert (NULL != cli_ctx->rep_cls_head);
+ rep_cls = cli_ctx->rep_cls_head;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Client cancels request with id %" PRIu32 "\n",
+ ntohl (msg->id));
+ while ( (NULL != rep_cls->next) &&
+ (rep_cls->id != ntohl (msg->id)) )
+ rep_cls = rep_cls->next;
+ GNUNET_assert (rep_cls->id == ntohl (msg->id));
+ RPS_sampler_request_cancel (rep_cls->req_handle);
+ destroy_reply_cls (rep_cls);
+ GNUNET_SERVICE_client_continue (cli_ctx->client);
+}
- RPS_sampler_get_n_rand_peers (client_sampler,
- client_respond,
- reply_cls,
- num_peers);
- GNUNET_SERVER_receive_done (client,
- GNUNET_OK);
+/**
+ * @brief This function is called, when the client seeds peers.
+ * It verifies that @a msg is well-formed.
+ *
+ * @param cls the closure (#ClientContext)
+ * @param msg the message
+ * @return #GNUNET_OK if @a msg is well-formed
+ */
+static int
+check_client_seed (void *cls, const struct GNUNET_RPS_CS_SeedMessage *msg)
+{
+ struct ClientContext *cli_ctx = cls;
+ uint16_t msize = ntohs (msg->header.size);
+ uint32_t num_peers = ntohl (msg->num_peers);
+
+ msize -= sizeof (struct GNUNET_RPS_CS_SeedMessage);
+ if ( (msize / sizeof (struct GNUNET_PeerIdentity) != num_peers) ||
+ (msize % sizeof (struct GNUNET_PeerIdentity) != 0) )
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (cli_ctx->client);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
* @param client identification of the client
* @param message the actual message
*/
- static void
+static void
handle_client_seed (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_RPS_CS_SeedMessage *msg)
{
- struct GNUNET_RPS_CS_SeedMessage *in_msg;
+ struct ClientContext *cli_ctx = cls;
struct GNUNET_PeerIdentity *peers;
uint32_t num_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);
- }
-
- in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message;
- num_peers = ntohl (in_msg->num_peers);
- peers = (struct GNUNET_PeerIdentity *) &in_msg[1];
+ num_peers = ntohl (msg->num_peers);
+ peers = (struct GNUNET_PeerIdentity *) &msg[1];
//peers = GNUNET_new_array (num_peers, struct GNUNET_PeerIdentity);
- //memcpy (peers, &in_msg[1], num_peers * sizeof (struct GNUNET_PeerIdentity));
-
- if ((ntohs (message->size) - sizeof (struct GNUNET_RPS_CS_SeedMessage)) /
- sizeof (struct GNUNET_PeerIdentity) != num_peers)
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client,
- GNUNET_SYSERR);
- }
+ //GNUNET_memcpy (peers, &in_msg[1], num_peers * sizeof (struct GNUNET_PeerIdentity));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Client seeded peers:\n");
print_peer_list (peers, num_peers);
- for (i = 0 ; i < num_peers ; i++)
+ for (i = 0; i < num_peers; i++)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Updating samplers with seed %" PRIu32 ": %s\n",
i,
GNUNET_i2s (&peers[i]));
- new_peer_id (&peers[i]);
-
- //RPS_sampler_update (prot_sampler, &peers[i]);
- //RPS_sampler_update (client_sampler, &peers[i]);
+ got_peer (&peers[i]);
}
////GNUNET_free (peers);
- GNUNET_SERVER_receive_done (client,
- GNUNET_OK);
+ GNUNET_SERVICE_client_continue (cli_ctx->client);
}
+/**
+ * Handle a CHECK_LIVE message from another peer.
+ *
+ * This does nothing. But without calling #GNUNET_CADET_receive_done()
+ * the channel is blocked for all other communication.
+ *
+ * @param cls Closure
+ * @param channel The channel the CHECK was received over
+ * @param channel_ctx The context associated with this channel
+ * @param msg The message header
+ */
+static int
+handle_peer_check (void *cls,
+ struct GNUNET_CADET_Channel *channel,
+ void **channel_ctx,
+ const struct GNUNET_MessageHeader *msg)
+{
+ GNUNET_CADET_receive_done (channel);
+ return GNUNET_OK;
+}
/**
* Handle a PUSH message from another peer.
*/
static int
handle_peer_push (void *cls,
- struct GNUNET_CADET_Channel *channel,
- void **channel_ctx,
- const struct GNUNET_MessageHeader *msg)
+ struct GNUNET_CADET_Channel *channel,
+ void **channel_ctx,
+ const struct GNUNET_MessageHeader *msg)
{
const struct GNUNET_PeerIdentity *peer;
- // (check the proof of work)
+ // (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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received PUSH (%s)\n",
+ GNUNET_i2s (peer));
#ifdef ENABLE_MALICIOUS
struct AttackedPeer *tmp_att_peer;
- tmp_att_peer = GNUNET_new (struct AttackedPeer);
- memcpy (&tmp_att_peer->peer_id, peer, sizeof (struct GNUNET_PeerIdentity));
- if (1 == mal_type
- || 3 == mal_type)
+ if ( (1 == mal_type) ||
+ (3 == mal_type) )
{ /* Try to maximise representation */
+ tmp_att_peer = GNUNET_new (struct AttackedPeer);
+ GNUNET_memcpy (&tmp_att_peer->peer_id, peer, sizeof (struct GNUNET_PeerIdentity));
if (NULL == att_peer_set)
att_peer_set = GNUNET_CONTAINER_multipeermap_create (1, GNUNET_NO);
if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (att_peer_set,
tmp_att_peer);
add_peer_array_to_set (peer, 1, att_peer_set);
}
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
else if (2 == mal_type)
{ /* We attack one single well-known peer - simply ignore */
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
-
#endif /* ENABLE_MALICIOUS */
- /* Add the sending peer to the push_list */
- if (GNUNET_NO == in_arr (push_list, push_list_size, peer))
- GNUNET_array_append (push_list, push_list_size, *peer);
+ /* Add the sending peer to the push_map */
+ CustomPeerMap_put (push_map, peer);
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
/**
* Handle PULL REQUEST request message from another peer.
*
- * Reply with the gossip list of PeerIDs.
+ * Reply with the view of PeerIDs.
*
* @param cls Closure
- * @param channel The channel the PUSH was received over
+ * @param channel The channel the PULL REQUEST was received over
* @param channel_ctx The context associated with this channel
* @param msg The message header
*/
static int
handle_peer_pull_request (void *cls,
- struct GNUNET_CADET_Channel *channel,
- void **channel_ctx,
- const struct GNUNET_MessageHeader *msg)
+ struct GNUNET_CADET_Channel *channel,
+ void **channel_ctx,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_PeerIdentity *peer;
+ const struct GNUNET_PeerIdentity *view_array;
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, "Received PULL REQUEST (%s)\n", GNUNET_i2s (peer));
+
#ifdef ENABLE_MALICIOUS
if (1 == mal_type
|| 3 == mal_type)
{ /* Try to maximise representation */
send_pull_reply (peer, mal_peers, num_mal_peers);
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
else if (2 == mal_type)
{ /* Try to partition network */
- if (GNUNET_YES == GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer))
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer))
{
send_pull_reply (peer, mal_peers, num_mal_peers);
}
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
#endif /* ENABLE_MALICIOUS */
- send_pull_reply (peer, gossip_list, gossip_list_size);
+ view_array = View_get_as_array ();
+
+ send_pull_reply (peer, view_array, View_size ());
+ GNUNET_CADET_receive_done (channel);
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,
{
struct GNUNET_RPS_P2P_PullReplyMessage *in_msg;
struct GNUNET_PeerIdentity *peers;
- struct PeerContext *peer_ctx;
struct GNUNET_PeerIdentity *sender;
- struct PeerContext *sender_ctx;
- struct PeerOutstandingOp out_op;
uint32_t i;
#ifdef ENABLE_MALICIOUS
struct AttackedPeer *tmp_att_peer;
if (sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) > ntohs (msg->size))
{
GNUNET_break_op (0);
+ GNUNET_CADET_receive_done (channel);
return GNUNET_SYSERR;
}
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",
+ "message says it sends %" PRIu32 " peers, have space for %lu peers\n",
ntohl (in_msg->num_peers),
(ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) /
sizeof (struct GNUNET_PeerIdentity));
GNUNET_break_op (0);
+ GNUNET_CADET_receive_done (channel);
return GNUNET_SYSERR;
}
- 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);
+ // Guess simply casting isn't the nicest way...
+ // FIXME wait for cadet to change this function
+ sender = (struct GNUNET_PeerIdentity *)
+ GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER);
- if (GNUNET_YES == get_peer_flag (sender_ctx, PULL_REPLY_PENDING))
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received PULL REPLY (%s)\n", GNUNET_i2s (sender));
+
+ if (GNUNET_YES != Peers_check_peer_flag (sender, Peers_PULL_REPLY_PENDING))
{
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Received a pull reply from a peer we didn't request one from!\n");
+ GNUNET_CADET_receive_done (channel);
GNUNET_break_op (0);
return GNUNET_OK;
}
#ifdef ENABLE_MALICIOUS
// We shouldn't even receive pull replies as we're not sending
if (2 == mal_type)
+ {
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
+ }
#endif /* ENABLE_MALICIOUS */
/* Do actual logic */
- peers = (struct GNUNET_PeerIdentity *) &msg[1];
+ peers = (struct GNUNET_PeerIdentity *) &in_msg[1];
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "PULL REPLY received, got following peers:\n");
+ "PULL REPLY received, got following %u peers:\n",
+ ntohl (in_msg->num_peers));
for (i = 0 ; i < ntohl (in_msg->num_peers) ; i++)
{
GNUNET_i2s (&peers[i]));
#ifdef ENABLE_MALICIOUS
- if (1 == mal_type
- || 3 == mal_type)
+ if ((NULL != att_peer_set) &&
+ (1 == mal_type || 3 == mal_type))
{ /* Add attacked peer to local list */
// TODO check if we sent a request and this was the first reply
if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (att_peer_set,
&peers[i])
&& GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (mal_peer_set,
&peers[i])
- && GNUNET_NO == GNUNET_CRYPTO_cmp_peer_identity (&peers[i],
- &own_identity))
+ && 0 != GNUNET_CRYPTO_cmp_peer_identity (&peers[i],
+ &own_identity))
{
tmp_att_peer = GNUNET_new (struct AttackedPeer);
tmp_att_peer->peer_id = peers[i];
continue;
}
#endif /* ENABLE_MALICIOUS */
- peer_ctx = get_peer_ctx (peer_map, &peers[i]);
- if (GNUNET_YES == get_peer_flag (peer_ctx, VALID)
- || NULL != peer_ctx->send_channel
- || NULL != peer_ctx->recv_channel)
- {
- if (GNUNET_NO == in_arr (pull_list, pull_list_size, &peers[i])
- && 0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peers[i]))
- GNUNET_array_append (pull_list, pull_list_size, peers[i]);
- }
- else if (GNUNET_NO == insert_in_pull_list_scheduled (peer_ctx))
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity,
+ &peers[i]))
{
- 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);
- check_peer_live (peer_ctx);
+ /* Make sure we 'know' about this peer */
+ (void) Peers_insert_peer (&peers[i]);
+
+ if (GNUNET_YES == Peers_check_peer_valid (&peers[i]))
+ {
+ CustomPeerMap_put (pull_map, &peers[i]);
+ }
+ else
+ {
+ Peers_schedule_operation (&peers[i], insert_in_pull_map);
+ (void) Peers_issue_peer_liveliness_check (&peers[i]);
+ }
}
}
- unset_peer_flag (sender_ctx, PULL_REPLY_PENDING);
- rem_from_list (&pending_pull_reply_list, &pending_pull_reply_list_size, sender);
+ Peers_unset_peer_flag (sender, Peers_PULL_REPLY_PENDING);
+ clean_peer (sender);
+ GNUNET_CADET_receive_done (channel);
return GNUNET_OK;
}
* @param spread the inverse amount of deviation from the mean
*/
static struct GNUNET_TIME_Relative
-compute_rand_delay (struct GNUNET_TIME_Relative mean, unsigned int spread)
+compute_rand_delay (struct GNUNET_TIME_Relative mean,
+ unsigned int spread)
{
struct GNUNET_TIME_Relative half_interval;
struct GNUNET_TIME_Relative ret;
LOG (GNUNET_ERROR_TYPE_WARNING,
"Not accepting spread of 0\n");
GNUNET_break (0);
+ GNUNET_assert (0);
}
+ GNUNET_assert (0 != mean.rel_value_us);
/* Compute random time value between spread * mean and spread * mean */
half_interval = GNUNET_TIME_relative_divide (mean, spread);
* via multiplying round_interval with a 'fraction' (0 to value)/value
*/
rand_delay = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, max_rand_delay);
- ret = GNUNET_TIME_relative_multiply (mean, rand_delay);
+ ret = GNUNET_TIME_relative_saturating_multiply (mean, rand_delay);
ret = GNUNET_TIME_relative_divide (ret, max_rand_delay);
ret = GNUNET_TIME_relative_add (ret, half_interval);
* @param peer_id the peer to send the pull request to.
*/
static void
-send_pull_request (struct GNUNET_PeerIdentity *peer_id)
+send_pull_request (const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_MQ_Handle *mq;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending PULL request to peer %s of gossiped list.\n",
- GNUNET_i2s (peer_id));
+ GNUNET_assert (GNUNET_NO == Peers_check_peer_flag (peer,
+ Peers_PULL_REPLY_PENDING));
+ Peers_set_peer_flag (peer, Peers_PULL_REPLY_PENDING);
- GNUNET_array_append (pending_pull_reply_list, pending_pull_reply_list_size, *peer_id);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to send PULL REQUEST to peer %s.\n",
+ GNUNET_i2s (peer));
ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST);
- mq = get_mq (peer_map, peer_id);
- GNUNET_MQ_send (mq, ev);
+ Peers_send_message (peer, ev, "PULL REQUEST");
}
* @param peer_id the peer to send the push to.
*/
static void
-send_push (struct GNUNET_PeerIdentity *peer_id)
+send_push (const struct GNUNET_PeerIdentity *peer_id)
{
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_MQ_Handle *mq;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending PUSH to peer %s of gossiped list.\n",
+ "Going to send PUSH to peer %s.\n",
GNUNET_i2s (peer_id));
ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PUSH);
- mq = get_mq (peer_map, peer_id);
- GNUNET_MQ_send (mq, ev);
+ Peers_send_message (peer_id, ev, "PUSH");
}
static void
-do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+do_round (void *cls);
static void
-do_mal_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
+do_mal_round (void *cls);
#ifdef ENABLE_MALICIOUS
+
+
+/**
+ * @brief This function is called, when the client tells us to act malicious.
+ * It verifies that @a msg is well-formed.
+ *
+ * @param cls the closure (#ClientContext)
+ * @param msg the message
+ * @return #GNUNET_OK if @a msg is well-formed
+ */
+static int
+check_client_act_malicious (void *cls,
+ const struct GNUNET_RPS_CS_ActMaliciousMessage *msg)
+{
+ struct ClientContext *cli_ctx = cls;
+ uint16_t msize = ntohs (msg->header.size);
+ uint32_t num_peers = ntohl (msg->num_peers);
+
+ msize -= sizeof (struct GNUNET_RPS_CS_ActMaliciousMessage);
+ if ( (msize / sizeof (struct GNUNET_PeerIdentity) != num_peers) ||
+ (msize % sizeof (struct GNUNET_PeerIdentity) != 0) )
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "message says it sends %" PRIu32 " peers, have space for %lu peers\n",
+ ntohl (msg->num_peers),
+ (msize / sizeof (struct GNUNET_PeerIdentity)));
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (cli_ctx->client);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
/**
* Turn RPS service to act malicious.
*
* @param cls Closure
- * @param channel The channel the PUSH was received over
- * @param channel_ctx The context associated with this channel
+ * @param client The client that sent the message
* @param msg The message header
*/
- static void
+static void
handle_client_act_malicious (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *msg)
+ const struct GNUNET_RPS_CS_ActMaliciousMessage *msg)
{
- struct GNUNET_RPS_CS_ActMaliciousMessage *in_msg;
+ struct ClientContext *cli_ctx = cls;
struct GNUNET_PeerIdentity *peers;
uint32_t num_mal_peers_sent;
uint32_t num_mal_peers_old;
- /* Check for protocol violation */
- if (sizeof (struct GNUNET_RPS_CS_ActMaliciousMessage) > ntohs (msg->size))
- {
- GNUNET_break_op (0);
- }
-
- in_msg = (struct GNUNET_RPS_CS_ActMaliciousMessage *) msg;
- if ((ntohs (msg->size) - sizeof (struct GNUNET_RPS_CS_ActMaliciousMessage)) /
- 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_CS_ActMaliciousMessage)) /
- sizeof (struct GNUNET_PeerIdentity));
- GNUNET_break_op (0);
- }
-
-
/* Do actual logic */
peers = (struct GNUNET_PeerIdentity *) &msg[1];
- mal_type = ntohl (in_msg->type);
+ mal_type = ntohl (msg->type);
+ if (NULL == mal_peer_set)
+ mal_peer_set = GNUNET_CONTAINER_multipeermap_create (1, GNUNET_NO);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Now acting malicious type %" PRIu32 "\n",
- mal_type);
+ "Now acting malicious type %" PRIu32 ", got %" PRIu32 " peers.\n",
+ mal_type,
+ ntohl (msg->num_peers));
if (1 == mal_type)
{ /* Try to maximise representation */
/* Add other malicious peers to those we already know */
- num_mal_peers_sent = ntohl (in_msg->num_peers);
+ num_mal_peers_sent = ntohl (msg->num_peers);
num_mal_peers_old = num_mal_peers;
GNUNET_array_grow (mal_peers,
num_mal_peers,
num_mal_peers + num_mal_peers_sent);
- memcpy (&mal_peers[num_mal_peers_old],
+ GNUNET_memcpy (&mal_peers[num_mal_peers_old],
peers,
num_mal_peers_sent * sizeof (struct GNUNET_PeerIdentity));
do_round_task = GNUNET_SCHEDULER_add_now (&do_mal_round, NULL);
}
- else if (2 == mal_type
- || 3 == mal_type)
+ else if ( (2 == mal_type) ||
+ (3 == mal_type) )
{ /* Try to partition the network */
/* Add other malicious peers to those we already know */
- num_mal_peers_sent = ntohl (in_msg->num_peers) - 1;
+
+ num_mal_peers_sent = ntohl (msg->num_peers) - 1;
num_mal_peers_old = num_mal_peers;
GNUNET_array_grow (mal_peers,
num_mal_peers,
num_mal_peers + num_mal_peers_sent);
- memcpy (&mal_peers[num_mal_peers_old],
- peers,
- num_mal_peers_sent * sizeof (struct GNUNET_PeerIdentity));
-
- /* Add all mal peers to mal_peer_set */
- add_peer_array_to_set (&mal_peers[num_mal_peers_old],
- num_mal_peers_sent,
- mal_peer_set);
+ if (NULL != mal_peers &&
+ 0 != num_mal_peers)
+ {
+ GNUNET_memcpy (&mal_peers[num_mal_peers_old],
+ peers,
+ num_mal_peers_sent * sizeof (struct GNUNET_PeerIdentity));
+
+ /* Add all mal peers to mal_peer_set */
+ add_peer_array_to_set (&mal_peers[num_mal_peers_old],
+ num_mal_peers_sent,
+ mal_peer_set);
+ }
/* Store the one attacked peer */
- memcpy (&attacked_peer,
- &in_msg->attacked_peer,
+ GNUNET_memcpy (&attacked_peer,
+ &msg->attacked_peer,
sizeof (struct GNUNET_PeerIdentity));
+ /* Set the flag of the attacked peer to valid to avoid problems */
+ if (GNUNET_NO == Peers_check_peer_known (&attacked_peer))
+ {
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+ }
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Attacked peer is %s\n",
else
{
GNUNET_break (0);
+ GNUNET_SERVICE_client_continue (cli_ctx->client);
}
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVICE_client_continue (cli_ctx->client);
}
* This is executed regylary.
*/
static void
-do_mal_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_mal_round (void *cls)
{
uint32_t num_pushes;
uint32_t i;
struct GNUNET_TIME_Relative time_next_round;
struct AttackedPeer *tmp_att_peer;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round maliciously.\n");
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to execute next round maliciously type %" PRIu32 ".\n",
+ mal_type);
+ do_round_task = NULL;
+ GNUNET_assert (mal_type <= 3);
/* Do malicious actions */
if (1 == mal_type)
{ /* Try to maximise representation */
* Send as many pushes to the attacked peer as possible
* That is one push per round as it will ignore more.
*/
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+ if (GNUNET_YES == Peers_check_peer_flag (&attacked_peer, Peers_ONLINE))
send_push (&attacked_peer);
}
if (3 == mal_type)
{ /* Combined attack */
+ /* Send PUSH to attacked peers */
+ if (GNUNET_YES == Peers_check_peer_known (&attacked_peer))
+ {
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+ if (GNUNET_YES == Peers_check_peer_flag (&attacked_peer, Peers_ONLINE))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Goding to send push to attacked peer (%s)\n",
+ GNUNET_i2s (&attacked_peer));
+ send_push (&attacked_peer);
+ }
+ }
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+
/* The maximum of pushes we're going to send this round */
num_pushes = GNUNET_MIN (GNUNET_MIN (push_limit - 1,
num_attacked_peers),
"Going to send %" PRIu32 " pushes\n",
num_pushes);
- /* Send PUSHes to attacked peers */
- send_push (&attacked_peer);
-
- for (i = 0 ; i < num_pushes ; i++)
+ for (i = 0; i < num_pushes; i++)
{
if (att_peers_tail == att_peer_index)
att_peer_index = att_peers_head;
}
/* Send PULLs to some peers to learn about additional peers to attack */
- for (i = 0 ; i < num_pushes * alpha ; i++)
+ tmp_att_peer = att_peer_index;
+ for (i = 0; i < num_pushes * alpha; i++)
{
if (att_peers_tail == tmp_att_peer)
tmp_att_peer = att_peers_head;
/* Schedule next round */
time_next_round = compute_rand_delay (round_interval, 2);
- //do_round_task = GNUNET_SCHEDULER_add_delayed (round_interval, &do_mal_round, NULL);
- do_round_task = GNUNET_SCHEDULER_add_delayed (time_next_round, &do_mal_round, NULL);
+ //do_round_task = GNUNET_SCHEDULER_add_delayed (round_interval, &do_mal_round,
+ //NULL);
+ GNUNET_assert (NULL == do_round_task);
+ do_round_task = GNUNET_SCHEDULER_add_delayed (time_next_round,
+ &do_mal_round, NULL);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished round\n");
}
#endif /* ENABLE_MALICIOUS */
/**
- * Send out PUSHes and PULLs, possibly update #gossip_list, samplers.
+ * Send out PUSHes and PULLs, possibly update #view, samplers.
*
* This is executed regylary.
*/
static void
-do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_round (void *cls)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round.\n");
-
uint32_t i;
+ const struct GNUNET_PeerIdentity *view_array;
unsigned int *permut;
- unsigned int n_peers; /* Number of peers we send pushes/pulls to */
+ unsigned int a_peers; /* Number of peers we send pushes to */
+ unsigned int b_peers; /* Number of peers we send pull requests to */
+ uint32_t first_border;
+ uint32_t second_border;
struct GNUNET_PeerIdentity peer;
- struct GNUNET_PeerIdentity *tmp_peer;
+ struct GNUNET_PeerIdentity *update_peer;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Printing gossip list:\n");
- for (i = 0 ; i < gossip_list_size ; i++)
+ "Going to execute next round.\n");
+ do_round_task = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Printing view:\n");
+ to_file (file_name_view_log,
+ "___ new round ___");
+ view_array = View_get_as_array ();
+ for (i = 0; i < View_size (); i++)
+ {
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "\t%s\n", GNUNET_i2s (&gossip_list[i]));
- // TODO log lists, ...
+ "\t%s\n", GNUNET_i2s (&view_array[i]));
+ to_file (file_name_view_log,
+ "=%s\t(do round)",
+ GNUNET_i2s_full (&view_array[i]));
+ }
- /* 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?
- * in essence get random peers with consumption */
- /* Send PUSHes */
- if (0 < gossip_list_size)
+ /* Send pushes and pull requests */
+ if (0 < View_size ())
{
permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
- (unsigned int) gossip_list_size);
- n_peers = ceil (alpha * gossip_list_size);
+ View_size ());
+
+ /* Send PUSHes */
+ a_peers = ceil (alpha * View_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++)
+ a_peers, alpha, View_size ());
+ for (i = 0; i < a_peers; i++)
{
- peer = gossip_list[permut[i]];
+ peer = view_array[permut[i]];
if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer)) // TODO
{ // FIXME if this fails schedule/loop this for later
send_push (&peer);
}
}
- GNUNET_free (permut);
- }
-
- /* Send PULL requests */
- //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)
+ /* Send PULL requests */
+ b_peers = ceil (beta * View_size ());
+ first_border = a_peers;
+ second_border = a_peers + b_peers;
+ if (second_border > View_size ())
{
- peer = *tmp_peer;
- GNUNET_free (tmp_peer);
-
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer))
- {
+ first_border = View_size () - b_peers;
+ second_border = View_size ();
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to send pulls to %u (ceil (%f * %u)) peers.\n",
+ b_peers, beta, View_size ());
+ for (i = first_border; i < second_border; i++)
+ {
+ peer = view_array[permut[i]];
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer) &&
+ GNUNET_NO == Peers_check_peer_flag (&peer, Peers_PULL_REPLY_PENDING)) // TODO
+ { // FIXME if this fails schedule/loop this for later
send_pull_request (&peer);
}
}
+
+ GNUNET_free (permut);
+ permut = NULL;
}
- /* Update gossip list */
+ /* Update view */
+ /* TODO see how many peers are in push-/pull- list! */
- 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");
+ if ((CustomPeerMap_size (push_map) <= alpha * View_size ()) &&
+ (0 < CustomPeerMap_size (push_map)) &&
+ (0 < CustomPeerMap_size (pull_map)))
+ { /* If conditions for update are fulfilled, update */
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Update of the view.\n");
- uint32_t first_border;
- uint32_t second_border;
- uint32_t r_index;
+ uint32_t final_size;
uint32_t peers_to_clean_size;
struct GNUNET_PeerIdentity *peers_to_clean;
peers_to_clean = NULL;
peers_to_clean_size = 0;
- GNUNET_array_grow (peers_to_clean, peers_to_clean_size, gossip_list_size);
- memcpy (peers_to_clean,
- gossip_list,
- gossip_list_size * sizeof (struct GNUNET_PeerIdentity));
-
- first_border = ceil (alpha * sampler_size_est_need);
- second_border = first_border + ceil (beta * sampler_size_est_need);
-
- GNUNET_array_grow (gossip_list, gossip_list_size, second_border);
-
- for (i = 0 ; i < first_border ; i++)
- {/* Update gossip list with peers received through PUSHes */
- r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
- push_list_size);
- gossip_list[i] = push_list[r_index];
+ GNUNET_array_grow (peers_to_clean, peers_to_clean_size, View_size ());
+ GNUNET_memcpy (peers_to_clean,
+ view_array,
+ View_size () * sizeof (struct GNUNET_PeerIdentity));
+
+ /* Seems like recreating is the easiest way of emptying the peermap */
+ View_clear ();
+ to_file (file_name_view_log,
+ "--- emptied ---");
+
+ first_border = GNUNET_MIN (ceil (alpha * sampler_size_est_need),
+ CustomPeerMap_size (push_map));
+ second_border = first_border +
+ GNUNET_MIN (floor (beta * sampler_size_est_need),
+ CustomPeerMap_size (pull_map));
+ final_size = second_border +
+ ceil ((1 - (alpha + beta)) * sampler_size_est_need);
+
+ /* Update view with peers received through PUSHes */
+ permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
+ CustomPeerMap_size (push_map));
+ for (i = 0; i < first_border; i++)
+ {
+ (void) insert_in_view (CustomPeerMap_get_peer_by_index (push_map,
+ permut[i]));
+ to_file (file_name_view_log,
+ "+%s\t(push list)",
+ GNUNET_i2s_full (&view_array[i]));
// TODO change the peer_flags accordingly
}
+ GNUNET_free (permut);
+ permut = NULL;
- 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,
- pull_list_size);
- gossip_list[i] = pull_list[r_index];
+ /* Update view with peers received through PULLs */
+ permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
+ CustomPeerMap_size (pull_map));
+ for (i = first_border; i < second_border; i++)
+ {
+ (void) insert_in_view (CustomPeerMap_get_peer_by_index (pull_map,
+ permut[i - first_border]));
+ to_file (file_name_view_log,
+ "+%s\t(pull list)",
+ GNUNET_i2s_full (&view_array[i]));
// TODO change the peer_flags accordingly
}
+ GNUNET_free (permut);
+ permut = NULL;
- for (i = second_border ; i < sampler_size_est_need ; i++)
- {/* Update gossip list with peers from history */
- RPS_sampler_get_n_rand_peers (prot_sampler,
- hist_update,
- NULL,
- 1);
- num_hist_update_tasks++;
- // TODO change the peer_flags accordingly
- }
+ /* Update view with peers from history */
+ RPS_sampler_get_n_rand_peers (prot_sampler,
+ hist_update,
+ NULL,
+ final_size - second_border);
+ // TODO change the peer_flags accordingly
- for (i = 0 ; i < gossip_list_size ; i++)
- rem_from_list (&peers_to_clean, &peers_to_clean_size, &gossip_list[i]);
+ for (i = 0; i < View_size (); i++)
+ rem_from_list (&peers_to_clean, &peers_to_clean_size, &view_array[i]);
- for (i = 0 ; i < peers_to_clean_size ; i++)
- peer_clean (&peers_to_clean[i]);
+ /* Clean peers that were removed from the view */
+ for (i = 0; i < peers_to_clean_size; i++)
+ {
+ to_file (file_name_view_log,
+ "-%s",
+ GNUNET_i2s_full (&peers_to_clean[i]));
+ clean_peer (&peers_to_clean[i]);
+ //peer_destroy_channel_send (sender);
+ }
- GNUNET_free (peers_to_clean);
+ GNUNET_array_grow (peers_to_clean, peers_to_clean_size, 0);
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list.\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the view.\n");
}
// TODO independent of that also get some peers from CADET_get_peers()?
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Received %u pushes and %u pulls last round (alpha (%.2f) * gossip_list_size (%u) = %.2f)\n",
- push_list_size,
- pull_list_size,
+ "Received %u pushes and %u pulls last round (alpha (%.2f) * view_size (%u) = %.2f)\n",
+ CustomPeerMap_size (push_map),
+ CustomPeerMap_size (pull_map),
alpha,
- gossip_list_size,
- alpha * gossip_list_size);
+ View_size (),
+ alpha * View_size ());
/* Update samplers */
- for ( i = 0 ; i < push_list_size ; i++ )
+ for (i = 0; i < CustomPeerMap_size (push_map); i++)
{
+ update_peer = CustomPeerMap_get_peer_by_index (push_map, i);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Updating with peer %s from push list\n",
- GNUNET_i2s (&push_list[i]));
- RPS_sampler_update (prot_sampler, &push_list[i]);
- RPS_sampler_update (client_sampler, &push_list[i]);
- // TODO set in_flag?
+ GNUNET_i2s (update_peer));
+ insert_in_sampler (NULL, update_peer);
+ clean_peer (update_peer); /* This cleans only if it is not in the view */
+ //peer_destroy_channel_send (sender);
}
- for ( i = 0 ; i < pull_list_size ; i++ )
+ for (i = 0; i < CustomPeerMap_size (pull_map); i++)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Updating with peer %s from pull list\n",
- GNUNET_i2s (&pull_list[i]));
- RPS_sampler_update (prot_sampler, &pull_list[i]);
- RPS_sampler_update (client_sampler, &pull_list[i]);
- // TODO set in_flag?
+ GNUNET_i2s (CustomPeerMap_get_peer_by_index (pull_map, i)));
+ insert_in_sampler (NULL, CustomPeerMap_get_peer_by_index (pull_map, i));
+ /* This cleans only if it is not in the view */
+ clean_peer (CustomPeerMap_get_peer_by_index (pull_map, i));
+ //peer_destroy_channel_send (sender);
}
/* Empty push/pull lists */
- GNUNET_array_grow (push_list, push_list_size, 0);
- GNUNET_array_grow (pull_list, pull_list_size, 0);
+ CustomPeerMap_clear (push_map);
+ CustomPeerMap_clear (pull_map);
struct GNUNET_TIME_Relative time_next_round;
time_next_round = compute_rand_delay (round_interval, 2);
/* Schedule next round */
- //do_round_task = GNUNET_SCHEDULER_add_delayed (round_interval, &do_round, NULL);
- do_round_task = GNUNET_SCHEDULER_add_delayed (time_next_round, &do_round, NULL);
+ do_round_task = GNUNET_SCHEDULER_add_delayed (time_next_round,
+ &do_round, NULL);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished round\n");
}
-static void
-rps_start (struct GNUNET_SERVER_Handle *server);
-
-
/**
* This is called from GNUNET_CADET_get_peers().
*
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got peer_id %s from cadet\n",
GNUNET_i2s (peer));
- new_peer_id (peer);
+ got_peer (peer);
}
}
-
/**
- * Clean the send channel of a peer
+ * @brief Iterator function over stored, valid peers.
+ *
+ * We initialise the sampler with those.
+ *
+ * @param cls the closure
+ * @param peer the peer id
+ * @return #GNUNET_YES if we should continue to
+ * iterate,
+ * #GNUNET_NO if not.
*/
-void
-peer_clean (const struct GNUNET_PeerIdentity *peer)
+static int
+valid_peers_iterator (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct PeerContext *peer_ctx;
- struct GNUNET_CADET_Channel *channel;
-
- if (GNUNET_YES != in_arr (gossip_list, gossip_list_size, peer)
- && GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
+ if (NULL != peer)
{
- peer_ctx = get_peer_ctx (peer_map, peer);
- if (NULL != peer_ctx->send_channel)
- {
- channel = peer_ctx->send_channel;
- peer_ctx->send_channel = NULL;
- GNUNET_CADET_channel_destroy (channel);
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got stored, valid peer %s\n",
+ GNUNET_i2s (peer));
+ got_peer (peer);
}
+ return GNUNET_YES;
}
/**
- * Callback used to remove peers from the multipeermap.
+ * Iterator over peers from peerinfo.
+ *
+ * @param cls closure
+ * @param peer id of the peer, NULL for last call
+ * @param hello hello message for the peer (can be NULL)
+ * @param error message
*/
- int
-peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+void
+process_peerinfo_peers (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
+ const char *err_msg)
{
- struct PeerContext *peer_ctx;
- const struct GNUNET_CADET_Channel *channel =
- (const struct GNUNET_CADET_Channel *) cls;
- struct GNUNET_CADET_Channel *recv;
- struct GNUNET_CADET_Channel *send;
-
- peer_ctx = (struct PeerContext *) value;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Going to clean peer %s\n",
- GNUNET_i2s (&peer_ctx->peer_id));
-
- /* If operations are still scheduled for this peer cancel those */
- if (0 != peer_ctx->num_outstanding_ops)
- GNUNET_array_grow (peer_ctx->outstanding_ops,
- peer_ctx->num_outstanding_ops,
- 0);
-
- /* If we are still waiting for notification whether this peer is live
- * cancel the according task */
- if (NULL != peer_ctx->is_live_task)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to cancle is_live_task for peer %s\n",
- GNUNET_i2s (key));
- GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task);
- peer_ctx->is_live_task = NULL;
- }
-
-
- recv = peer_ctx->recv_channel;
- peer_ctx->recv_channel = NULL;
- if (NULL != recv
- && channel != recv)
- {
- GNUNET_CADET_channel_destroy (recv);
- }
-
- /* If there is still a mq destroy it */
- if (NULL != peer_ctx->mq)
- {
- GNUNET_MQ_destroy (peer_ctx->mq);
- peer_ctx->mq = NULL;
- }
-
- /* Remove the send_channel
- * The peer map entry should be removed
- * from the callback #cleanup_channel */
- send = peer_ctx->send_channel;
- peer_ctx->send_channel = NULL;
- if (NULL != send
- && channel != send)
+ if (NULL != peer)
{
- GNUNET_CADET_channel_destroy (send);
- }
- else
- { /* If there is no channel we have to remove it now */
- if (GNUNET_YES != 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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got peer_id %s from peerinfo\n",
+ GNUNET_i2s (peer));
+ got_peer (peer);
}
-
- return GNUNET_YES;
}
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
+ struct ClientContext *client_ctx;
+ struct ReplyCls *reply_cls;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "RPS is going down\n");
- LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n");
+ /* Clean all clients */
+ for (client_ctx = cli_ctx_head;
+ NULL != cli_ctx_head;
+ client_ctx = cli_ctx_head)
+ {
+ /* Clean pending requests to the sampler */
+ for (reply_cls = client_ctx->rep_cls_head;
+ NULL != client_ctx->rep_cls_head;
+ reply_cls = client_ctx->rep_cls_head)
+ {
+ RPS_sampler_request_cancel (reply_cls->req_handle);
+ GNUNET_CONTAINER_DLL_remove (client_ctx->rep_cls_head,
+ client_ctx->rep_cls_tail,
+ reply_cls);
+ GNUNET_free (reply_cls);
+ }
+ GNUNET_MQ_destroy (client_ctx->mq);
+ GNUNET_CONTAINER_DLL_remove (cli_ctx_head, cli_ctx_tail, client_ctx);
+ GNUNET_free (client_ctx);
+ }
+ GNUNET_PEERINFO_notify_cancel (peerinfo_notify_handle);
+ GNUNET_PEERINFO_disconnect (peerinfo_handle);
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");
- }
+ Peers_terminate ();
GNUNET_NSE_disconnect (nse);
RPS_sampler_destroy (prot_sampler);
RPS_sampler_destroy (client_sampler);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Size of the peermap: %u\n",
- GNUNET_CONTAINER_multipeermap_size (peer_map));
- GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (peer_map));
- GNUNET_CONTAINER_multipeermap_destroy (peer_map);
GNUNET_CADET_disconnect (cadet_handle);
- 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);
+ View_destroy ();
+ CustomPeerMap_destroy (push_map);
+ CustomPeerMap_destroy (pull_map);
#ifdef ENABLE_MALICIOUS
struct AttackedPeer *tmp_att_peer;
+ GNUNET_free (file_name_view_log);
GNUNET_array_grow (mal_peers, num_mal_peers, 0);
if (NULL != mal_peer_set)
GNUNET_CONTAINER_multipeermap_destroy (mal_peer_set);
/**
- * A client disconnected. Remove all of its data structure entries.
+ * Handle client connecting to the service.
*
- * @param cls closure, NULL
- * @param client identification of the client
- */
-static void
-handle_client_disconnect (void *cls,
- struct GNUNET_SERVER_Client * client)
-{
-}
-
-
-/**
- * Handle the channel a peer opens to us.
- *
- * @param cls The closure
- * @param channel The channel the peer wants to establish
- * @param initiator The peer's peer ID
- * @param port The port the channel is being established over
- * @param options Further options
- */
- static void *
-handle_inbound_channel (void *cls,
- struct GNUNET_CADET_Channel *channel,
- const struct GNUNET_PeerIdentity *initiator,
- uint32_t port,
- enum GNUNET_CADET_ChannelOption options)
+ * @param cls NULL
+ * @param client the new client
+ * @param mq the message queue of @a client
+ * @return @a client
+ */
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ struct GNUNET_MQ_Handle *mq)
{
- struct PeerContext *peer_ctx;
- struct GNUNET_PeerIdentity peer;
+ struct ClientContext *cli_ctx;
- peer = *initiator;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "New channel was established to us (Peer %s).\n",
- GNUNET_i2s (&peer));
-
- GNUNET_assert (NULL != channel);
-
- // we might not even store the recv_channel
-
- peer_ctx = get_peer_ctx (peer_map, &peer);
- // FIXME what do we do if a channel is established twice?
- // overwrite? Clean old channel? ...?
- //if (NULL != peer_ctx->recv_channel)
- //{
- // peer_ctx->recv_channel = channel;
- //}
- peer_ctx->recv_channel = channel;
-
- (void) GNUNET_CONTAINER_multipeermap_put (peer_map, &peer, peer_ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-
- peer_is_live (peer_ctx);
-
- return NULL; // TODO
+ "Client connected\n");
+ if (NULL == client)
+ return client; /* Server was destroyed before a client connected. Shutting down */
+ cli_ctx = GNUNET_new (struct ClientContext);
+ cli_ctx->mq = GNUNET_SERVICE_client_get_mq (client);
+ cli_ctx->client = client;
+ GNUNET_CONTAINER_DLL_insert (cli_ctx_head,
+ cli_ctx_tail,
+ cli_ctx);
+ return cli_ctx;
}
-
/**
- * This is called when a remote peer destroys a channel.
+ * Callback called when a client disconnected from the service
*
- * @param cls The closure
- * @param channel The channel being closed
- * @param channel_ctx The context associated with this channel
- */
- static void
-cleanup_channel (void *cls,
- const struct GNUNET_CADET_Channel *channel,
- void *channel_ctx)
-{
- 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
-
- //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;
-
- if (channel == peer_ctx->send_channel)
- { /* Peer went down or we killd the channel */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "send channel (%s) was destroyed - cleaning up\n",
- GNUNET_i2s (peer));
- rem_from_list (&gossip_list, &gossip_list_size, peer);
- rem_from_list (&pending_pull_reply_list, &pending_pull_reply_list_size, peer);
-
- peer_ctx->send_channel = NULL;
- /* 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);
-
- //if (GNUNET_YES != 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);
- }
- else if (channel == peer_ctx->recv_channel)
- { /* Other peer doesn't want to send us messages anymore */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %s destroyed recv channel - cleaning up channel\n",
- GNUNET_i2s (peer));
- peer_ctx->recv_channel = NULL;
- }
- //}
-}
-
-
-/**
- * Actually start the service.
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls should be equal to @a c
*/
- static void
-rps_start (struct GNUNET_SERVER_Handle *server)
+static void
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *internal_cls)
{
- static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&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},
- #ifdef ENABLE_MALICIOUS
- {&handle_client_act_malicious, NULL, GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS , 0},
- #endif /* ENABLE_MALICIOUS */
- {NULL, NULL, 0, 0}
- };
-
- GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SERVER_disconnect_notify (server,
- &handle_client_disconnect,
- NULL);
- LOG (GNUNET_ERROR_TYPE_INFO, "Ready to receive requests from clients\n");
-
+ struct ClientContext *cli_ctx = internal_cls;
- 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,
- NULL);
+ GNUNET_assert (client == cli_ctx->client);
+ if (NULL == client)
+ {/* shutdown task - destroy all clients */
+ while (NULL != cli_ctx_head)
+ destroy_cli_ctx (cli_ctx_head);
+ }
+ else
+ { /* destroy this client */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Client disconnected. Destroy its context.\n");
+ destroy_cli_ctx (cli_ctx);
+ }
}
/**
- * Process statistics requests.
+ * Handle random peer sampling clients.
*
* @param cls closure
- * @param server the initialized server
* @param c configuration to use
+ * @param service the initialized service
*/
- static void
+static void
run (void *cls,
- struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_SERVICE_Handle *service)
{
- // TODO check what this does -- copied from gnunet-boss
- // - seems to work as expected
+ static const struct GNUNET_CADET_MessageHandler cadet_handlers[] = {
+ {&handle_peer_check , GNUNET_MESSAGE_TYPE_RPS_PP_CHECK_LIVE,
+ sizeof (struct GNUNET_MessageHeader)},
+ {&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}
+ };
+
+ int size;
+ int out_size;
+ char* fn_valid_peers;
+ struct GNUNET_HashCode port;
+
GNUNET_log_setup ("rps", GNUNET_error_type_to_string (GNUNET_ERROR_TYPE_DEBUG), NULL);
cfg = c;
"ROUNDINTERVAL",
&round_interval))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to read ROUNDINTERVAL from config\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "RPS", "ROUNDINTERVAL");
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_est_need))
+ /* Get initial size of sampler/view from the configuration */
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (cfg, "RPS", "INITSIZE",
+ (long long unsigned int *) &sampler_size_est_need))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to read INITSIZE from config\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "RPS", "INITSIZE");
GNUNET_SCHEDULER_shutdown ();
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %" PRIu64 "\n", sampler_size_est_need);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %u\n", sampler_size_est_need);
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "rps",
+ "FILENAME_VALID_PEERS",
+ &fn_valid_peers))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "rps", "FILENAME_VALID_PEERS");
+ }
- gossip_list = NULL;
+ View_create (4);
+
+ /* file_name_view_log */
+ if (GNUNET_OK != GNUNET_DISK_directory_create ("/tmp/rps/"))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create directory /tmp/rps/\n");
+ }
+
+ size = (14 + strlen (GNUNET_i2s_full (&own_identity)) + 1) * sizeof (char);
+ file_name_view_log = GNUNET_malloc (size);
+ out_size = GNUNET_snprintf (file_name_view_log,
+ size,
+ "/tmp/rps/view-%s",
+ GNUNET_i2s_full (&own_identity));
+ if (size < out_size ||
+ 0 > out_size)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to write string to buffer (size: %i, out_size: %i)\n",
+ size,
+ out_size);
+ }
/* connect to NSE */
alpha = 0.45;
beta = 0.45;
- 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);
+ &cleanup_destroyed_channel,
+ cadet_handlers);
+ GNUNET_assert (NULL != cadet_handle);
+ GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_RPS,
+ strlen (GNUNET_APPLICATION_PORT_RPS),
+ &port);
+ GNUNET_CADET_open_port (cadet_handle,
+ &port,
+ &Peers_handle_inbound_channel, cls);
+ peerinfo_handle = GNUNET_PEERINFO_connect (cfg);
+ Peers_initialise (fn_valid_peers, cadet_handle, &own_identity);
+ GNUNET_free (fn_valid_peers);
+
/* Initialise sampler */
struct GNUNET_TIME_Relative half_round_interval;
struct GNUNET_TIME_Relative max_round_interval;
- half_round_interval = GNUNET_TIME_relative_multiply (round_interval, .5);
+ half_round_interval = GNUNET_TIME_relative_divide (round_interval, 2);
max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval);
prot_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval);
client_sampler = RPS_sampler_mod_init (sampler_size_est_need, max_round_interval);
/* 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;
+ push_map = CustomPeerMap_create (4);
+ pull_map = CustomPeerMap_create (4);
- num_hist_update_tasks = 0;
+ //LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n");
+ //GNUNET_CADET_get_peers (cadet_handle, &init_peer_cb, NULL);
+ // TODO send push/pull to each of those peers?
+ // TODO read stored valid peers from last run
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting stored valid peers\n");
+ Peers_get_valid_peers (valid_peers_iterator, NULL);
+ peerinfo_notify_handle = GNUNET_PEERINFO_notify (cfg,
+ GNUNET_NO,
+ process_peerinfo_peers,
+ NULL);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n");
- GNUNET_CADET_get_peers (cadet_handle, &init_peer_cb, NULL);
- // TODO send push/pull to each of those peers?
+ LOG (GNUNET_ERROR_TYPE_INFO, "Ready to receive requests from clients\n");
+ do_round_task = GNUNET_SCHEDULER_add_now (&do_round, NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
- rps_start (server);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
}
/**
- * The main function for the rps service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
- int
-main (int argc, char *const *argv)
-{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc,
- argv,
- "rps",
- GNUNET_SERVICE_OPTION_NONE,
- &run, NULL)) ? 0 : 1;
-}
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("rps",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (client_request,
+ GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST,
+ struct GNUNET_RPS_CS_RequestMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (client_request_cancel,
+ GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST_CANCEL,
+ struct GNUNET_RPS_CS_RequestCancelMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_seed,
+ GNUNET_MESSAGE_TYPE_RPS_CS_SEED,
+ struct GNUNET_RPS_CS_SeedMessage,
+ NULL),
+#ifdef ENABLE_MALICIOUS
+ GNUNET_MQ_hd_var_size (client_act_malicious,
+ GNUNET_MESSAGE_TYPE_RPS_ACT_MALICIOUS,
+ struct GNUNET_RPS_CS_ActMaliciousMessage,
+ NULL),
+#endif /* ENABLE_MALICIOUS */
+ GNUNET_MQ_handler_end());
/* end of gnunet-service-rps.c */
projects / oweals / gnunet.git / blobdiff