diff options
| author | 2010-01-12 16:44:49 +0100 | |
|---|---|---|
| committer | 2010-01-12 16:44:49 +0100 | |
| commit | d07e1052c13ee472a34e90a4d87fbc3ddd2ad63f (patch) | |
| tree | 3a7f9bc359ce4e180013e19bb08ad701029f7845 /src/lockdown.c | |
| parent | 4a8b8455e358afd1a42f52cbf342fd6c7f9ccbbd (diff) | |
| download | libimobiledevice-d07e1052c13ee472a34e90a4d87fbc3ddd2ad63f.tar.gz libimobiledevice-d07e1052c13ee472a34e90a4d87fbc3ddd2ad63f.tar.bz2 | |
Rename in_SSL to ssl_enabled within lockdown private struct
Diffstat (limited to 'src/lockdown.c')
| -rw-r--r-- | src/lockdown.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lockdown.c b/src/lockdown.c index 5cf90a5..5717e52 100644 --- a/src/lockdown.c +++ b/src/lockdown.c | |||
| @@ -193,7 +193,7 @@ static lockdownd_error_t lockdownd_stop_ssl_session(lockdownd_client_t client) | |||
| 193 | } | 193 | } |
| 194 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; | 194 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; |
| 195 | 195 | ||
| 196 | if (client->in_SSL) { | 196 | if (client->ssl_enabled) { |
| 197 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: stopping SSL session\n", __func__); | 197 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: stopping SSL session\n", __func__); |
| 198 | ret = lockdownd_stop_session(client); | 198 | ret = lockdownd_stop_session(client); |
| 199 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: sending SSL close notify\n", __func__); | 199 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: sending SSL close notify\n", __func__); |
| @@ -205,7 +205,7 @@ static lockdownd_error_t lockdownd_stop_ssl_session(lockdownd_client_t client) | |||
| 205 | if (client->ssl_certificate) { | 205 | if (client->ssl_certificate) { |
| 206 | gnutls_certificate_free_credentials(client->ssl_certificate); | 206 | gnutls_certificate_free_credentials(client->ssl_certificate); |
| 207 | } | 207 | } |
| 208 | client->in_SSL = 0; | 208 | client->ssl_enabled = 0; |
| 209 | 209 | ||
| 210 | return ret; | 210 | return ret; |
| 211 | } | 211 | } |
| @@ -277,7 +277,7 @@ lockdownd_error_t lockdownd_recv(lockdownd_client_t client, plist_t *plist) | |||
| 277 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; | 277 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; |
| 278 | property_list_service_error_t err; | 278 | property_list_service_error_t err; |
| 279 | 279 | ||
| 280 | if (!client->in_SSL) { | 280 | if (!client->ssl_enabled) { |
| 281 | err = property_list_service_receive_plist(client->parent, plist); | 281 | err = property_list_service_receive_plist(client->parent, plist); |
| 282 | if (err != PROPERTY_LIST_SERVICE_E_SUCCESS) { | 282 | if (err != PROPERTY_LIST_SERVICE_E_SUCCESS) { |
| 283 | ret = LOCKDOWN_E_UNKNOWN_ERROR; | 283 | ret = LOCKDOWN_E_UNKNOWN_ERROR; |
| @@ -313,7 +313,7 @@ lockdownd_error_t lockdownd_send(lockdownd_client_t client, plist_t plist) | |||
| 313 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; | 313 | lockdownd_error_t ret = LOCKDOWN_E_SUCCESS; |
| 314 | iphone_error_t err; | 314 | iphone_error_t err; |
| 315 | 315 | ||
| 316 | if (!client->in_SSL) { | 316 | if (!client->ssl_enabled) { |
| 317 | err = property_list_service_send_xml_plist(client->parent, plist); | 317 | err = property_list_service_send_xml_plist(client->parent, plist); |
| 318 | if (err != PROPERTY_LIST_SERVICE_E_SUCCESS) { | 318 | if (err != PROPERTY_LIST_SERVICE_E_SUCCESS) { |
| 319 | ret = LOCKDOWN_E_UNKNOWN_ERROR; | 319 | ret = LOCKDOWN_E_UNKNOWN_ERROR; |
| @@ -644,7 +644,7 @@ lockdownd_error_t lockdownd_client_new(iphone_device_t device, lockdownd_client_ | |||
| 644 | client_loc->parent = plistclient; | 644 | client_loc->parent = plistclient; |
| 645 | client_loc->ssl_session = NULL; | 645 | client_loc->ssl_session = NULL; |
| 646 | client_loc->ssl_certificate = NULL; | 646 | client_loc->ssl_certificate = NULL; |
| 647 | client_loc->in_SSL = 0; | 647 | client_loc->ssl_enabled = 0; |
| 648 | client_loc->session_id = NULL; | 648 | client_loc->session_id = NULL; |
| 649 | client_loc->uuid = NULL; | 649 | client_loc->uuid = NULL; |
| 650 | client_loc->label = NULL; | 650 | client_loc->label = NULL; |
| @@ -1152,7 +1152,7 @@ lockdownd_error_t lockdownd_start_ssl_session(lockdownd_client_t client, const c | |||
| 1152 | session_ok = 1; | 1152 | session_ok = 1; |
| 1153 | } | 1153 | } |
| 1154 | if (session_ok && !UseSSL) { | 1154 | if (session_ok && !UseSSL) { |
| 1155 | client->in_SSL = 0; | 1155 | client->ssl_enabled = 0; |
| 1156 | ret = LOCKDOWN_E_SUCCESS; | 1156 | ret = LOCKDOWN_E_SUCCESS; |
| 1157 | } else if (session_ok) { | 1157 | } else if (session_ok) { |
| 1158 | // Set up GnuTLS... | 1158 | // Set up GnuTLS... |
| @@ -1196,7 +1196,7 @@ lockdownd_error_t lockdownd_start_ssl_session(lockdownd_client_t client, const c | |||
| 1196 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: oh.. errno says %s\n", __func__, strerror(errno)); | 1196 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: oh.. errno says %s\n", __func__, strerror(errno)); |
| 1197 | return LOCKDOWN_E_SSL_ERROR; | 1197 | return LOCKDOWN_E_SSL_ERROR; |
| 1198 | } else { | 1198 | } else { |
| 1199 | client->in_SSL = 1; | 1199 | client->ssl_enabled = 1; |
| 1200 | ret = LOCKDOWN_E_SUCCESS; | 1200 | ret = LOCKDOWN_E_SUCCESS; |
| 1201 | } | 1201 | } |
| 1202 | } | 1202 | } |
| @@ -1309,7 +1309,7 @@ lockdownd_error_t lockdownd_start_service(lockdownd_client_t client, const char | |||
| 1309 | userpref_get_host_id(&host_id); | 1309 | userpref_get_host_id(&host_id); |
| 1310 | if (!host_id) | 1310 | if (!host_id) |
| 1311 | return LOCKDOWN_E_INVALID_CONF; | 1311 | return LOCKDOWN_E_INVALID_CONF; |
| 1312 | if (!client->in_SSL && !lockdownd_start_ssl_session(client, host_id)) | 1312 | if (!client->ssl_enabled && !lockdownd_start_ssl_session(client, host_id)) |
| 1313 | return LOCKDOWN_E_SSL_ERROR; | 1313 | return LOCKDOWN_E_SSL_ERROR; |
| 1314 | 1314 | ||
| 1315 | plist_t dict = NULL; | 1315 | plist_t dict = NULL; |
