diff options
| author | Nikias Bassen <nikias@gmx.li> | 2021-10-11 01:25:13 +0300 |
|---|---|---|
| committer | Nikias Bassen <nikias@gmx.li> | 2021-10-12 03:17:07 +0300 |
| commit | fa8bfb65c70edd4d2617fbbf970302beb9a4ced2 (patch) | |
| tree | 08bf90044dcda6073368e7f62d3f629984e1bb90 /src | |
| parent | b3d35fbcf7a1ac669c2e80fbd58920941a5d4c0c (diff) | |
| download | libimobiledevice-fa8bfb65c70edd4d2617fbbf970302beb9a4ced2.tar.gz | |
idevice: Add IDEVICE_E_CONNREFUSED and have idevice_connect() return meaningful error codes
This allows clients to properly detect that a connection to the requested
port failed because it is not open on the device, instead of just returning
an "unknown error"
Diffstat (limited to 'src')
| -rw-r--r-- | src/idevice.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/idevice.c b/src/idevice.c index 6a03c5e..04189d6 100644 --- a/src/idevice.c +++ b/src/idevice.c @@ -447,7 +447,15 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connect(idevice_t device, uint16_t if (device->conn_type == CONNECTION_USBMUXD) { int sfd = usbmuxd_connect(device->mux_id, port); if (sfd < 0) { - debug_info("ERROR: Connecting to usbmuxd failed: %d (%s)", sfd, strerror(-sfd)); + debug_info("ERROR: Connecting to usbmux device failed: %d (%s)", sfd, strerror(-sfd)); + switch (-sfd) { + case ECONNREFUSED: + return IDEVICE_E_CONNREFUSED; + case ENODEV: + return IDEVICE_E_NO_DEVICE; + default: + break; + } return IDEVICE_E_UNKNOWN_ERROR; } idevice_connection_t new_connection = (idevice_connection_t)malloc(sizeof(struct idevice_connection_private)); @@ -494,7 +502,14 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connect(idevice_t device, uint16_t int sfd = socket_connect_addr(saddr, port); if (sfd < 0) { - debug_info("ERROR: Connecting to network device failed: %d (%s)", errno, strerror(errno)); + int result = errno; + debug_info("ERROR: Connecting to network device failed: %d (%s)", result, strerror(result)); + switch (result) { + case ECONNREFUSED: + return IDEVICE_E_CONNREFUSED; + default: + break; + } return IDEVICE_E_NO_DEVICE; } |