diff options
| author | 2009-07-25 18:23:54 +0200 | |
|---|---|---|
| committer | 2009-07-25 18:23:54 +0200 | |
| commit | 19c9750d670435ce430f0fc85a55faf127bdfbf9 (patch) | |
| tree | 5d8cd8027fd339b587e322d5b1896878a68cb2f6 | |
| parent | da94f0ebc7232e8e9d0e629fe559b7bc93d9a1c6 (diff) | |
| download | libimobiledevice-19c9750d670435ce430f0fc85a55faf127bdfbf9.tar.gz libimobiledevice-19c9750d670435ce430f0fc85a55faf127bdfbf9.tar.bz2 | |
Conform to protocol and add session id argument to lockdownd_stop_session()
| -rw-r--r-- | include/libiphone/lockdown.h | 2 | ||||
| -rw-r--r-- | src/lockdown.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/libiphone/lockdown.h b/include/libiphone/lockdown.h index daa5800..af58190 100644 --- a/include/libiphone/lockdown.h +++ b/include/libiphone/lockdown.h | |||
| @@ -60,7 +60,7 @@ lockdownd_error_t lockdownd_get_value(lockdownd_client_t client, const char *dom | |||
| 60 | lockdownd_error_t lockdownd_set_value(lockdownd_client_t client, const char *domain, const char *key, plist_t value); | 60 | lockdownd_error_t lockdownd_set_value(lockdownd_client_t client, const char *domain, const char *key, plist_t value); |
| 61 | lockdownd_error_t lockdownd_remove_value(lockdownd_client_t client, const char *domain, const char *key); | 61 | lockdownd_error_t lockdownd_remove_value(lockdownd_client_t client, const char *domain, const char *key); |
| 62 | lockdownd_error_t lockdownd_start_service(lockdownd_client_t client, const char *service, int *port); | 62 | lockdownd_error_t lockdownd_start_service(lockdownd_client_t client, const char *service, int *port); |
| 63 | lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client); | 63 | lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client, const char *session_id); |
| 64 | lockdownd_error_t lockdownd_send(lockdownd_client_t client, plist_t plist); | 64 | lockdownd_error_t lockdownd_send(lockdownd_client_t client, plist_t plist); |
| 65 | lockdownd_error_t lockdownd_recv(lockdownd_client_t client, plist_t *plist); | 65 | lockdownd_error_t lockdownd_recv(lockdownd_client_t client, plist_t *plist); |
| 66 | lockdownd_error_t lockdownd_pair(lockdownd_client_t client, char *uuid, char *host_id); | 66 | lockdownd_error_t lockdownd_pair(lockdownd_client_t client, char *uuid, char *host_id); |
diff --git a/src/lockdown.c b/src/lockdown.c index 29e5046..bc430c9 100644 --- a/src/lockdown.c +++ b/src/lockdown.c | |||
| @@ -129,7 +129,7 @@ static int lockdown_check_result(plist_t dict, const char *query_match) | |||
| 129 | * | 129 | * |
| 130 | * @return an error code (LOCKDOWN_E_SUCCESS on success) | 130 | * @return an error code (LOCKDOWN_E_SUCCESS on success) |
| 131 | */ | 131 | */ |
| 132 | lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client) | 132 | lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client, const char *session_id) |
| 133 | { | 133 | { |
| 134 | if (!client) | 134 | if (!client) |
| 135 | return LOCKDOWN_E_INVALID_ARG; | 135 | return LOCKDOWN_E_INVALID_ARG; |
| @@ -140,7 +140,7 @@ lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client) | |||
| 140 | plist_add_sub_key_el(dict, "Request"); | 140 | plist_add_sub_key_el(dict, "Request"); |
| 141 | plist_add_sub_string_el(dict, "StopSession"); | 141 | plist_add_sub_string_el(dict, "StopSession"); |
| 142 | plist_add_sub_key_el(dict, "SessionID"); | 142 | plist_add_sub_key_el(dict, "SessionID"); |
| 143 | plist_add_sub_string_el(dict, client->session_id); | 143 | plist_add_sub_string_el(dict, session_id); |
| 144 | 144 | ||
| 145 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: called\n", __func__); | 145 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: called\n", __func__); |
| 146 | 146 | ||
| @@ -186,7 +186,7 @@ static lockdownd_error_t lockdownd_stop_ssl_session(lockdownd_client_t client) | |||
| 186 | 186 | ||
| 187 | if (client->in_SSL) { | 187 | if (client->in_SSL) { |
| 188 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: stopping SSL session\n", __func__); | 188 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: stopping SSL session\n", __func__); |
| 189 | ret = lockdownd_stop_session(client); | 189 | ret = lockdownd_stop_session(client, client->session_id); |
| 190 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: sending SSL close notify\n", __func__); | 190 | log_dbg_msg(DBGMASK_LOCKDOWND, "%s: sending SSL close notify\n", __func__); |
| 191 | gnutls_bye(*client->ssl_session, GNUTLS_SHUT_RDWR); | 191 | gnutls_bye(*client->ssl_session, GNUTLS_SHUT_RDWR); |
| 192 | } | 192 | } |
