/*
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
#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 ClientContext *cli_ctx_head;
struct ClientContext *cli_ctx_tail;
-/**
- * Used to keep track in what lists single peerIDs are.
- */
-enum PeerFlags
-{
- /**
- * If we are waiting for a reply from that peer (sent a pull request).
- */
- 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.
- */
- VALID = 0x10,
-
- /**
- * We set this bit when we are going to destroy the channel to this peer.
- * When cleanup_channel is called, we know that we wanted to destroy it.
- * Otherwise the channel to the other peer was destroyed.
- */
- TO_DESTROY = 0x20,
-};
-
-
-/**
- * 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;
-};
-
-
-/**
- * List containing all messages that are yet to be send
- */
-struct PendingMessage
-{
- /**
- * DLL next, prev
- */
- struct PendingMessage *next;
- struct PendingMessage *prev;
-
- /**
- * The envelope to the corresponding message
- */
- struct GNUNET_MQ_Envelope *ev;
-
- /**
- * The corresponding context
- */
- struct PeerContext *peer_ctx;
-
- /**
- * The message type
- */
- const char *type;
-};
-
-
-/**
- * Struct used to keep track of other peer's status
- *
- * This is stored in a multipeermap.
- */
-struct PeerContext
-{
- /**
- * Message queue open to 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;
-
- /**
- * Handle to the callback given to cadet_ntfy_tmt_rdy()
- *
- * To be canceled on shutdown.
- */
- struct GNUNET_CADET_TransmitHandle *transmit_handle;
-
- /**
- * Number of outstanding operations.
- */
- unsigned int num_outstanding_ops;
-
- /**
- * Identity of the peer
- */
- struct GNUNET_PeerIdentity peer_id;
-
- /**
- * Flags indicating status of peer
- */
- uint32_t peer_flags;
-
- /**
- * DLL with all messages that are yet to be sent
- */
- struct PendingMessage *pending_messages_head;
- struct PendingMessage *pending_messages_tail;
-
- /**
- * This is pobably followed by 'statistical' data (when we first saw
- * him, how did we get his ID, how many pushes (in a timeinterval),
- * ...)
- */
-};
-
/***********************************************************************
- * /Housekeeping with peers
+ * /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;
-
-
/**
* Name to log view to
*/
static char *file_name_view_log;
/**
- * The "local view" containing peers we learned from gossip and history
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *view;
-
-/**
- * An array containing the peers of the local view.
- *
- * This is created every time we send a pull reply if it has changed since the
- * last pull reply we sent.
- */
-static struct GNUNET_PeerIdentity *view_array;
-
-
-/**
- * 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;
*/
static unsigned int sampler_size_est_need;
-
/**
* Percentage of total peer number in the view
* to send random PUSHes 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.
/**
* Handle for cancellation of iteration over peers.
*/
-struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify_handle;
-
+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;
-
-
-/**
- * Number of history update tasks.
- */
-uint32_t num_hist_update_tasks;
+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
/**
* 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)
*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 view
- */
- 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 view
- */
- 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 (const struct GNUNET_PeerIdentity *peer)
-{
- struct PeerContext *ctx;
- int ret;
-
- ret = GNUNET_CONTAINER_multipeermap_contains (peer_map, peer);
- GNUNET_assert (GNUNET_YES == ret);
- ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
- GNUNET_assert (NULL != ctx);
- return ctx;
-}
-
-/**
- * Create a new peer context and insert it into the peer map
- */
-struct PeerContext *
-create_peer_ctx (const struct GNUNET_PeerIdentity *peer)
-{
- struct PeerContext *ctx;
- int ret;
-
- ctx = GNUNET_new (struct PeerContext);
- ctx->peer_id = *peer;
- ret = GNUNET_CONTAINER_multipeermap_put (peer_map, peer, ctx,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- GNUNET_assert (GNUNET_OK == ret);
- return ctx;
-}
-
-
-/**
- * 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 transmit_handle if still scheduled */
- if (NULL != peer_ctx->transmit_handle)
- {
- GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->transmit_handle);
- peer_ctx->transmit_handle = 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->transmit_handle = NULL;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Set ->transmit_handle = 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->transmit_handle)
- //{
- // LOG (GNUNET_ERROR_TYPE_DEBUG,
- // "Trying to cancle transmit_handle for peer %s\n",
- // GNUNET_i2s (&peer_ctx->peer_id));
- // GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->transmit_handle);
- // peer_ctx->transmit_handle = NULL;
- //}
-
- return 0;
-}
-
-
-/**
- * Get the channel of a peer. If not existing, create.
- */
- struct GNUNET_CADET_Channel *
-get_channel (const struct GNUNET_PeerIdentity *peer)
-{
- struct PeerContext *peer_ctx;
-
- peer_ctx = get_peer_ctx (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);
-
- }
- 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 (const struct GNUNET_PeerIdentity *peer_id)
-{
- struct PeerContext *peer_ctx;
-
- peer_ctx = get_peer_ctx (peer_id);
-
- GNUNET_assert (NULL == peer_ctx->transmit_handle);
-
- if (NULL == peer_ctx->mq)
- {
- (void) get_channel (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)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Get informed about peer %s getting live\n",
- GNUNET_i2s (&peer_ctx->peer_id));
-
- if (NULL == peer_ctx->transmit_handle &&
- NULL == peer_ctx->send_channel)
- {
- (void) get_channel (&peer_ctx->peer_id);
- peer_ctx->transmit_handle =
- 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 if (NULL != peer_ctx->transmit_handle)
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Already waiting for notification\n");
- else if (NULL != peer_ctx->send_channel)
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Already have established channel to peer\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)
+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);
+ return GNUNET_TIME_relative_divide (T_relative_sum (rel_array,
+ arr_size),
+ arr_size);
}
/**
- * Insert PeerID in #pull_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_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;
-}
-
+static void
+insert_in_view_op (void *cls,
+ const struct GNUNET_PeerIdentity *peer);
/**
* 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
*/
- void
-insert_in_view (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (view, peer))
- return;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Going to put %s into view\n",
- GNUNET_i2s (peer));
- if (GNUNET_YES != GNUNET_CONTAINER_multipeermap_put (view,
- peer,
- NULL,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Failed to put peer into view. (insert_in_view)\n");
- }
- if (NULL != view_array)
- {
- GNUNET_free (view_array);
- view_array = NULL;
- }
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
- create_peer_ctx (peer);
- (void) get_channel (peer);
-}
-
-/**
- * Check whether #insert_in_view was already scheduled
- */
- int
-insert_in_view_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_view == 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);
- if (0 < RPS_sampler_count_id (prot_sampler, peer))
+ online = Peers_check_peer_flag (peer, Peers_ONLINE);
+ if ( (GNUNET_NO == online) ||
+ (GNUNET_SYSERR == online) ) /* peer is not even known */
{
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer))
- (void) create_peer_ctx (peer);
- (void) get_channel (peer);
+ (void) Peers_issue_peer_liveliness_check (peer);
+ (void) Peers_schedule_operation (peer, insert_in_view_op);
+ return GNUNET_NO;
}
-}
-
-
-/**
- * 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;
+ /* Open channel towards peer to keep connection open */
+ Peers_indicate_sending_intention (peer);
+ return View_put (peer);
}
/**
* Put random peer from sampler into the view as history update.
*/
- void
-hist_update (void *cls, struct GNUNET_PeerIdentity *ids, uint32_t num_peers)
+static void
+hist_update (void *cls,
+ struct GNUNET_PeerIdentity *ids,
+ uint32_t num_peers)
{
unsigned int i;
- for (i = 0; i < GNUNET_MIN (
- sampler_size_est_need - GNUNET_CONTAINER_multipeermap_size (view),
- num_peers); i++)
+ for (i = 0; i < num_peers; i++)
{
- insert_in_view (NULL, &ids[i]);
+ (void) insert_in_view (&ids[i]);
to_file (file_name_view_log,
"+%s\t(hist)",
GNUNET_i2s_full (ids));
}
- if (0 < num_hist_update_tasks)
- num_hist_update_tasks--;
}
-
/**
* Wrapper around #RPS_sampler_resize()
*
*
* Called every time we receive a request from the client.
*/
- void
+static void
est_request_rate()
{
struct GNUNET_TIME_Relative max_round_duration;
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 =
}
-/**
- * @brief Add an envelope to a message passed to mq to list of pending messages
- *
- * @param peer peer the message was sent to
- * @param ev envelope to the message
- * @param type type of the message to be sent
- */
-static struct PendingMessage *
-insert_pending_message (const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_MQ_Envelope *ev,
- const char *type)
-{
- struct PendingMessage *pending_msg;
- struct PeerContext *peer_ctx;
-
- peer_ctx = get_peer_ctx (peer);
- pending_msg = GNUNET_new (struct PendingMessage);
- pending_msg->ev = ev;
- pending_msg->peer_ctx = peer_ctx;
- pending_msg->type = type;
- GNUNET_CONTAINER_DLL_insert (peer_ctx->pending_messages_head,
- peer_ctx->pending_messages_tail,
- pending_msg);
- return pending_msg;
-}
-
-static void
-remove_pending_message (struct PendingMessage *pending_msg)
-{
- struct PeerContext *peer_ctx;
-
- peer_ctx = pending_msg->peer_ctx;
- GNUNET_CONTAINER_DLL_remove (peer_ctx->pending_messages_head,
- peer_ctx->pending_messages_tail,
- pending_msg);
- GNUNET_free (pending_msg);
-}
-
-
-/**
- * @brief This is called once a message is sent.
- *
- * @param cls type of the message that was sent
- */
-static void
-mq_notify_sent_cb (void *cls)
-{
- struct PendingMessage *pending_msg = (struct PendingMessage *) cls;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "%s was sent.\n",
- pending_msg->type);
- remove_pending_message (pending_msg);
-}
-
-
/**
* Send a PULL REPLY to @a peer_id
*
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;
- struct PendingMessage *pending_msg;
/* Compute actual size */
send_size = sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) +
"Going to send PULL REPLY with %u peers to %s\n",
send_size, GNUNET_i2s (peer_id));
- mq = get_mq (peer_id);
-
ev = GNUNET_MQ_msg_extra (out_msg,
send_size * sizeof (struct GNUNET_PeerIdentity),
GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY);
memcpy (&out_msg[1], peer_ids,
send_size * sizeof (struct GNUNET_PeerIdentity));
- pending_msg = insert_pending_message (peer_id, ev, "PULL REPLY");
- GNUNET_MQ_notify_sent (ev,
- mq_notify_sent_cb,
- pending_msg);
- GNUNET_MQ_send (mq, ev);
+ Peers_send_message (peer_id, ev, "PULL REPLY");
+}
+
+
+/**
+ * Insert PeerID in #pull_map
+ *
+ * Called once we know a peer is live.
+ */
+static void
+insert_in_pull_map (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ CustomPeerMap_put (pull_map, peer);
+}
+
+
+/**
+ * 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);
+}
+
+
+/**
+ * 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 If @a peer was unknown, check liveliness and insert it in view and
+ * sampler
+ *
+ * @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;
+ }
+ 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)
+{
+ 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);
+}
+
+
+/**
+ * @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))
+ {
+ #ifdef ENABLE_MALICIOUS
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer))
+ Peers_destroy_sending_channel (peer);
+ #else /* ENABLE_MALICIOUS */
+ 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)) )
+ { /* We can safely remov this peer */
+ remove_peer (peer);
+ return;
+ }
+ Peers_clean_peer (peer);
}
-
/**
- * This function is called on new peer_ids from 'external' sources
- * (client seed, cadet get_peers(), ...)
+ * @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
*
- * @param peer_id the new peer_id
+ * @param cls The closure
+ * @param channel The channel being closed
+ * @param channel_ctx The context associated with this channel
*/
static void
-new_peer_id (const struct GNUNET_PeerIdentity *peer_id)
+cleanup_destroyed_channel (void *cls,
+ const struct GNUNET_CADET_Channel *channel,
+ void *channel_ctx)
{
- struct PeerOutstandingOp out_op;
- struct PeerContext *peer_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 ((NULL == peer_id) ||
- (0 == GNUNET_CRYPTO_cmp_peer_identity (&own_identity, peer_id)))
+ 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;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Got peer_id %s (at %p, view size: %u)\n",
- GNUNET_i2s (peer_id),
- peer_id,
- GNUNET_CONTAINER_multipeermap_size (view));
-
- /* if the seed peer is already know, skip context creation */
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer_id))
- peer_ctx = create_peer_ctx (peer_id);
- else
- peer_ctx = get_peer_ctx (peer_id);
+ }
- if (GNUNET_NO == 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);
- }
+ 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_NO == insert_in_view_scheduled (peer_ctx))
- {
- out_op.op = insert_in_view;
- out_op.op_cls = NULL;
- GNUNET_array_append (peer_ctx->outstanding_ops,
- peer_ctx->num_outstanding_ops,
- out_op);
+ 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;
}
-
- /* Trigger livelyness test on peer */
- check_peer_live (peer_ctx);
}
- // else...?
-
- // send push/pull to each of those peers?
+ 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
***********************************************************************/
GNUNET_free (rep_cls);
}
+
static void
destroy_cli_ctx (struct ClientContext *cli_ctx)
{
GNUNET_assert (NULL != cli_ctx);
+ if (NULL != cli_ctx->mq)
+ {
+ GNUNET_MQ_destroy (cli_ctx->mq);
+ }
if (NULL != cli_ctx->rep_cls_head)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
* 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)
{
uint32_t i;
struct GNUNET_MQ_Envelope *ev;
for (i = 0; i < num_peers; i++)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- " %lu: %s\n",
+ " %" PRIu32 ": %s\n",
i,
GNUNET_i2s (&peer_ids[i]));
}
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 %lu\n",
+ "Client cancels request with id %" PRIu32 "\n",
ntohl (msg->id));
while ( (NULL != rep_cls->next) &&
(rep_cls->id != ntohl (msg->id)) )
* @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)
"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]);
+ got_peer (&peers[i]);
//RPS_sampler_update (prot_sampler, &peers[i]);
//RPS_sampler_update (client_sampler, &peers[i]);
////GNUNET_free (peers);
GNUNET_SERVER_receive_done (client,
- GNUNET_OK);
+ GNUNET_OK);
}
*/
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, "Received PUSH (%s)\n", GNUNET_i2s (peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received PUSH (%s)\n",
+ GNUNET_i2s (peer));
- #ifdef ENABLE_MALICIOUS
+#ifdef ENABLE_MALICIOUS
struct AttackedPeer *tmp_att_peer;
tmp_att_peer = GNUNET_new (struct AttackedPeer);
#endif /* ENABLE_MALICIOUS */
- /* Add the sending peer to the push_list */
- if (GNUNET_NO == in_arr (push_list, push_list_size, peer))
- {
- GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, 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;
}
-/**
- * Iterator over hash map entries.
- * Called from #generate_view_array and writes every peer id into #view_array.
- *
- * @param cls closure - the pointer to the counter
- * @param key current public key
- * @param value value in the hash map
- * @return #GNUNET_YES if we should continue to
- * iterate,
- * #GNUNET_NO if not.
- */
-static int
-dump_id_to_view_array (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- unsigned int *i = (unsigned int *) cls;
-
- view_array[(*i)++] = *key;
- return GNUNET_YES;
-}
-
-
-/**
- * Makes sure the view_array is filled with the peer ids currently in #view.
- * Called from within #do_round before sending pushes and pulls and from
- * #handle_peer_pull_request when a reply is sent.
- */
-static void
-generate_view_array (unsigned int view_size)
-{
- unsigned int *i;
- int ret;
-
- if (NULL == view_array)
- {
- view_array = GNUNET_new_array (view_size,
- struct GNUNET_PeerIdentity);
- i = GNUNET_new (unsigned int);
- *i = 0;
-
- ret = GNUNET_CONTAINER_multipeermap_iterate (view,
- dump_id_to_view_array,
- i);
- GNUNET_assert (view_size == ret);
- GNUNET_assert (view_size == *i);
-
- GNUNET_free (i);
- }
-}
-
-
/**
* Handle PULL REQUEST request message from another peer.
*
*/
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;
- unsigned int view_size;
+ const struct GNUNET_PeerIdentity *view_array;
peer = (struct GNUNET_PeerIdentity *)
GNUNET_CADET_channel_get_info (channel,
}
#endif /* ENABLE_MALICIOUS */
- view_size = GNUNET_CONTAINER_multipeermap_size (view);
- generate_view_array (view_size);
+ view_array = View_get_as_array ();
- send_pull_reply (peer, view_array, view_size);
+ 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;
sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- "message says it sends %" PRIu32 " 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));
// FIXME wait for cadet to change this function
sender = (struct GNUNET_PeerIdentity *)
GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER);
- sender_ctx = get_peer_ctx (sender);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Received PULL REPLY (%s)\n", GNUNET_i2s (sender));
- if (GNUNET_YES != get_peer_flag (sender_ctx, PULL_REPLY_PENDING))
+ 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");
if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity,
&peers[i]))
{
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map,
- &peers[i]))
- peer_ctx = create_peer_ctx (&peers[i]);
- else
- peer_ctx = get_peer_ctx (&peers[i]);
+ /* Make sure we 'know' about this peer */
+ (void) Peers_insert_peer (&peers[i]);
- if (GNUNET_YES == get_peer_flag (peer_ctx, VALID))
+ if (GNUNET_YES == Peers_check_peer_valid (&peers[i]))
{
- if (GNUNET_NO == in_arr (pull_list, pull_list_size, &peers[i]))
- GNUNET_array_append (pull_list, pull_list_size, peers[i]);
+ CustomPeerMap_put (pull_map, &peers[i]);
}
- else if (GNUNET_NO == insert_in_pull_list_scheduled (peer_ctx))
+ else
{
- 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);
+ 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);
-
- peer_clean (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;
* @param peer_id the peer to send the pull request to.
*/
static void
-send_pull_request (const struct GNUNET_PeerIdentity *peer_id)
+send_pull_request (const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_MQ_Handle *mq;
- struct PeerContext *peer_ctx;
- struct PendingMessage *pending_msg;
- peer_ctx = get_peer_ctx (peer_id);
- GNUNET_assert (GNUNET_NO == get_peer_flag (peer_ctx, PULL_REPLY_PENDING));
- set_peer_flag (peer_ctx, PULL_REPLY_PENDING);
+ GNUNET_assert (GNUNET_NO == Peers_check_peer_flag (peer,
+ Peers_PULL_REPLY_PENDING));
+ Peers_set_peer_flag (peer, Peers_PULL_REPLY_PENDING);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Going to send PULL REQUEST to peer %s.\n",
- GNUNET_i2s (peer_id));
+ GNUNET_i2s (peer));
ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST);
- mq = get_mq (peer_id);
- pending_msg = insert_pending_message (peer_id, ev, "PULL REQUEST");
- GNUNET_MQ_notify_sent (ev,
- mq_notify_sent_cb,
- pending_msg);
- GNUNET_MQ_send (mq, ev);
+ Peers_send_message (peer, ev, "PULL REQUEST");
}
send_push (const struct GNUNET_PeerIdentity *peer_id)
{
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_MQ_Handle *mq;
- struct PendingMessage *pending_msg;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"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_id);
- pending_msg = insert_pending_message (peer_id, ev, "PUSH");
- GNUNET_MQ_notify_sent (ev,
- mq_notify_sent_cb,
- pending_msg);
- 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
* @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)
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_CS_ActMaliciousMessage)) /
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 */
- struct PeerContext *att_ctx;
num_mal_peers_sent = ntohl (in_msg->num_peers) - 1;
num_mal_peers_old = num_mal_peers;
&in_msg->attacked_peer,
sizeof (struct GNUNET_PeerIdentity));
/* Set the flag of the attacked peer to valid to avoid problems */
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map,
- &attacked_peer))
+ if (GNUNET_NO == Peers_check_peer_known (&attacked_peer))
{
- att_ctx = create_peer_ctx (&attacked_peer);
- check_peer_live (att_ctx);
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
{
GNUNET_break (0);
}
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
* 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;
- struct PeerContext *peer_ctx;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round maliciously type %" PRIu32 ".\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);
* Send as many pushes to the attacked peer as possible
* That is one push per round as it will ignore more.
*/
- peer_ctx = get_peer_ctx (&attacked_peer);
- if (GNUNET_YES == get_peer_flag (peer_ctx, VALID))
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+ if (GNUNET_YES == Peers_check_peer_valid (&attacked_peer))
send_push (&attacked_peer);
}
{ /* Combined attack */
/* Send PUSH to attacked peers */
- if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map,
- &attacked_peer))
+ if (GNUNET_YES == Peers_check_peer_known (&attacked_peer))
{
- peer_ctx = get_peer_ctx (&attacked_peer);
- if (GNUNET_YES == get_peer_flag (peer_ctx, VALID))
+ (void) Peers_issue_peer_liveliness_check (&attacked_peer);
+ if (GNUNET_YES == Peers_check_peer_valid (&attacked_peer))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Goding to send push to attacked peer (%s)\n",
GNUNET_i2s (&attacked_peer));
send_push (&attacked_peer);
}
- else
- check_peer_live (peer_ctx);
}
- else
- peer_ctx = create_peer_ctx (&attacked_peer);
- check_peer_live (peer_ctx);
+ (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,
"Going to send %" PRIu32 " pushes\n",
num_pushes);
- 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 */
tmp_att_peer = att_peer_index;
- for (i = 0 ; i < num_pushes * alpha ; i++)
+ for (i = 0; i < num_pushes * alpha; i++)
{
if (att_peers_tail == tmp_att_peer)
tmp_att_peer = att_peers_head;
//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);
+ 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 */
* 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;
- unsigned int view_size;
+ const struct GNUNET_PeerIdentity *view_array;
unsigned int *permut;
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 PeerContext *peer_ctx;
+ struct GNUNET_PeerIdentity *update_peer;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "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_size = GNUNET_CONTAINER_multipeermap_size (view);
- generate_view_array (view_size);
- for (i = 0 ; i < view_size ; i++)
+ view_array = View_get_as_array ();
+ for (i = 0; i < View_size (); i++)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"\t%s\n", GNUNET_i2s (&view_array[i]));
/* Send pushes and pull requests */
- if (0 < view_size)
+ if (0 < View_size ())
{
permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
- (unsigned int) view_size);
+ View_size ());
/* Send PUSHes */
- a_peers = ceil (alpha * view_size);
+ a_peers = ceil (alpha * View_size ());
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Going to send pushes to %u (ceil (%f * %u)) peers.\n",
- a_peers, alpha, view_size);
+ a_peers, alpha, View_size ());
for (i = 0; i < a_peers; i++)
{
peer = view_array[permut[i]];
}
/* Send PULL requests */
- b_peers = ceil (beta * view_size);
+ b_peers = ceil (beta * View_size ());
first_border = a_peers;
second_border = a_peers + b_peers;
- if (second_border > view_size)
+ if (second_border > View_size ())
{
- first_border = view_size - b_peers;
- second_border = view_size;
+ 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);
+ b_peers, beta, View_size ());
for (i = first_border; i < second_border; i++)
{
peer = view_array[permut[i]];
- peer_ctx = get_peer_ctx (&peer);
if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer) &&
- GNUNET_NO == get_peer_flag (peer_ctx, PULL_REPLY_PENDING)) // TODO
+ 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);
}
/* Update view */
/* TODO see how many peers are in push-/pull- list! */
- if (push_list_size <= alpha * view_size &&
- 0 < push_list_size &&
- 0 < pull_list_size)
- {
+ 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 final_size;
peers_to_clean = NULL;
peers_to_clean_size = 0;
- GNUNET_array_grow (peers_to_clean, peers_to_clean_size, view_size);
+ GNUNET_array_grow (peers_to_clean, peers_to_clean_size, View_size ());
memcpy (peers_to_clean,
view_array,
- view_size * sizeof (struct GNUNET_PeerIdentity));
+ View_size () * sizeof (struct GNUNET_PeerIdentity));
/* Seems like recreating is the easiest way of emptying the peermap */
- GNUNET_CONTAINER_multipeermap_destroy (view);
- view = GNUNET_CONTAINER_multipeermap_create (view_size, GNUNET_NO);
+ View_clear ();
to_file (file_name_view_log,
"--- emptied ---");
first_border = GNUNET_MIN (ceil (alpha * sampler_size_est_need),
- push_list_size);
+ CustomPeerMap_size (push_map));
second_border = first_border +
GNUNET_MIN (floor (beta * sampler_size_est_need),
- pull_list_size);
+ CustomPeerMap_size (pull_map));
final_size = second_border +
ceil ((1 - (alpha + beta)) * sampler_size_est_need);
- GNUNET_array_grow (view_array, view_size, second_border);
-
/* Update view with peers received through PUSHes */
permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
- push_list_size);
+ CustomPeerMap_size (push_map));
for (i = 0; i < first_border; i++)
{
- view_array[i] = push_list[permut[i]];
- GNUNET_CONTAINER_multipeermap_put (view, &push_list[permut[i]], NULL,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-
+ (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]));
/* Update view with peers received through PULLs */
permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG,
- pull_list_size);
+ CustomPeerMap_size (pull_map));
for (i = first_border; i < second_border; i++)
{
- view_array[i] = pull_list[permut[i - first_border]];
- GNUNET_CONTAINER_multipeermap_put (view,
- &pull_list[permut[i - first_border]],
- NULL,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-
+ (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]));
hist_update,
NULL,
final_size - second_border);
- num_hist_update_tasks = final_size - second_border;
// TODO change the peer_flags accordingly
- for (i = 0; i < view_size; i++)
+ for (i = 0; i < View_size (); i++)
rem_from_list (&peers_to_clean, &peers_to_clean_size, &view_array[i]);
/* Clean peers that were removed from the view */
to_file (file_name_view_log,
"-%s",
GNUNET_i2s_full (&peers_to_clean[i]));
- peer_clean (&peers_to_clean[i]);
+ Peers_clean_peer (&peers_to_clean[i]);
+ //peer_destroy_channel_send (sender);
}
GNUNET_array_grow (peers_to_clean, peers_to_clean_size, 0);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received %u pushes and %u pulls last round (alpha (%.2f) * view_size (%u) = %.2f)\n",
- push_list_size,
- pull_list_size,
+ CustomPeerMap_size (push_map),
+ CustomPeerMap_size (pull_map),
alpha,
- view_size,
- alpha * view_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]));
- insert_in_sampler (NULL, &push_list[i]);
- peer_clean (&push_list[i]); /* This cleans only if it is not in the view */
+ GNUNET_i2s (update_peer));
+ insert_in_sampler (NULL, update_peer);
+ Peers_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]));
- insert_in_sampler (NULL, &pull_list[i]);
- peer_clean (&pull_list[i]); /* This cleans only if it is not in the view */
+ 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 */
+ Peers_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 (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");
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got peer_id %s from cadet\n",
GNUNET_i2s (peer));
- new_peer_id (peer);
+ got_peer (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.
+ */
+static int
+valid_peers_iterator (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ if (NULL != peer)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got stored, valid peer %s\n",
+ GNUNET_i2s (peer));
+ got_peer (peer);
}
+ return GNUNET_YES;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got peer_id %s from peerinfo\n",
GNUNET_i2s (peer));
- new_peer_id (peer);
- }
-}
-
-
-/**
- * Callback used to remove peers from the multipeermap.
- */
- int
-peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
- struct PeerContext *peer_ctx;
- const struct GNUNET_CADET_Channel *channel =
- (const struct GNUNET_CADET_Channel *) cls;
-
- peer_ctx = (struct PeerContext *) value;
- set_peer_flag (peer_ctx, TO_DESTROY);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Going to remove peer %s\n",
- GNUNET_i2s (&peer_ctx->peer_id));
-
- /* Remove it from the sampler used for the Brahms protocol */
- RPS_sampler_reinitialise_by_value (prot_sampler, key);
-
- /* 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->transmit_handle)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to cancle transmit_handle for peer %s\n",
- GNUNET_i2s (key));
- GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->transmit_handle);
- peer_ctx->transmit_handle = NULL;
- }
-
- unset_peer_flag (peer_ctx, PULL_REPLY_PENDING);
-
- /* Remove peer from view */
- if (GNUNET_CONTAINER_multipeermap_contains (view, key))
- {
- to_file (file_name_view_log,
- "-%s\t(cleanup channel, other peer)",
- GNUNET_i2s_full (key));
- GNUNET_CONTAINER_multipeermap_remove_all (view, key);
- if (NULL != view_array)
- {
- GNUNET_free (view_array);
- view_array = NULL;
- }
- }
-
- /* Remove from push and pull lists */
- if (GNUNET_YES == in_arr (push_list, push_list_size, key))
- rem_from_list (&push_list, &push_list_size, key);
- if (GNUNET_YES == in_arr (pull_list, pull_list_size, key))
- rem_from_list (&pull_list, &pull_list_size, key);
-
- /* Cancle messages that have not been sent yet */
- while (NULL != peer_ctx->pending_messages_head)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Removing unsent %s\n",
- peer_ctx->pending_messages_head->type);
- /* We are not able to cancel messages as #GNUNET_CADET_mq_create () does not
- * set a #GNUNET_MQ_CancelImpl */
- /* GNUNET_MQ_send_cancel (peer_ctx->pending_messages_head->ev); */
- remove_pending_message (peer_ctx->pending_messages_head);
- }
-
- /* 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
- * This function should be called again from #cleanup_channel (callback
- * called on the destruction of channels) and clean up the rest. */
- if (NULL != peer_ctx->send_channel &&
- channel != peer_ctx->send_channel)
- {
- GNUNET_CADET_channel_destroy (peer_ctx->send_channel);
- peer_ctx->send_channel = NULL;
- }
-
- /* Remove the recv_channel
- * This function should be called again from #cleanup_channel (callback
- * called on the destruction of channels) and clean up the rest. */
- if (NULL != peer_ctx->recv_channel &&
- channel != peer_ctx->recv_channel)
- {
- GNUNET_CADET_channel_destroy (peer_ctx->recv_channel);
- peer_ctx->recv_channel = NULL;
- }
-
- /* If there is no channel we have to remove the context now */
- if (GNUNET_YES != GNUNET_CONTAINER_multipeermap_remove_all (peer_map, key))
- LOG (GNUNET_ERROR_TYPE_WARNING, "removing peer from peer_map failed\n");
-
- GNUNET_free (peer_ctx);
-
- return GNUNET_YES;
-}
-
-
-/**
- * Clean the send channel of a peer
- * If there is also no channel to receive messages from that peer, remove it
- * from the peermap.
- */
-void
-peer_clean (const struct GNUNET_PeerIdentity *peer)
-{
- struct PeerContext *peer_ctx;
- /* struct GNUNET_CADET_Channel *channel; */
-
- if ( (0 == RPS_sampler_count_id (prot_sampler, peer)) &&
- (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (view, peer)) &&
- (GNUNET_NO == in_arr (push_list, push_list_size, peer)) &&
- (GNUNET_NO == in_arr (pull_list, pull_list_size, peer)) &&
- (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, peer)) )
- {
- peer_ctx = get_peer_ctx (peer);
-
- if ( (NULL == peer_ctx->recv_channel) &&
- (NULL == peer_ctx->pending_messages_head) &&
- (GNUNET_NO == get_peer_flag (peer_ctx, PULL_REPLY_PENDING)) )
- {
- #ifdef ENABLE_MALICIOUS
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer))
- peer_remove_cb (NULL, peer, peer_ctx);
- #else /* ENABLE_MALICIOUS */
- peer_remove_cb (NULL, peer, peer_ctx);
- #endif /* ENABLE_MALICIOUS */
- }
+ got_peer (peer);
}
}
* 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)
{
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n");
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "RPS is going down\n");
GNUNET_PEERINFO_notify_cancel (peerinfo_notify_handle);
GNUNET_PEERINFO_disconnect (peerinfo_handle);
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_CADET_disconnect (cadet_handle);
- GNUNET_CONTAINER_multipeermap_destroy (peer_map);
- GNUNET_CONTAINER_multipeermap_destroy (view);
- view = NULL;
- 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);
}
-/**
- * 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)
-{
- struct PeerContext *peer_ctx;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "New channel was established to us (Peer %s).\n",
- GNUNET_i2s (initiator));
- GNUNET_assert (NULL != channel); /* according to cadet API */
- if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (peer_map, initiator))
- peer_ctx = create_peer_ctx (initiator);
- else
- peer_ctx = get_peer_ctx (initiator);
- /* We only accept one incoming channel from peers */
- if (NULL != peer_ctx->recv_channel)
- {
- GNUNET_CADET_channel_destroy (channel);
- return NULL;
- }
- peer_ctx->recv_channel = channel;
- peer_is_live (peer_ctx);
- return NULL;
-}
-
-
-/**
- * This is called when a channel is destroyed.
- *
- * @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))
- {/* We don't want to implicitly create a context that we're about to kill */
- peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
- if (NULL == peer_ctx) /* It could have been removed by shutdown_task */
- return;
-
- if (get_peer_flag (peer_ctx, TO_DESTROY))
- {/* We initiatad the destruction of this particular peer */
- if (channel == peer_ctx->send_channel)
- peer_ctx->send_channel = NULL;
- else if (channel == peer_ctx->recv_channel)
- peer_ctx->recv_channel = NULL;
-
- to_file (file_name_view_log,
- "-%s\t(cleanup channel, ourself)",
- GNUNET_i2s_full (peer));
- }
-
- else
- { /* We did not initiate the destruction of this peer */
- if (channel == peer_ctx->send_channel)
- { /* Something (but us) killd the channel - clean up peer */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "send channel (%s) was destroyed - cleaning up\n",
- GNUNET_i2s (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);
- }
- 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;
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "unknown channel (%s) was destroyed\n",
- GNUNET_i2s (peer));
- }
- }
- }
-
- else
- { /* We don't know a context to that peer */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "channel (%s) without associated context was destroyed\n",
- GNUNET_i2s (peer));
- }
-}
-
-
/**
* Actually start the service.
*/
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_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
}
{
int size;
int out_size;
+ char* fn_valid_peers;
- // 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);
cfg = c;
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");
+ }
- view = GNUNET_CONTAINER_multipeermap_create (4, GNUNET_NO);
+ View_create (4);
/* file_name_view_log */
if (GNUNET_OK != GNUNET_DISK_directory_create ("/tmp/rps/"))
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_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,
+ &Peers_handle_inbound_channel,
+ &cleanup_destroyed_channel,
cadet_handlers,
ports);
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;
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;
-
-
- num_hist_update_tasks = 0;
+ push_map = CustomPeerMap_create (4);
+ pull_map = CustomPeerMap_create (4);
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,
* @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