diff options
| author |  Nikias Bassen | 2019-06-16 01:25:12 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2019-06-16 01:25:12 +0200 |
| commit | 7a0ab5f8f25b1c7f0c7313d7feda9c41c8058702 (patch) | |
| tree | 77bf5af2a551d44536089dbf3aa26227283f3c36 /src | |
| parent | fa1c5a9029b321adc2597bbe76920e5a7efd785b (diff) | |
| download | libimobiledevice-7a0ab5f8f25b1c7f0c7313d7feda9c41c8058702.tar.gz libimobiledevice-7a0ab5f8f25b1c7f0c7313d7feda9c41c8058702.tar.bz2 | |
syslog_relay: Fix timeout issue introduced with recent libusbmuxd commit ca245709
Diffstat (limited to 'src')
| -rw-r--r-- | src/syslog_relay.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/syslog_relay.c b/src/syslog_relay.c index 3be84e0..0d71392 100644 --- a/src/syslog_relay.c +++ b/src/syslog_relay.c @@ -55,6 +55,10 @@ static syslog_relay_error_t syslog_relay_error(service_error_t err) return SYSLOG_RELAY_E_MUX_ERROR; case SERVICE_E_SSL_ERROR: return SYSLOG_RELAY_E_SSL_ERROR; + case SERVICE_E_NOT_ENOUGH_DATA: + return SYSLOG_RELAY_E_NOT_ENOUGH_DATA; + case SERVICE_E_TIMEOUT: + return SYSLOG_RELAY_E_TIMEOUT; default: break; } @@ -129,7 +133,7 @@ LIBIMOBILEDEVICE_API syslog_relay_error_t syslog_relay_receive_with_timeout(sysl } res = syslog_relay_error(service_receive_with_timeout(client->parent, data, size, (uint32_t*)&bytes, timeout)); - if (bytes <= 0) { + if (res != SYSLOG_RELAY_E_SUCCESS && res != SYSLOG_RELAY_E_TIMEOUT && res != SYSLOG_RELAY_E_NOT_ENOUGH_DATA) { debug_info("Could not read data, error %d", res); } if (received) { @@ -153,7 +157,7 @@ void *syslog_relay_worker(void *arg) char c; uint32_t bytes = 0; ret = syslog_relay_receive_with_timeout(srwt->client, &c, 1, &bytes, 100); - if ((bytes == 0) && (ret == SYSLOG_RELAY_E_SUCCESS)) { + if (ret == SYSLOG_RELAY_E_TIMEOUT || ret == SYSLOG_RELAY_E_NOT_ENOUGH_DATA || ((bytes == 0) && (ret == SYSLOG_RELAY_E_SUCCESS))) { continue; } else if (ret < 0) { debug_info("Connection to syslog relay interrupted"); |