diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-12-02 21:01:07 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-12-02 21:01:07 +0000 |
| commit | cfa405bba7ebfa67f3b7b959a4257c7ed1dd20b2 (patch) | |
| tree | e2297913905a6a9b3e89843bf6b4c05f30223d71 | |
| parent | 08aa32a59162e4383e2782dbf0419c61a0d22524 (diff) | |
| parent | f1d67740ee202c6c3af2061df8cafdd265061b59 (diff) | |
| download | ouroboros-cfa405bba7ebfa67f3b7b959a4257c7ed1dd20b2.tar.gz ouroboros-cfa405bba7ebfa67f3b7b959a4257c7ed1dd20b2.zip | |
Merged in dstaesse/ouroboros/be-pi (pull request #315)
tools: Fix compilation issues on 32 bit machines
| -rw-r--r-- | src/tools/operf/operf.c | 4 | ||||
| -rw-r--r-- | src/tools/oping/oping.c | 13 | ||||
| -rw-r--r-- | src/tools/oping/oping_client.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/tools/operf/operf.c b/src/tools/operf/operf.c index 46dfc14d..808a8807 100644 --- a/src/tools/operf/operf.c +++ b/src/tools/operf/operf.c @@ -44,8 +44,8 @@ struct c { bool sleep; int duration; - size_t sent; - size_t rcvd; + uint64_t sent; + uint64_t rcvd; flow_set_t * flows; fqueue_t * fq; diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c index 8bb01daf..98d12a7b 100644 --- a/src/tools/oping/oping.c +++ b/src/tools/oping/oping.c @@ -40,14 +40,15 @@ #define OPING_MAX_FLOWS 256 struct c { - char * s_apn; - int interval; - int count; - int size; + char * s_apn; + int interval; + uint32_t count; + int size; /* stats */ - int sent; - int rcvd; + uint32_t sent; + uint32_t rcvd; + double rtt_min; double rtt_max; double rtt_avg; diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c index 1ce96a75..b30ba5f4 100644 --- a/src/tools/oping/oping_client.c +++ b/src/tools/oping/oping_client.c @@ -81,7 +81,7 @@ void * reader(void * o) continue; } - if (ntohl(msg->id) >= (ssize_t) client.count) { + if (ntohl(msg->id) >= client.count) { printf("Invalid id.\n"); continue; } |