diff options
| author | 2014-01-25 21:41:29 +0100 | |
|---|---|---|
| committer | 2014-01-25 21:41:29 +0100 | |
| commit | b3e2954930f99e450cd944517fe3577aba176645 (patch) | |
| tree | 6769c86fc8cc57057430b34961f0fbaf9d86ae7b /src/lockdown.c | |
| parent | 56392428a49543bab4b12431451ec04bb799c411 (diff) | |
| download | libimobiledevice-b3e2954930f99e450cd944517fe3577aba176645.tar.gz libimobiledevice-b3e2954930f99e450cd944517fe3577aba176645.tar.bz2 | |
Revert "lockdown: do not send Goodbye when SSL session was active"
This reverts commit 56392428a49543bab4b12431451ec04bb799c411.
Actually I committed this because of usbmuxd complaining about a TCP RST.
But lockdownd is now complaining since it waits for the Goodbye packet
(which I apparently didn't see during testing).
Diffstat (limited to 'src/lockdown.c')
| -rw-r--r-- | src/lockdown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lockdown.c b/src/lockdown.c index 536207f..a0bc2f4 100644 --- a/src/lockdown.c +++ b/src/lockdown.c | |||
| @@ -269,7 +269,7 @@ lockdownd_error_t lockdownd_client_free(lockdownd_client_t client) | |||
| 269 | lockdownd_stop_session(client, client->session_id); | 269 | lockdownd_stop_session(client, client->session_id); |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | if (!client->ssl_enabled) { | 272 | if (client->parent) { |
| 273 | lockdownd_goodbye(client); | 273 | lockdownd_goodbye(client); |
| 274 | } | 274 | } |
| 275 | 275 | ||
| @@ -1173,7 +1173,7 @@ lockdownd_error_t lockdownd_enter_recovery(lockdownd_client_t client) | |||
| 1173 | */ | 1173 | */ |
| 1174 | lockdownd_error_t lockdownd_goodbye(lockdownd_client_t client) | 1174 | lockdownd_error_t lockdownd_goodbye(lockdownd_client_t client) |
| 1175 | { | 1175 | { |
| 1176 | if (!client || !client->parent) | 1176 | if (!client) |
| 1177 | return LOCKDOWN_E_INVALID_ARG; | 1177 | return LOCKDOWN_E_INVALID_ARG; |
| 1178 | 1178 | ||
| 1179 | lockdownd_error_t ret = LOCKDOWN_E_UNKNOWN_ERROR; | 1179 | lockdownd_error_t ret = LOCKDOWN_E_UNKNOWN_ERROR; |
