Merged in dstaesse/ouroboros/be-bugfixing (pull request #187)

bugfixes

1 files changed, 7 insertions, 1 deletions

diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index 7693ce41..0d4a10af 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -115,7 +115,8 @@ void * writer(void * o)
 {
         int * fdp = (int *) o;
         struct timespec now;
-        struct timespec wait = {client.interval / 1000, client.interval % 1000};
+        struct timespec wait = {client.interval / 1000,
+                                (client.interval % 1000) * MILLION};
         struct oping_msg * msg;
         char * buf = malloc(client.size);
 
@@ -132,12 +133,15 @@ void * writer(void * o)
         printf("Pinging %s with %d bytes of data:\n\n",
                client.s_apn, client.size);
 
+        pthread_cleanup_push((void (*) (void *)) free, buf);
+
         while (client.sent < client.count) {
                 nanosleep(&wait, NULL);
                 msg->id = htonl(client.sent);
                 if (flow_write(*fdp, buf, client.size) == -1) {
                         printf("Failed to send SDU.\n");
                         flow_dealloc(*fdp);
+                        free(buf);
                         return (void *) -1;
                 }
 
@@ -148,6 +152,8 @@ void * writer(void * o)
                 pthread_mutex_unlock(&client.lock);
         }
 
+        pthread_cleanup_pop(true);
+
         return (void *) 0;
 }