diff options
author | Julius Bünger <buenger@mytum.de> | 2018-07-26 17:04:44 +0200 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2018-07-26 17:04:44 +0200 |
commit | a53cfea7ff589a4710671da427186648551008d5 (patch) | |
tree | e6c297df85f6b74bacac1c85a1b84b7d61464ff7 | |
parent | 75885ed261991edb96d0f585c1ddef0cdaa97395 (diff) | |
download | gnunet-a53cfea7ff589a4710671da427186648551008d5.tar.gz gnunet-a53cfea7ff589a4710671da427186648551008d5.zip |
rps profiler: destroy pending req and rep in right place
-rw-r--r-- | src/rps/gnunet-rps-profiler.c | 12 |
1 files 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) | |||
922 | void | 922 | void |
923 | clean_peer (unsigned peer_index) | 923 | clean_peer (unsigned peer_index) |
924 | { | 924 | { |
925 | struct PendingReply *pending_rep; | ||
926 | struct PendingRequest *pending_req; | 925 | struct PendingRequest *pending_req; |
927 | 926 | ||
928 | pending_rep = rps_peers[peer_index].pending_rep_head; | 927 | while (NULL != (pending_req = rps_peers[peer_index].pending_req_head)) |
929 | while (NULL != (pending_rep = rps_peers[peer_index].pending_rep_head)) | ||
930 | { | 928 | { |
931 | cancel_request (pending_rep); | 929 | cancel_pending_req (pending_req); |
932 | } | 930 | } |
933 | pending_req = rps_peers[peer_index].pending_req_head; | 931 | pending_req = rps_peers[peer_index].pending_req_head; |
934 | rps_disconnect_adapter (&rps_peers[peer_index], | 932 | rps_disconnect_adapter (&rps_peers[peer_index], |
@@ -1273,7 +1271,7 @@ rps_disconnect_adapter (void *cls, | |||
1273 | { | 1271 | { |
1274 | struct RPSPeer *peer = cls; | 1272 | struct RPSPeer *peer = cls; |
1275 | struct GNUNET_RPS_Handle *h = op_result; | 1273 | struct GNUNET_RPS_Handle *h = op_result; |
1276 | struct PendingRequest *pending_req; | 1274 | struct PendingReply *pending_rep; |
1277 | 1275 | ||
1278 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1276 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1279 | "disconnect_adapter (%u)\n", | 1277 | "disconnect_adapter (%u)\n", |
@@ -1281,9 +1279,9 @@ rps_disconnect_adapter (void *cls, | |||
1281 | GNUNET_assert (NULL != peer); | 1279 | GNUNET_assert (NULL != peer); |
1282 | if (NULL != peer->rps_handle) | 1280 | if (NULL != peer->rps_handle) |
1283 | { | 1281 | { |
1284 | while (NULL != (pending_req = peer->pending_req_head)) | 1282 | while (NULL != (pending_rep = peer->pending_rep_head)) |
1285 | { | 1283 | { |
1286 | cancel_pending_req (pending_req); | 1284 | cancel_request (pending_rep); |
1287 | } | 1285 | } |
1288 | GNUNET_assert (h == peer->rps_handle); | 1286 | GNUNET_assert (h == peer->rps_handle); |
1289 | GNUNET_RPS_disconnect (h); | 1287 | GNUNET_RPS_disconnect (h); |