summaryrefslogtreecommitdiff
path: root/src/tools/oping/oping_server.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-12-12 15:20:07 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-12-12 15:20:07 +0100
commitfc8d30f2d6e9f3e463aff81a1630ff56f9463a22 (patch)
treed91c005451a74822516669f3f7cc3ade34971abb /src/tools/oping/oping_server.c
parented6ac5db8474edabe83f0cdcbe7f258f0859ea41 (diff)
parentf8c14e0246a6c9cb5e8ff47869b5968abb63f010 (diff)
downloadouroboros-fc8d30f2d6e9f3e463aff81a1630ff56f9463a22.tar.gz
ouroboros-fc8d30f2d6e9f3e463aff81a1630ff56f9463a22.zip
Merged in dstaesse/ouroboros/be-timeout (pull request #323)
Be timeout
Diffstat (limited to 'src/tools/oping/oping_server.c')
-rw-r--r--src/tools/oping/oping_server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 8d7ab1db..63fca567 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -115,7 +115,7 @@ void * accept_thread(void * o)
{
int fd = 0;
struct timespec now = {0, 0};
- struct qos_spec qs;
+ qosspec_t qs;
(void) o;
@@ -143,7 +143,7 @@ void * accept_thread(void * o)
server.times[fd] = now;
pthread_mutex_unlock(&server.lock);
- flow_cntl(fd, FLOW_F_SETFL, FLOW_O_NONBLOCK | FLOW_O_RDWR);
+ flow_set_flags(fd, FLOW_O_NONBLOCK | FLOW_O_RDWR);
}
return (void *) 0;