From 58460c9bd04ea8895ccbafb6f01174362435c35a Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Thu, 27 Apr 2017 14:04:31 +0900 Subject: [PATCH] apps/iperf: cleanup timer when test is terminated Add missing cleanup timer when test is terminated. Change-Id: I2a3d80348e942f4b2ffec9bdd6cf697c65826668 Signed-off-by: EunBong Song --- apps/examples/iperf/iperf_api.c | 2 ++ apps/examples/iperf/iperf_main.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/apps/examples/iperf/iperf_api.c b/apps/examples/iperf/iperf_api.c index c9ed4fe..347e9d4 100644 --- a/apps/examples/iperf/iperf_api.c +++ b/apps/examples/iperf/iperf_api.c @@ -1945,6 +1945,8 @@ void iperf_free_test(struct iperf_test *test) tmr_cancel(test->reporter_timer); } + tmr_cleanup(); + /* Free protocol list */ while (!SLIST_EMPTY(&test->protocols)) { prot = SLIST_FIRST(&test->protocols); diff --git a/apps/examples/iperf/iperf_main.c b/apps/examples/iperf/iperf_main.c index 27c45b8..b2bac3a 100644 --- a/apps/examples/iperf/iperf_main.c +++ b/apps/examples/iperf/iperf_main.c @@ -130,6 +130,7 @@ int iperf_main(int argc, char **argv) } if (run(test) < 0) { + iperf_free_test(test); iperf_errexit(test, "error - %s", iperf_strerror(i_errno)); } @@ -162,6 +163,8 @@ static int run(struct iperf_test *test) break; case 'c': if (iperf_run_client(test) < 0) { + close(test->ctrl_sck); + iperf_free_test(test); iperf_errexit(test, "error - %s", iperf_strerror(i_errno)); } break; -- 2.7.4