summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2018-03-04 10:39:51 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2018-03-05 10:43:30 +0100
commitdde082e5f37457f8914857714093c534ccf8d845 (patch)
tree98f11abd3e0be6bb32b71994237408f6b0d916fe
parenteb8ed5e4ebef1b34bc6dd749fb7210cac618a9fe (diff)
downloadouroboros-dde082e5f37457f8914857714093c534ccf8d845.tar.gz
ouroboros-dde082e5f37457f8914857714093c534ccf8d845.zip
tools: Don't cancel reader thread in oping0.10.5
The reader thread was cancelled as soon as the writer was finished, which resulted in missed responses and misreported packet loss. Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be> Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/tools/oping/oping_client.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42fbc0d6..02e67be8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ include(GNUInstallDirs)
set(PACKAGE_VERSION_MAJOR 0)
set(PACKAGE_VERSION_MINOR 10)
-set(PACKAGE_VERSION_PATCH 4)
+set(PACKAGE_VERSION_PATCH 5)
set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set(PACKAGE_DESCRIPTION "The Ouroboros prototype")
diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index 07fbde74..dbbbfa19 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -218,8 +218,6 @@ static int client_main(void)
pthread_create(&client.writer_pt, NULL, writer, &fd);
pthread_join(client.writer_pt, NULL);
-
- pthread_cancel(client.reader_pt);
pthread_join(client.reader_pt, NULL);
clock_gettime(CLOCK_REALTIME, &toc);