diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-10 16:00:10 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-10 16:00:10 +0200 |
| commit | 533df37ac3a643017dba96283791d36934e15464 (patch) | |
| tree | db9bca81c40407328d9c42d95ac893647b11c3af /src/lib/dev.c | |
| parent | 26b20744a441705accbe550aa0b996f8601a9404 (diff) | |
| parent | 25e76def21829edef7ef9bca0a028cccfabb944a (diff) | |
| download | ouroboros-533df37ac3a643017dba96283791d36934e15464.tar.gz ouroboros-533df37ac3a643017dba96283791d36934e15464.zip | |
Merged in sandervrijders/ouroboros/be-timeout (pull request #202)
lib, irmd, ipcp: Add socket timeout
Diffstat (limited to 'src/lib/dev.c')
| -rw-r--r-- | src/lib/dev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c index cc332233..c8577feb 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -159,10 +159,9 @@ int flow_accept(char ** ae_name) pthread_rwlock_unlock(&_ap_instance->data_lock); - recv_msg = send_recv_irm_msg(&msg); - if (recv_msg == NULL) { + recv_msg = send_recv_irm_msg_b(&msg); + if (recv_msg == NULL) return -1; - } if (!recv_msg->has_api || !recv_msg->has_port_id) { irm_msg__free_unpacked(recv_msg, NULL); @@ -358,7 +357,7 @@ int flow_alloc_res(int fd) pthread_rwlock_unlock(&_ap_instance->flows_lock); pthread_rwlock_unlock(&_ap_instance->data_lock); - recv_msg = send_recv_irm_msg(&msg); + recv_msg = send_recv_irm_msg_b(&msg); if (recv_msg == NULL) { return -1; } |