X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Frps%2Fgnunet-service-rps.c;h=9e3a1a6c87d57394619efbea7bc1a570378f45dd;hb=5e11eb124cc16bc65d42a47076e13d3b0147b838;hp=278276aff6f52ad15bb5eed835744dee1548d625;hpb=bffe57690709d934d5b7b0013607d561628e3a25;p=oweals%2Fgnunet.git diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 278276aff..9e3a1a6c8 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) + Copyright (C) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -38,8 +38,6 @@ // TODO modify @brief in every file -// TODO take care that messages are not longer than 64k - // TODO check for overflows // TODO align message structs @@ -64,7 +62,7 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg; /** * Our own identity. */ -static struct GNUNET_PeerIdentity *own_identity; +static struct GNUNET_PeerIdentity own_identity; struct GNUNET_PeerIdentity * @@ -100,7 +98,7 @@ enum PeerFlags /** * We set this bit when we can be sure the other peer is/was live. */ - LIVING = 0x10 + VALID = 0x10 }; @@ -171,6 +169,11 @@ struct PeerContext */ struct GNUNET_CADET_TransmitHandle *is_live_task; + /** + * Identity of the peer + */ + struct GNUNET_PeerIdentity peer_id; + /** * This is pobably followed by 'statistical' data (when we first saw * him, how did we get his ID, how many pushes (in a timeinterval), @@ -182,10 +185,24 @@ struct PeerContext * /Housekeeping with peers ***********************************************************************/ + + + + /*********************************************************************** * Globals ***********************************************************************/ +/** + * Sampler used for the Brahms protocol itself. + */ +static struct RPS_Sampler *prot_sampler; + +/** + * Sampler used for the clients. + */ +static struct RPS_Sampler *client_sampler; + /** * Set of all peers to keep track of them. */ @@ -204,12 +221,6 @@ static struct GNUNET_PeerIdentity *gossip_list; static uint32_t gossip_list_size; -/** - * The actual size of the sampler - */ -static unsigned int sampler_size; -//size_t sampler_size; - /** * The size of sampler we need to be able to satisfy the client's need of * random peers. @@ -345,15 +356,130 @@ uint32_t pending_pull_reply_list_size; uint32_t num_hist_update_tasks; +#ifdef ENABLE_MALICIOUS +/** + * Type of malicious peer + * + * 0 Don't act malicious at all - Default + * 1 Try to maximise representation + * 2 Try to partition the network + */ +uint32_t mal_type = 0; + +/** + * Other malicious peers + */ +static struct GNUNET_PeerIdentity *mal_peers = NULL; + +/** + * 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; + +/** + * Number of other malicious peers + */ +static uint32_t num_mal_peers = 0; + + +/** + * If type is 2 This struct is used to store the attacked peers in a DLL + */ +struct AttackedPeer +{ + /** + * DLL + */ + struct AttackedPeer *next; + struct AttackedPeer *prev; + + /** + * PeerID + */ + struct GNUNET_PeerIdentity peer_id; +}; + +/** + * 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; + +/** + * 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; + +/** + * 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; + +/** + * Number of attacked peers + */ +static uint32_t num_attacked_peers = 0; + + +/** + * If type is 1 this is the attacked peer + */ +static struct GNUNET_PeerIdentity attacked_peer; + +/** + * The limit of PUSHes we can send in one round. + * This is an assumption of the Brahms protocol and either implemented + * via proof of work + * or + * assumend to be the bandwidth limitation. + */ +static uint32_t push_limit = 10000; +#endif /* ENABLE_MALICIOUS */ + + /*********************************************************************** * /Globals ***********************************************************************/ + + + + /*********************************************************************** * 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)) + +/** + * Compute the minimum of two ints + */ +#define min(x, y) ((x < y) ? x : y) + +/** + * Clean the send channel of a peer + */ +void +peer_clean (const struct GNUNET_PeerIdentity *peer); + + /** * Check if peer is already in peer array. */ @@ -371,40 +497,66 @@ in_arr (const struct GNUNET_PeerIdentity *array, unsigned int i; - i = 0; - while (0 != GNUNET_CRYPTO_cmp_peer_identity (&array[i], peer) && - i < arr_size) - i++; + for (i = 0; i < arr_size ; i++) + if (0 == GNUNET_CRYPTO_cmp_peer_identity (&array[i], peer)) + return GNUNET_YES; + return GNUNET_NO; +} + - if (i == arr_size) - return GNUNET_NO; - else - return GNUNET_YES; +/** + * Print peerlist to log. + */ +void +print_peer_list (struct GNUNET_PeerIdentity *list, unsigned int len) +{ + unsigned int i; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Printing peer list of length %u at %p:\n", + len, + list); + for (i = 0 ; i < len ; i++) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "%u. peer: %s\n", + i, GNUNET_i2s (&list[i])); + } } + /** * Remove peer from list. */ void -rem_from_list (struct GNUNET_PeerIdentity *peer_list, +rem_from_list (struct GNUNET_PeerIdentity **peer_list, unsigned int *list_size, const struct GNUNET_PeerIdentity *peer) { unsigned int i; + struct GNUNET_PeerIdentity *tmp; + + tmp = *peer_list; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Removing peer %s from list at %p\n", + GNUNET_i2s (peer), + tmp); for ( i = 0 ; i < *list_size ; i++ ) { - if (0 == GNUNET_CRYPTO_cmp_peer_identity (&peer_list[i], peer)) + if (0 == GNUNET_CRYPTO_cmp_peer_identity (&tmp[i], peer)) { if (i < *list_size -1) { /* Not at the last entry -- shift peers left */ - memcpy (&peer_list[i], &peer_list[i +1], - (*list_size - i -1) * sizeof (struct GNUNET_PeerIdentity)); + memcpy (&tmp[i], &tmp[i +1], + ((*list_size) - i -1) * sizeof (struct GNUNET_PeerIdentity)); } /* Remove last entry (should be now useless PeerID) */ - GNUNET_array_grow (peer_list, *list_size, *list_size -1); + GNUNET_array_grow (tmp, *list_size, (*list_size) -1); } } + *peer_list = tmp; } /** @@ -421,35 +573,49 @@ get_rand_peer_ignore_list (const struct GNUNET_PeerIdentity *peer_list, 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)); + memcpy (tmp_peer_list, + peer_list, + list_size * sizeof (struct GNUNET_PeerIdentity)); peer = GNUNET_new (struct GNUNET_PeerIdentity); - // FIXME if we have only NULL in gossip list this will block - // but then we might have a problem nevertheless - do + /**; + * 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]; - if (in_arr (tmp_peer_list, list_size, peer)) - { - rem_from_list (tmp_peer_list, &tmp_size, peer); - if (0 == tmp_size) - return NULL; - continue; - } + } - } while (NULL == peer); - GNUNET_free (tmp_peer_list); + GNUNET_array_grow (tmp_peer_list, tmp_size, 0); return peer; } @@ -477,6 +643,8 @@ get_peer_ctx (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, 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); } @@ -501,34 +669,75 @@ hist_update (void *cls, struct GNUNET_PeerIdentity *ids, uint32_t num_peers) /** - * 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. + * Set the peer flag to living and call the outstanding operations on this peer. */ - size_t -peer_is_live (void *cls, size_t size, void *buf) +static size_t +peer_is_live (struct PeerContext *peer_ctx) { struct GNUNET_PeerIdentity *peer; - struct PeerContext *peer_ctx; - peer = (struct GNUNET_PeerIdentity *) cls; - peer_ctx = get_peer_ctx (peer_map, peer); - peer_ctx->peer_flags |= LIVING; + /* 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) + if (0 < peer_ctx->num_outstanding_ops) { /* Call outstanding operations */ unsigned int i; - for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; 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); } - GNUNET_free (peer); + 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; + //} - buf = NULL; return 0; } @@ -540,30 +749,33 @@ peer_is_live (void *cls, size_t size, void *buf) get_channel (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, const struct GNUNET_PeerIdentity *peer) { - struct PeerContext *ctx; - struct GNUNET_PeerIdentity *tmp_peer; + struct PeerContext *peer_ctx; + + peer_ctx = get_peer_ctx (peer_map, peer); - ctx = get_peer_ctx (peer_map, peer); - if (NULL == ctx->send_channel) + GNUNET_assert (NULL == peer_ctx->is_live_task); + + if (NULL == peer_ctx->send_channel) { - ctx->send_channel = GNUNET_CADET_channel_create (cadet_handle, NULL, peer, - GNUNET_RPS_CADET_PORT, - GNUNET_CADET_OPTION_RELIABLE); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Trying to establish channel to peer %s\n", + GNUNET_i2s (peer)); - if (NULL == ctx->recv_channel) - { - tmp_peer = GNUNET_new (struct GNUNET_PeerIdentity); - *tmp_peer = *peer; - ctx->is_live_task = GNUNET_CADET_notify_transmit_ready (ctx->send_channel, GNUNET_NO, - GNUNET_TIME_UNIT_FOREVER_REL, - 0, peer_is_live, tmp_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, ctx, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); + (void) GNUNET_CONTAINER_multipeermap_put + (peer_map, + peer, + peer_ctx, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); } - return ctx->send_channel; + return peer_ctx->send_channel; } @@ -577,18 +789,51 @@ get_channel (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, get_mq (struct GNUNET_CONTAINER_MultiPeerMap *peer_map, const struct GNUNET_PeerIdentity *peer_id) { - struct PeerContext *ctx; + struct PeerContext *peer_ctx; + + peer_ctx = get_peer_ctx (peer_map, peer_id); - ctx = get_peer_ctx (peer_map, peer_id); - if (NULL == ctx->mq) + GNUNET_assert (NULL == peer_ctx->is_live_task); + + if (NULL == peer_ctx->mq) { (void) get_channel (peer_map, peer_id); - ctx->mq = GNUNET_CADET_mq_create (ctx->send_channel); + 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, ctx, + (void) GNUNET_CONTAINER_multipeermap_put (peer_map, peer_id, peer_ctx, GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); } - return ctx->mq; + 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"); + } } @@ -630,6 +875,8 @@ 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); } /** @@ -657,10 +904,12 @@ 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); } /** - * Check whether #insert_in_pull_list was already scheduled + * Check whether #insert_in_gossip_list was already scheduled */ int insert_in_gossip_list_scheduled (const struct PeerContext *peer_ctx) @@ -680,19 +929,23 @@ insert_in_gossip_list_scheduled (const struct PeerContext *peer_ctx) void insert_in_sampler (void *cls, const struct GNUNET_PeerIdentity *peer) { - RPS_sampler_update_list (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); } /** * Check whether #insert_in_sampler was already scheduled */ - int +static int insert_in_sampler_scheduled (const struct PeerContext *peer_ctx) { unsigned int i; - for ( i = 0 ; i < peer_ctx->num_outstanding_ops ; 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; @@ -701,34 +954,57 @@ insert_in_sampler_scheduled (const struct PeerContext *peer_ctx) /** * Wrapper around #RPS_sampler_resize() + * + * If we do not have enough sampler elements, double current sampler size + * If we have more than enough sampler elements, halv current sampler size */ - void -resize_wrapper () +static void +resize_wrapper (struct RPS_Sampler *sampler, uint32_t new_size) +{ + unsigned int sampler_size; + + // TODO statistics + // TODO respect the min, max + sampler_size = RPS_sampler_get_size (sampler); + if (sampler_size > new_size * 4) + { /* Shrinking */ + RPS_sampler_resize (sampler, sampler_size / 2); + } + else if (sampler_size < new_size) + { /* Growing */ + RPS_sampler_resize (sampler, sampler_size * 2); + } + LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size is now %u\n", sampler_size); +} + + +/** + * Wrapper around #RPS_sampler_resize() resizing the client sampler + */ +static void +client_resize_wrapper () { uint32_t bigger_size; + unsigned int sampler_size; // TODO statistics + sampler_size = RPS_sampler_get_size (client_sampler); + if (sampler_size_est_need > sampler_size_client_need) - bigger_size = sampler_size_client_need; - else bigger_size = sampler_size_est_need; + else + bigger_size = sampler_size_client_need; - // TODO respect the request rate, min, max - if (sampler_size > bigger_size*4) - { /* Shrinking */ - RPS_sampler_resize (sampler_size/2); - } - else if (sampler_size < bigger_size) - { /* Growing */ - RPS_sampler_resize (sampler_size*2); - } + // TODO respect the min, max + resize_wrapper (client_sampler, bigger_size); + LOG (GNUNET_ERROR_TYPE_DEBUG, "sampler_size is now %u\n", sampler_size); } /** * Estimate request rate - * + * * Called every time we receive a request from the client. */ void @@ -746,29 +1022,112 @@ est_request_rate() (req_counter - 1) * sizeof (struct GNUNET_TIME_Relative)); /* Add current delta to beginning */ - request_deltas[0] = GNUNET_TIME_absolute_get_difference (last_request, - GNUNET_TIME_absolute_get ()); + request_deltas[0] = + GNUNET_TIME_absolute_get_difference (last_request, + GNUNET_TIME_absolute_get ()); request_rate = T_relative_avg (request_deltas, req_counter); /* Compute the duration a round will maximally take */ - max_round_duration = GNUNET_TIME_relative_add (round_interval, - GNUNET_TIME_relative_divide (round_interval, 2)); + max_round_duration = + GNUNET_TIME_relative_add (round_interval, + GNUNET_TIME_relative_divide (round_interval, 2)); /* Set the estimated size the sampler has to have to * satisfy the current client request rate */ - sampler_size_client_need = max_round_duration.rel_value_us / request_rate.rel_value_us; + sampler_size_client_need = + max_round_duration.rel_value_us / request_rate.rel_value_us; /* Resize the sampler */ - resize_wrapper (); + client_resize_wrapper (); } last_request = GNUNET_TIME_absolute_get (); } +/** + * Add all peers in @a peer_array to @peer_map used as set. + * + * @param peer_array array containing the peers + * @param num_peers number of peers in @peer_array + * @param peer_map the peermap to use as set + */ +static void +add_peer_array_to_set (const struct GNUNET_PeerIdentity *peer_array, + unsigned int num_peers, + struct GNUNET_CONTAINER_MultiPeerMap *peer_map) +{ + unsigned int i; + if (NULL == peer_map) + peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, + GNUNET_NO); + for (i = 0 ; i < num_peers ; i++) + { + GNUNET_CONTAINER_multipeermap_put (peer_map, + &peer_array[i], + NULL, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + } +} + + +/** + * Send a PULL REPLY to @a peer_id + * + * @param peer_id the peer to send the reply to. + * @param peer_ids the peers to send to @a peer_id + * @param num_peer_ids the number of peers to send to @a peer_id + */ +static void +send_pull_reply (const struct GNUNET_PeerIdentity *peer_id, + const struct GNUNET_PeerIdentity *peer_ids, + 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; + + /* Compute actual size */ + send_size = sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) + + num_peer_ids * sizeof (struct GNUNET_PeerIdentity); + + if (GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE < send_size) + /* Compute number of peers to send + * If too long, simply truncate */ + // TODO select random ones via permutation + // or even better: do good protocol design + send_size = + (GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE - + sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / + sizeof (struct GNUNET_PeerIdentity); + else + 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); + + 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, + send_size * sizeof (struct GNUNET_PeerIdentity)); + + GNUNET_MQ_send (mq, ev); +} + + /*********************************************************************** * /Util functions ***********************************************************************/ + + + + /** * Function called by NSE. * @@ -776,28 +1135,31 @@ est_request_rate() * accordingly. */ void -nse_callback (void *cls, struct GNUNET_TIME_Absolute timestamp, double logestimate, double std_dev) +nse_callback (void *cls, struct GNUNET_TIME_Absolute timestamp, + double logestimate, double std_dev) { double estimate; //double scale; // TODO this might go gloabal/config LOG (GNUNET_ERROR_TYPE_DEBUG, - "Received a ns estimate - logest: %f, std_dev: %f (old_size: %f)\n", - logestimate, std_dev, sampler_size); + "Received a ns estimate - logest: %f, std_dev: %f (old_size: %u)\n", + logestimate, std_dev, RPS_sampler_get_size (prot_sampler)); //scale = .01; estimate = GNUNET_NSE_log_estimate_to_n (logestimate); // GNUNET_NSE_log_estimate_to_n (logestimate); - estimate = pow (estimate, 1./3); + estimate = pow (estimate, 1.0 / 3); // TODO add if std_dev is a number // estimate += (std_dev * scale); - if ( 0 < estimate ) { + if (2 < ceil (estimate)) + { LOG (GNUNET_ERROR_TYPE_DEBUG, "Changing estimate to %f\n", estimate); sampler_size_est_need = estimate; } else LOG (GNUNET_ERROR_TYPE_DEBUG, "Not using estimate %f\n", estimate); /* If the NSE has changed adapt the lists accordingly */ - resize_wrapper (); + resize_wrapper (prot_sampler, sampler_size_est_need); + client_resize_wrapper (); } @@ -813,10 +1175,16 @@ void client_respond (void *cls, struct GNUNET_MQ_Envelope *ev; struct GNUNET_RPS_CS_ReplyMessage *out_msg; struct GNUNET_SERVER_Client *client; + uint32_t size_needed; struct client_ctx *cli_ctx; client = (struct GNUNET_SERVER_Client *) cls; + size_needed = sizeof (struct GNUNET_RPS_CS_ReplyMessage) + + num_peers * sizeof (struct GNUNET_PeerIdentity); + + GNUNET_assert (GNUNET_SERVER_MAX_MESSAGE_SIZE >= size_needed); + ev = GNUNET_MQ_msg_extra (out_msg, num_peers * sizeof (struct GNUNET_PeerIdentity), GNUNET_MESSAGE_TYPE_RPS_CS_REPLY); @@ -826,14 +1194,14 @@ void client_respond (void *cls, ids, num_peers * sizeof (struct GNUNET_PeerIdentity)); GNUNET_free (ids); - + cli_ctx = GNUNET_SERVER_client_get_user_context (client, struct client_ctx); - if ( NULL == cli_ctx ) { + if (NULL == cli_ctx) { cli_ctx = GNUNET_new (struct client_ctx); cli_ctx->mq = GNUNET_MQ_queue_for_server_client (client); GNUNET_SERVER_client_set_user_context (client, cli_ctx); } - + GNUNET_MQ_send (cli_ctx->mq, ev); } @@ -852,18 +1220,28 @@ handle_client_request (void *cls, { struct GNUNET_RPS_CS_RequestMessage *msg; uint32_t num_peers; + uint32_t size_needed; 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); + return; + } for (i = 0 ; i < num_peers ; i++) est_request_rate(); LOG (GNUNET_ERROR_TYPE_DEBUG, "Client requested %" PRIX32 " random peer(s).\n", num_peers); - RPS_sampler_get_n_rand_peers (client_respond, client, num_peers, GNUNET_YES); + RPS_sampler_get_n_rand_peers (client_sampler, client_respond, + client, num_peers, GNUNET_YES); GNUNET_SERVER_receive_done (client, GNUNET_OK); @@ -879,36 +1257,56 @@ handle_client_request (void *cls, */ static void handle_client_seed (void *cls, - struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) { struct GNUNET_RPS_CS_SeedMessage *in_msg; struct GNUNET_PeerIdentity *peers; + uint32_t num_peers; uint32_t i; - if (sizeof (struct GNUNET_RPS_CS_SeedMessage) < ntohs (message->size)) + if (sizeof (struct GNUNET_RPS_CS_SeedMessage) > ntohs (message->size)) { GNUNET_break_op (0); GNUNET_SERVER_receive_done (client, - GNUNET_SYSERR); + GNUNET_SYSERR); } + in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message; + num_peers = ntohl (in_msg->num_peers); + peers = (struct GNUNET_PeerIdentity *) &in_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) != ntohl (in_msg->num_peers)) + sizeof (struct GNUNET_PeerIdentity) != num_peers) { GNUNET_break_op (0); GNUNET_SERVER_receive_done (client, - GNUNET_SYSERR); + GNUNET_SYSERR); } - in_msg = (struct GNUNET_RPS_CS_SeedMessage *) message; - peers = (struct GNUNET_PeerIdentity *) &message[1]; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Client seeded peers:\n"); + print_peer_list (peers, num_peers); + + // TODO check for validity of ids + + for (i = 0 ; i < num_peers ; i++) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Updating samplers with seed %" PRIX32 ": %s\n", + i, + GNUNET_i2s (&peers[i])); + + RPS_sampler_update (prot_sampler, &peers[i]); + RPS_sampler_update (client_sampler, &peers[i]); + } - for ( i = 0 ; i < ntohl (in_msg->num_peers) ; i++ ) - RPS_sampler_update_list (&peers[i]); + //GNUNET_free (peers); GNUNET_SERVER_receive_done (client, - GNUNET_OK); + GNUNET_OK); } @@ -931,19 +1329,50 @@ handle_peer_push (void *cls, { const struct GNUNET_PeerIdentity *peer; - // (check the proof of work) - - peer = (const struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER); + // (check the proof of work) + + peer = (const struct GNUNET_PeerIdentity *) + GNUNET_CADET_channel_get_info (channel, GNUNET_CADET_OPTION_PEER); // FIXME wait for cadet to change this function + LOG (GNUNET_ERROR_TYPE_DEBUG, "PUSH received (%s)\n", GNUNET_i2s (peer)); - + + #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) + { /* Try to maximise representation */ + 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, + peer)) + { + GNUNET_CONTAINER_DLL_insert (att_peers_head, + att_peers_tail, + tmp_att_peer); + add_peer_array_to_set (peer, 1, att_peer_set); + } + return GNUNET_OK; + } + + + else if (2 == mal_type) + { /* We attack one single well-known peer - simply ignore */ + return GNUNET_OK; + } + + #endif /* ENABLE_MALICIOUS */ + /* Add the sending peer to the push_list */ - if (GNUNET_NO == in_arr (push_list, pull_list_size, peer)) + if (GNUNET_NO == in_arr (push_list, push_list_size, peer)) GNUNET_array_append (push_list, push_list_size, *peer); return GNUNET_OK; } + /** * Handle PULL REQUEST request message from another peer. * @@ -961,33 +1390,35 @@ handle_peer_pull_request (void *cls, const struct GNUNET_MessageHeader *msg) { struct GNUNET_PeerIdentity *peer; - struct GNUNET_MQ_Handle *mq; - struct GNUNET_MQ_Envelope *ev; - struct GNUNET_RPS_P2P_PullReplyMessage *out_msg; - - peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info (channel, - GNUNET_CADET_OPTION_PEER); + peer = (struct GNUNET_PeerIdentity *) + GNUNET_CADET_channel_get_info (channel, + GNUNET_CADET_OPTION_PEER); // FIXME wait for cadet to change this function - LOG (GNUNET_ERROR_TYPE_DEBUG, - "PULL REQUEST from peer %s received, going to send %u peers\n", - GNUNET_i2s (peer), gossip_list_size); - mq = get_mq (peer_map, peer); + #ifdef ENABLE_MALICIOUS + if (1 == mal_type) + { /* Try to maximise representation */ + send_pull_reply (peer, mal_peers, num_mal_peers); + return GNUNET_OK; + } - ev = GNUNET_MQ_msg_extra (out_msg, - gossip_list_size * sizeof (struct GNUNET_PeerIdentity), - GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY); - //out_msg->num_peers = htonl (gossip_list_size); - out_msg->num_peers = htonl (gossip_list_size); - memcpy (&out_msg[1], gossip_list, - gossip_list_size * sizeof (struct GNUNET_PeerIdentity)); + else if (2 == mal_type) + { /* Try to partition network */ + if (GNUNET_YES == GNUNET_CRYPTO_cmp_peer_identity (&attacked_peer, peer)) + { + send_pull_reply (peer, mal_peers, num_mal_peers); + } + return GNUNET_OK; + } + #endif /* ENABLE_MALICIOUS */ - GNUNET_MQ_send (mq, ev); + send_pull_reply (peer, gossip_list, gossip_list_size); return GNUNET_OK; } + /** * Handle PULL REPLY message from another peer. * @@ -1001,9 +1432,9 @@ handle_peer_pull_request (void *cls, */ static int handle_peer_pull_reply (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) { LOG (GNUNET_ERROR_TYPE_DEBUG, "PULL REPLY received\n"); @@ -1015,17 +1446,22 @@ handle_peer_pull_reply (void *cls, struct PeerOutstandingOp out_op; uint32_t i; + /* Check for protocol violation */ if (sizeof (struct GNUNET_RPS_P2P_PullReplyMessage) > ntohs (msg->size)) { - GNUNET_break_op (0); // At the moment our own implementation seems to break that. + GNUNET_break_op (0); return GNUNET_SYSERR; } + in_msg = (struct GNUNET_RPS_P2P_PullReplyMessage *) msg; - if ((ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) + if ((ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / + sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) { - LOG (GNUNET_ERROR_TYPE_ERROR, "message says it sends %" PRIu64 " peers, have space for %i peers\n", + LOG (GNUNET_ERROR_TYPE_ERROR, + "message says it sends %" PRIu64 " peers, have space for %i peers\n", ntohl (in_msg->num_peers), - (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / sizeof (struct GNUNET_PeerIdentity)); + (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / + sizeof (struct GNUNET_PeerIdentity)); GNUNET_break_op (0); return GNUNET_SYSERR; } @@ -1036,56 +1472,347 @@ handle_peer_pull_reply (void *cls, // FIXME wait for cadet to change this function sender_ctx = get_peer_ctx (peer_map, sender); - if (0 == (peer_ctx->peer_flags || PULL_REPLY_PENDING)) + if (GNUNET_YES == get_peer_flag (sender_ctx, PULL_REPLY_PENDING)) { GNUNET_break_op (0); return GNUNET_OK; } + + /* Do actual logic */ peers = (struct GNUNET_PeerIdentity *) &msg[1]; - for ( i = 0 ; i < ntohl (in_msg->num_peers) ; i++ ) + for (i = 0 ; i < ntohl (in_msg->num_peers) ; i++) { peer_ctx = get_peer_ctx (peer_map, &peers[i]); - if ((0 != (peer_ctx->peer_flags && LIVING)) || - NULL != peer_ctx->recv_channel) + if (GNUNET_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])) + 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)) { out_op.op = insert_in_pull_list; - GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op); + out_op.op_cls = NULL; + GNUNET_array_append (peer_ctx->outstanding_ops, + peer_ctx->num_outstanding_ops, + out_op); + check_peer_live (peer_ctx); } } - sender_ctx->peer_flags &= (~PULL_REPLY_PENDING); - rem_from_list (pending_pull_reply_list, &pending_pull_reply_list_size, sender); + unset_peer_flag (sender_ctx, PULL_REPLY_PENDING); + rem_from_list (&pending_pull_reply_list, &pending_pull_reply_list_size, sender); return GNUNET_OK; } /** - * Send out PUSHes and PULLs. + * Compute a random delay. + * A uniformly distributed value between mean + spread and mean - spread. + * + * For example for mean 4 min and spread 2 the minimum is (4 min - (1/2 * 4 min)) + * It would return a random value between 2 and 6 min. + * + * @param mean the mean + * @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) +{ + struct GNUNET_TIME_Relative half_interval; + struct GNUNET_TIME_Relative ret; + unsigned int rand_delay; + unsigned int max_rand_delay; + + if (0 == spread) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "Not accepting spread of 0\n"); + GNUNET_break (0); + } + + /* Compute random time value between spread * mean and spread * mean */ + half_interval = GNUNET_TIME_relative_divide (mean, spread); + + max_rand_delay = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us / mean.rel_value_us * (2/spread); + /** + * Compute random value between (0 and 1) * round_interval + * via multiplying round_interval with a 'fraction' (0 to value)/value + */ + rand_delay = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, max_rand_delay); + ret = GNUNET_TIME_relative_multiply (mean, rand_delay); + ret = GNUNET_TIME_relative_divide (ret, max_rand_delay); + ret = GNUNET_TIME_relative_add (ret, half_interval); + + if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == ret.rel_value_us) + LOG (GNUNET_ERROR_TYPE_WARNING, + "Returning FOREVER_REL\n"); + + return ret; +} + + +/** + * Send single pull request + * + * @param peer_id the peer to send the pull request to. + */ +static void +send_pull_request (struct GNUNET_PeerIdentity *peer_id) +{ + 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_array_append (pending_pull_reply_list, pending_pull_reply_list_size, *peer_id); + + ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST); + mq = get_mq (peer_map, peer_id); + GNUNET_MQ_send (mq, ev); +} + + +/** + * Send single push + * + * @param peer_id the peer to send the push to. + */ +static void +send_push (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", + 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); +} + + +static void +do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); + +static void +do_mal_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); + + +#ifdef ENABLE_MALICIOUS +/** + * 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 msg The message header + */ + static void +handle_client_act_malicious (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *msg) +{ + struct GNUNET_RPS_CS_ActMaliciousMessage *in_msg; + 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); + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Now acting malicious type %" PRIu32 "\n", + mal_type); + + 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_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); + + /* Substitute do_round () with do_mal_round () */ + GNUNET_SCHEDULER_cancel (do_round_task); + do_round_task = GNUNET_SCHEDULER_add_now (&do_mal_round, NULL); + } + + else if (2 == 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_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); + + /* Store the one attacked peer */ + memcpy (&attacked_peer, + &peers[num_mal_peers_sent], + sizeof (struct GNUNET_PeerIdentity)); + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Attacked peer is %s\n", + GNUNET_i2s (&attacked_peer)); + + /* Substitute do_round () with do_mal_round () */ + GNUNET_SCHEDULER_cancel (do_round_task); + do_round_task = GNUNET_SCHEDULER_add_now (&do_mal_round, NULL); + } + else if (0 == mal_type) + { /* Stop acting malicious */ + num_mal_peers = 0; + GNUNET_free (mal_peers); + + /* Substitute do_mal_round () with do_round () */ + GNUNET_SCHEDULER_cancel (do_round_task); + do_round_task = GNUNET_SCHEDULER_add_now (&do_round, NULL); + } + else + { + GNUNET_break (0); + } +} + + +/** + * Send out PUSHes and PULLs maliciously. + * + * This is executed regylary. + */ +static void +do_mal_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + 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"); + + /* Do malicious actions */ + if (1 == mal_type) + { /* Try to maximise representation */ + + /* The maximum of pushes we're going to send this round */ + num_pushes = min (min (push_limit, + num_attacked_peers), + GNUNET_CONSTANTS_MAX_CADET_MESSAGE_SIZE); + + /* Send PUSHes to attacked peers */ + for (i = 0 ; i < num_pushes ; i++) + { + if (att_peers_tail == att_peer_index) + att_peer_index = att_peers_head; + else + att_peer_index = att_peer_index->next; + + send_push (&att_peer_index->peer_id); + } + + /* Send PULLs to some peers to learn about additional peers to attack */ + for (i = 0 ; i < num_pushes * alpha ; i++) + { + if (att_peers_tail == tmp_att_peer) + tmp_att_peer = att_peers_head; + else + att_peer_index = tmp_att_peer->next; + + send_pull_request (&tmp_att_peer->peer_id); + } + } + + + else if (2 == mal_type) + { /** + * Try to partition the network + * Send as many pushes to the attacked peer as possible + * That is one push per round as it will ignore more. + */ + send_push (&attacked_peer); + } + + + /* 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); + LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished round\n"); +} +#endif /* ENABLE_MALICIOUS */ + + +/** + * Send out PUSHes and PULLs, possibly update #gossip_list, samplers. * * This is executed regylary. */ static void do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to execute next round.\n"); uint32_t i; unsigned int *permut; unsigned int n_peers; /* Number of peers we send pushes/pulls to */ - struct GNUNET_MQ_Envelope *ev; - const struct GNUNET_PeerIdentity *peer; - struct GNUNET_MQ_Handle *mq; + struct GNUNET_PeerIdentity peer; + struct GNUNET_PeerIdentity *tmp_peer; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Printing gossip list:\n"); + for (i = 0 ; i < gossip_list_size ; i++) + LOG (GNUNET_ERROR_TYPE_DEBUG, + "\t%s\n", GNUNET_i2s (&gossip_list[i])); // TODO log lists, ... - /* Would it make sense to have one shuffeled gossip list and then * to send PUSHes to first alpha peers, PULL requests to next beta peers and * use the rest to update sampler? @@ -1096,66 +1823,46 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) gossip_list_size); - if (0 != gossip_list_size) + n_peers = ceil (alpha * gossip_list_size); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Going to send pushes to %u ceil (%f * %u) peers.\n", + n_peers, alpha, gossip_list_size); + for (i = 0 ; i < n_peers ; i++) { - n_peers = round (alpha * gossip_list_size); - if (0 == n_peers) - n_peers = 1; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to send pushes to %u (%f * %u) peers.\n", - n_peers, alpha, gossip_list_size); - for ( i = 0 ; i < n_peers ; i++ ) - { - // TODO - //peer = get_rand_peer_ignore_list (gossip_list, gossip_list_size, - // NULL, 0); - peer = &gossip_list[permut[i]]; - if (own_identity != peer) // TODO - { // FIXME if this fails schedule/loop this for later - LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending PUSH to peer %s of gossiped list.\n", GNUNET_i2s (peer)); - - ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PUSH); - // FIXME sometimes it returns a pointer to a freed mq - mq = get_mq (peer_map, peer); - GNUNET_MQ_send (mq, ev); - } + peer = gossip_list[permut[i]]; + if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer)) // TODO + { // FIXME if this fails schedule/loop this for later + send_push (&peer); } } + GNUNET_free (permut); } /* Send PULL requests */ //permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_STRONG, (unsigned int) sampler_list->size); - if (0 != gossip_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++) { - n_peers = round (beta * gossip_list_size); - if (0 == n_peers) - n_peers = 1; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Going to send pulls to %u (%f * %u) peers.\n", - n_peers, beta, gossip_list_size); - for ( i = 0 ; i < n_peers ; i++ ) + tmp_peer = get_rand_peer_ignore_list (gossip_list, gossip_list_size, + pending_pull_reply_list, pending_pull_reply_list_size); + if (NULL != tmp_peer) { - peer = get_rand_peer_ignore_list (gossip_list, gossip_list_size, - pending_pull_reply_list, pending_pull_reply_list_size); - if (NULL != peer) - { - GNUNET_array_append (pending_pull_reply_list, pending_pull_reply_list_size, *peer); - - if (own_identity != peer) - { // FIXME if this fails schedule/loop this for later - LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending PULL request to peer %s of gossiped list.\n", GNUNET_i2s (peer)); + peer = *tmp_peer; + GNUNET_free (tmp_peer); - ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST); - //pull_msg = NULL; - mq = get_mq (peer_map, peer); - GNUNET_MQ_send (mq, ev); - } + if (0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, &peer)) + { + send_pull_request (&peer); } } } /* Update gossip list */ - uint32_t r_index; if ( push_list_size <= alpha * gossip_list_size && push_list_size != 0 && @@ -1165,13 +1872,23 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) uint32_t first_border; uint32_t second_border; - - first_border = round (alpha * sampler_size_est_need); - second_border = first_border + round (beta * sampler_size_est_need); + uint32_t r_index; + 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++ ) + for (i = 0 ; i < first_border ; i++) { // TODO use RPS_sampler_get_n_rand_peers /* Update gossip list with peers received through PUSHes */ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, @@ -1180,7 +1897,7 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) // TODO change the peer_flags accordingly } - for ( i = first_border ; i < second_border ; i++ ) + for (i = first_border ; i < second_border ; i++) { /* Update gossip list with peers received through PULLs */ r_index = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, @@ -1189,33 +1906,47 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) // TODO change the peer_flags accordingly } - for ( i = second_border ; i < gossip_list_size ; i++ ) + for (i = second_border ; i < sampler_size_est_need ; i++) { /* Update gossip list with peers from history */ - RPS_sampler_get_n_rand_peers (hist_update, NULL, 1, GNUNET_NO); + RPS_sampler_get_n_rand_peers (prot_sampler, hist_update, NULL, 1, GNUNET_NO); num_hist_update_tasks++; // 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 < peers_to_clean_size ; i++) + peer_clean (&peers_to_clean[i]); + + GNUNET_free (peers_to_clean); } else { - LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list. ()\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "No update of the gossip list.\n"); } // TODO independent of that also get some peers from CADET_get_peers()? /* Update samplers */ - for ( i = 0 ; i < push_list_size ; i++ ) { - RPS_sampler_update_list (&push_list[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? } for ( i = 0 ; i < pull_list_size ; i++ ) { - RPS_sampler_update_list (&pull_list[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? } @@ -1225,73 +1956,20 @@ do_round (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_array_grow (pull_list, pull_list_size, 0); struct GNUNET_TIME_Relative time_next_round; - struct GNUNET_TIME_Relative half_round_interval; - unsigned int rand_delay; - /* Compute random time value between .5 * round_interval and 1.5 *round_interval */ - half_round_interval = GNUNET_TIME_relative_divide (round_interval, 2); - do - { - /* - * Compute random value between (0 and 1) * round_interval - * via multiplying round_interval with a 'fraction' (0 to value)/value - */ - rand_delay = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT_MAX/10); - time_next_round = GNUNET_TIME_relative_multiply (round_interval, rand_delay); - time_next_round = GNUNET_TIME_relative_divide (time_next_round, UINT_MAX/10); - time_next_round = GNUNET_TIME_relative_add (time_next_round, half_round_interval); - } while (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == time_next_round.rel_value_us); + 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 (round_interval, &do_round, NULL); + do_round_task = GNUNET_SCHEDULER_add_delayed (time_next_round, &do_round, NULL); LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished round\n"); } -/** - * Open a connection to given peer and store channel and mq. - */ - void -insertCB (void *cls, const struct GNUNET_PeerIdentity *id) -{ - // We open a channel to be notified when this peer goes down. - (void) get_channel (peer_map, id); -} - - -/** - * Close the connection to given peer and delete channel and mq. - */ - void -removeCB (void *cls, const struct GNUNET_PeerIdentity *id) -{ - size_t s; - struct PeerContext *ctx; - - s = RPS_sampler_count_id (id); - if ( 1 >= s ) - { - if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, id)) - { - ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, id); - if (NULL != ctx->send_channel) - { - if (NULL != ctx->mq) - { - GNUNET_MQ_destroy (ctx->mq); - } - // may already be freed at shutdown of cadet - //GNUNET_CADET_channel_destroy (ctx->send_channel); - } - // TODO cleanup peer - (void) GNUNET_CONTAINER_multipeermap_remove_all (peer_map, id); - } - } -} - static void rps_start (struct GNUNET_SERVER_Handle *server); + /** * This is called from GNUNET_CADET_get_peers(). * @@ -1306,12 +1984,11 @@ init_peer_cb (void *cls, unsigned int best_path) // "How long is the best path? // (0 = unknown, 1 = ourselves, 2 = neighbor)" { - struct GNUNET_SERVER_Handle *server; struct PeerOutstandingOp out_op; struct PeerContext *peer_ctx; - server = (struct GNUNET_SERVER_Handle *) cls; - if ( NULL != peer ) + if (NULL != peer + && 0 != GNUNET_CRYPTO_cmp_peer_identity (&own_identity, peer)) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Got peer %s (at %p) from CADET (gossip_list_size: %u)\n", @@ -1319,53 +1996,117 @@ init_peer_cb (void *cls, // maybe create a function for that peer_ctx = get_peer_ctx (peer_map, peer); - if (GNUNET_NO == insert_in_sampler_scheduled (peer_ctx)) + if (GNUNET_YES != get_peer_flag (peer_ctx, VALID)) { - out_op.op = insert_in_sampler; - GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op); - } + if (GNUNET_NO == insert_in_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_NO == insert_in_gossip_list_scheduled (peer_ctx)) - { - out_op.op = insert_in_gossip_list; - GNUNET_array_append (peer_ctx->outstanding_ops, peer_ctx->num_outstanding_ops, out_op); - } + if (GNUNET_NO == insert_in_gossip_list_scheduled (peer_ctx)) + { + out_op.op = insert_in_gossip_list; + out_op.op_cls = NULL; + GNUNET_array_append (peer_ctx->outstanding_ops, + peer_ctx->num_outstanding_ops, + out_op); + } - /* Issue livelyness test on peer */ - (void) get_channel (peer_map, peer); + /* Trigger livelyness test on peer */ + check_peer_live (peer_ctx); + } // send push/pull to each of those peers? } - else - rps_start (server); } /** - * Callback used to clean the multipeermap. + * Clean the send channel of a peer + */ +void +peer_clean (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)) + { + 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); + } + } +} + + +/** + * 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; + struct GNUNET_CADET_Channel *recv; + struct GNUNET_CADET_Channel *send; - peer_ctx = (struct PeerContext *) value; + if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (peer_map, value)) + { + peer_ctx = (struct PeerContext *) value; - if ( NULL != peer_ctx->mq) - GNUNET_MQ_destroy (peer_ctx->mq); + if (0 != peer_ctx->num_outstanding_ops) + GNUNET_array_grow (peer_ctx->outstanding_ops, + peer_ctx->num_outstanding_ops, + 0); - if ( NULL != peer_ctx->is_live_task) - GNUNET_CADET_notify_transmit_ready_cancel (peer_ctx->is_live_task); + if (NULL != peer_ctx->mq) + { + GNUNET_MQ_destroy (peer_ctx->mq); + peer_ctx->mq = NULL; + } + + + 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; + } + + send = peer_ctx->send_channel; + peer_ctx->send_channel = NULL; + if (NULL != send + && channel != send) + { + GNUNET_CADET_channel_destroy (send); + } - if ( NULL != peer_ctx->send_channel) - GNUNET_CADET_channel_destroy (peer_ctx->send_channel); - - if ( NULL != peer_ctx->recv_channel) - GNUNET_CADET_channel_destroy (peer_ctx->recv_channel); + recv = peer_ctx->send_channel; + peer_ctx->recv_channel = NULL; + if (NULL != recv + && channel != recv) + { + GNUNET_CADET_channel_destroy (recv); + } + + 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); + } - if (GNUNET_NO == GNUNET_CONTAINER_multipeermap_remove_all (peer_map, key)) - LOG (GNUNET_ERROR_TYPE_WARNING, "removing peer from peer_map failed\n"); - return GNUNET_YES; } @@ -1378,31 +2119,44 @@ peer_remove_cb (void *cls, const struct GNUNET_PeerIdentity *key, void *value) */ static void shutdown_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) + const struct GNUNET_SCHEDULER_TaskContext *tc) { LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS is going down\n"); - if ( NULL != do_round_task ) + if (NULL != do_round_task) { GNUNET_SCHEDULER_cancel (do_round_task); do_round_task = NULL; } - - if (GNUNET_SYSERR == GNUNET_CONTAINER_multipeermap_iterate (peer_map, peer_remove_cb, NULL)) + + { + if (GNUNET_SYSERR == + GNUNET_CONTAINER_multipeermap_iterate (peer_map, peer_remove_cb, NULL)) LOG (GNUNET_ERROR_TYPE_WARNING, "Iterating over peers to disconnect from them was cancelled\n"); - - GNUNET_CONTAINER_multipeermap_destroy (peer_map); + } GNUNET_NSE_disconnect (nse); GNUNET_CADET_disconnect (cadet_handle); - GNUNET_free (own_identity); - RPS_sampler_destroy (); - GNUNET_array_grow (request_deltas, request_deltas_size, 0); + RPS_sampler_destroy (prot_sampler); + RPS_sampler_destroy (client_sampler); + 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_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); + #ifdef ENABLE_MALICIOUS + GNUNET_array_grow (mal_peers, num_mal_peers, 0); + if (NULL != mal_peer_set) + GNUNET_CONTAINER_multipeermap_destroy (mal_peer_set); + if (NULL != att_peer_set) + GNUNET_CONTAINER_multipeermap_destroy (att_peer_set); + // TODO empty attacked_peers DLL + #endif /* ENABLE_MALICIOUS */ } @@ -1418,6 +2172,7 @@ handle_client_disconnect (void *cls, { } + /** * Handle the channel a peer opens to us. * @@ -1434,32 +2189,36 @@ handle_inbound_channel (void *cls, uint32_t port, enum GNUNET_CADET_ChannelOption options) { - struct PeerContext *ctx; + struct PeerContext *peer_ctx; + struct GNUNET_PeerIdentity peer; + peer = *initiator; LOG (GNUNET_ERROR_TYPE_DEBUG, "New channel was established to us (Peer %s).\n", - GNUNET_i2s (initiator)); + GNUNET_i2s (&peer)); GNUNET_assert (NULL != channel); // we might not even store the recv_channel - ctx = get_peer_ctx (peer_map, initiator); - if (NULL != ctx->recv_channel) - { - ctx->recv_channel = 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; - // FIXME there might already be an established channel + (void) GNUNET_CONTAINER_multipeermap_put (peer_map, &peer, peer_ctx, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); - //ctx->peer_flags = IN_OTHER_GOSSIP_LIST; - ctx->mq = NULL; // TODO create mq? + peer_is_live (peer_ctx); - (void) GNUNET_CONTAINER_multipeermap_put (peer_map, initiator, ctx, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); return NULL; // TODO } + /** * This is called when a remote peer destroys a channel. * @@ -1475,17 +2234,39 @@ cleanup_channel (void *cls, struct GNUNET_PeerIdentity *peer; struct PeerContext *peer_ctx; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Channel to remote peer was destroyed.\n"); - peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info ( (struct GNUNET_CADET_Channel *) channel, GNUNET_CADET_OPTION_PEER); // Guess simply casting isn't the nicest way... // FIXME wait for cadet to change this function - RPS_sampler_reinitialise_by_value (peer); - peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer); - /* Somwewhat {ab,re}use the iterator function */ - (void) peer_remove_cb (peer, peer, peer_ctx); + 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 probably went down */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Peer %s destroyed send channel - probably went down, 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); + } + 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; + } + } } @@ -1496,9 +2277,12 @@ cleanup_channel (void *cls, rps_start (struct GNUNET_SERVER_Handle *server) { static const struct GNUNET_SERVER_MessageHandler handlers[] = { - {&handle_client_request, NULL, GNUNET_MESSAGE_TYPE_RPS_CS_REQUEST, + {&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}, + {&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} }; @@ -1509,14 +2293,12 @@ rps_start (struct GNUNET_SERVER_Handle *server) LOG (GNUNET_ERROR_TYPE_DEBUG, "Ready to receive requests from clients\n"); - num_hist_update_tasks = 0; - do_round_task = GNUNET_SCHEDULER_add_now (&do_round, NULL); LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n"); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, - NULL); + &shutdown_task, + NULL); } @@ -1535,18 +2317,19 @@ run (void *cls, // TODO check what this does -- copied from gnunet-boss // - seems to work as expected GNUNET_log_setup ("rps", GNUNET_error_type_to_string (GNUNET_ERROR_TYPE_DEBUG), NULL); - - LOG (GNUNET_ERROR_TYPE_DEBUG, "RPS started\n"); - - cfg = c; /* Get own ID */ - own_identity = GNUNET_new (struct GNUNET_PeerIdentity); - GNUNET_CRYPTO_get_peer_identity (cfg, own_identity); // TODO check return value - GNUNET_assert (NULL != own_identity); - LOG (GNUNET_ERROR_TYPE_DEBUG, "Own identity is %s (at %p).\n", GNUNET_i2s (own_identity), own_identity); + GNUNET_CRYPTO_get_peer_identity (cfg, &own_identity); // TODO check return value + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "STARTING SERVICE (rps) for peer [%s]\n", + GNUNET_i2s (&own_identity)); + #ifdef ENABLE_MALICIOUS + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Malicious execution compiled in.\n"); + #endif /* ENABLE_MALICIOUS */ + /* Get time interval from the configuration */ @@ -1613,9 +2396,8 @@ run (void *cls, half_round_interval = GNUNET_TIME_relative_multiply (round_interval, .5); max_round_interval = GNUNET_TIME_relative_add (round_interval, half_round_interval); - RPS_sampler_init (sampler_size_est_need, max_round_interval, - insertCB, NULL, removeCB, NULL); - sampler_size = sampler_size_est_need; + prot_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval); + client_sampler = RPS_sampler_init (sampler_size_est_need, max_round_interval); /* Initialise push and pull maps */ push_list = NULL; @@ -1626,10 +2408,15 @@ run (void *cls, pending_pull_reply_list_size = 0; - LOG (GNUNET_ERROR_TYPE_DEBUG, "Requesting peers from CADET\n"); - GNUNET_CADET_get_peers (cadet_handle, &init_peer_cb, server); + 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? + + + rps_start (server); }