diff options
| author | Sander Vrijders <[email protected]> | 2016-10-12 11:10:31 +0200 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2016-10-12 11:10:31 +0200 |
| commit | 2ba45f5efe0486b88f91ecced451f74cc782e8a4 (patch) | |
| tree | 8b75a9cc0ea622965a12c6aa5e0d81132c987ca4 /src/tools/oping | |
| parent | 69ef99bb2dc05337e8189acc42dc9122f4182ead (diff) | |
| parent | b1dda618ce8cbb98f72c0b04925227889204e0c9 (diff) | |
| download | ouroboros-2ba45f5efe0486b88f91ecced451f74cc782e8a4.tar.gz ouroboros-2ba45f5efe0486b88f91ecced451f74cc782e8a4.zip | |
Merge remote-tracking branch 'upstream/be' into be-connection
Diffstat (limited to 'src/tools/oping')
| -rw-r--r-- | src/tools/oping/oping.c | 2 | ||||
| -rw-r--r-- | src/tools/oping/oping_client.c | 3 | ||||
| -rw-r--r-- | src/tools/oping/oping_server.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c index 7d2edf33..7d41b497 100644 --- a/src/tools/oping/oping.c +++ b/src/tools/oping/oping.c @@ -63,7 +63,7 @@ struct c { struct s { struct timespec times[OPING_MAX_FLOWS]; - struct flow_set * flows; + flow_set_t * flows; pthread_mutex_t lock; pthread_t cleaner_pt; diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c index 8b4e0fc2..4742d0de 100644 --- a/src/tools/oping/oping_client.c +++ b/src/tools/oping/oping_client.c @@ -73,8 +73,7 @@ void * reader(void * o) continue; if (ntohl(msg->type) != ECHO_REPLY) { - printf("Invalid message received (%d).\n", - msg->type); + printf("Invalid message on fd %d.\n", fd); continue; } diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c index 0ba47174..845f0cbd 100644 --- a/src/tools/oping/oping_server.c +++ b/src/tools/oping/oping_server.c @@ -83,8 +83,7 @@ void * server_thread(void *o) continue; if (ntohl(msg->type) != ECHO_REQUEST) { - printf("Invalid message on fd %d: type %d, len = %d.\n", - fd, ntohl(msg->type), msg_len); + printf("Invalid message on fd %d.", fd); continue; } |