From a53cfea7ff589a4710671da427186648551008d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julius=20B=C3=BCnger?= Date: Thu, 26 Jul 2018 17:04:44 +0200 Subject: [PATCH] rps profiler: destroy pending req and rep in right place --- src/rps/gnunet-rps-profiler.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index a06598764..49714872f 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -922,13 +922,11 @@ cancel_request (struct PendingReply *pending_rep) void clean_peer (unsigned peer_index) { - struct PendingReply *pending_rep; struct PendingRequest *pending_req; - pending_rep = rps_peers[peer_index].pending_rep_head; - while (NULL != (pending_rep = rps_peers[peer_index].pending_rep_head)) + while (NULL != (pending_req = rps_peers[peer_index].pending_req_head)) { - cancel_request (pending_rep); + cancel_pending_req (pending_req); } pending_req = rps_peers[peer_index].pending_req_head; rps_disconnect_adapter (&rps_peers[peer_index], @@ -1273,7 +1271,7 @@ rps_disconnect_adapter (void *cls, { struct RPSPeer *peer = cls; struct GNUNET_RPS_Handle *h = op_result; - struct PendingRequest *pending_req; + struct PendingReply *pending_rep; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnect_adapter (%u)\n", @@ -1281,9 +1279,9 @@ rps_disconnect_adapter (void *cls, GNUNET_assert (NULL != peer); if (NULL != peer->rps_handle) { - while (NULL != (pending_req = peer->pending_req_head)) + while (NULL != (pending_rep = peer->pending_rep_head)) { - cancel_pending_req (pending_req); + cancel_request (pending_rep); } GNUNET_assert (h == peer->rps_handle); GNUNET_RPS_disconnect (h); -- 2.25.1