aboutsummaryrefslogtreecommitdiff
path: root/src/rps/rps_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/rps/rps_api.c')
-rw-r--r--src/rps/rps_api.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 00f817468..7afe21d3a 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -78,7 +78,7 @@ struct GNUNET_RPS_Handle
78 78
79 79
80/** 80/**
81 * Handler to single requests from the client. 81 * Handler for a single request from a client.
82 */ 82 */
83struct GNUNET_RPS_Request_Handle 83struct GNUNET_RPS_Request_Handle
84{ 84{
@@ -95,7 +95,12 @@ struct GNUNET_RPS_Request_Handle
95 /** 95 /**
96 * The number of requested peers. 96 * The number of requested peers.
97 */ 97 */
98 uint32_t num_peers; 98 uint32_t num_requests;
99
100 /**
101 * @brief The Sampler for the client request
102 */
103 struct RPS_Sampler *sampler;
99 104
100 /** 105 /**
101 * The callback to be called when we receive an answer. 106 * The callback to be called when we receive an answer.
@@ -131,6 +136,7 @@ struct cb_cls_pack
131 struct GNUNET_CLIENT_Connection *service_conn; 136 struct GNUNET_CLIENT_Connection *service_conn;
132}; 137};
133 138
139
134/** 140/**
135 * @brief Send a request to the service. 141 * @brief Send a request to the service.
136 * 142 *
@@ -170,7 +176,7 @@ resend_requests_iterator (void *cls, uint32_t key, void *value)
170 const struct GNUNET_RPS_Request_Handle *req_handle = value; 176 const struct GNUNET_RPS_Request_Handle *req_handle = value;
171 (void) key; 177 (void) key;
172 178
173 send_request (h, req_handle->id, req_handle->num_peers); 179 send_request (h, req_handle->id, req_handle->num_requests);
174 return GNUNET_YES; /* continue iterating */ 180 return GNUNET_YES; /* continue iterating */
175} 181}
176 182
@@ -248,7 +254,7 @@ handle_reply (void *cls,
248 GNUNET_CONTAINER_multihashmap32_contains (h->req_handlers, id)); 254 GNUNET_CONTAINER_multihashmap32_contains (h->req_handlers, id));
249 rh = GNUNET_CONTAINER_multihashmap32_get (h->req_handlers, id); 255 rh = GNUNET_CONTAINER_multihashmap32_get (h->req_handlers, id);
250 GNUNET_assert (NULL != rh); 256 GNUNET_assert (NULL != rh);
251 GNUNET_assert (rh->num_peers == ntohl (msg->num_peers)); 257 GNUNET_assert (rh->num_requests == ntohl (msg->num_peers));
252 GNUNET_CONTAINER_multihashmap32_remove_all (h->req_handlers, id); 258 GNUNET_CONTAINER_multihashmap32_remove_all (h->req_handlers, id);
253 rh->ready_cb (rh->ready_cb_cls, 259 rh->ready_cb (rh->ready_cb_cls,
254 ntohl (msg->num_peers), 260 ntohl (msg->num_peers),
@@ -422,7 +428,7 @@ handle_stream_input (void *cls,
422 peers = (struct GNUNET_PeerIdentity *) &msg[1]; 428 peers = (struct GNUNET_PeerIdentity *) &msg[1];
423 GNUNET_assert (NULL != h); 429 GNUNET_assert (NULL != h);
424 GNUNET_assert (NULL != h->stream_input_cb); 430 GNUNET_assert (NULL != h->stream_input_cb);
425 h->stream_input_cb (h->stream_input_cb, ntohl (msg->num_peers), peers); 431 h->stream_input_cb (h->stream_input_cls, ntohl (msg->num_peers), peers);
426} 432}
427 433
428 434