mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

robustize account creator and xmlrpc session

Browse source
This commit is contained in:
Simon Morlat 2016-09-30 16:06:38 +02:00
parent a143948e26
commit 690f2aa182
4 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/account_creator.c
View file

@ -119,7 +119,7 @@ void linphone_account_creator_cbs_set_recover_phone_account(LinphoneAccountCreat
static void _linphone_account_creator_destroy(LinphoneAccountCreator *creator) {
linphone_xml_rpc_session_unref(creator->xmlrpc_session);
linphone_xml_rpc_session_release(creator->xmlrpc_session); /*this will drop all pending requests if any*/
linphone_account_creator_cbs_unref(creator->callbacks);
if (creator->username) ms_free(creator->username);
if (creator->password) ms_free(creator->password);

1
coreapi/private.h
View file

@ -1313,6 +1313,7 @@ struct _LinphoneXmlRpcSession {
void *user_data;
LinphoneCore *core;
char *url;
bool_t released;
};
BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcSession);

38
coreapi/xmlrpc.c
View file

@ -157,12 +157,23 @@ static void free_arg(LinphoneXmlRpcArg *arg) {
belle_sip_free(arg);
}
static bool_t linphone_xml_rpc_request_aborted(LinphoneXmlRpcRequest *req){
LinphoneXmlRpcSession *session = (LinphoneXmlRpcSession*) belle_sip_object_data_get(BELLE_SIP_OBJECT(req), "session");
if (!session){
ms_error("linphone_xml_rpc_request_aborted(): no session, this should not happen.");
return FALSE;
}
return session->released;
}
static void process_io_error_from_post_xml_rpc_request(void *data, const belle_sip_io_error_event_t *event) {
LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
ms_error("I/O Error during XML-RPC request sending");
request->status = LinphoneXmlRpcStatusFailed;
if (request->callbacks->response != NULL) {
request->callbacks->response(request);
if (!linphone_xml_rpc_request_aborted(request)){
request->status = LinphoneXmlRpcStatusFailed;
if (request->callbacks->response != NULL) {
request->callbacks->response(request);
}
}
linphone_xml_rpc_request_unref(request);
}
@ -170,9 +181,11 @@ static void process_io_error_from_post_xml_rpc_request(void *data, const belle_s
static void process_auth_requested_from_post_xml_rpc_request(void *data, belle_sip_auth_event_t *event) {
LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
ms_error("Authentication error during XML-RPC request sending");
request->status = LinphoneXmlRpcStatusFailed;
if (request->callbacks->response != NULL) {
request->callbacks->response(request);
if (!linphone_xml_rpc_request_aborted(request)){
request->status = LinphoneXmlRpcStatusFailed;
if (request->callbacks->response != NULL) {
request->callbacks->response(request);
}
}
linphone_xml_rpc_request_unref(request);
}
@ -225,7 +238,7 @@ static void process_response_from_post_xml_rpc_request(void *data, const belle_h
LinphoneXmlRpcRequest *request = (LinphoneXmlRpcRequest *)data;
/* Check the answer code */
if (event->response) {
if (!linphone_xml_rpc_request_aborted(request) && event->response) {
int code = belle_http_response_get_status_code(event->response);
if (code == 200) { /* Valid response from the server. */
parse_valid_xml_rpc_response(request, belle_sip_message_get_body((belle_sip_message_t *)event->response));
@ -415,6 +428,7 @@ void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, Linph
if (!req) {
belle_sip_object_unref(uri);
process_io_error_from_post_xml_rpc_request(request, NULL);
return;
}
data = linphone_xml_rpc_request_get_content(request);
bh = belle_sip_memory_body_handler_new_copy_from_buffer(data, strlen(data), NULL, NULL);
@ -424,4 +438,14 @@ void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, Linph
cbs.process_auth_requested = process_auth_requested_from_post_xml_rpc_request;
l = belle_http_request_listener_create_from_callbacks(&cbs, request);
belle_http_provider_send_request(session->core->http_provider, req, l);
/*ensure that the listener object will be destroyed with the request*/
belle_sip_object_data_set(BELLE_SIP_OBJECT(request), "listener", l, belle_sip_object_unref);
/*prevent destruction of the session while there are still pending http requests*/
belle_sip_object_data_set(BELLE_SIP_OBJECT(request), "session", belle_sip_object_ref(session), belle_sip_object_unref);
}
void linphone_xml_rpc_session_release(LinphoneXmlRpcSession *session){
session->released = TRUE;
belle_sip_object_unref(session);
}

8
coreapi/xmlrpc.h
View file

@ -182,6 +182,7 @@ LINPHONE_PUBLIC LinphoneXmlRpcSession * linphone_xml_rpc_session_ref(LinphoneXml
/**
* Release reference to the XML-RPC session.
* @param[in] session LinphoneXmlRpcSession object.
* @warning This will not stop pending xml-rpc requests. Use linphone_xml_rpc_session_release() instead if this is intended.
**/
LINPHONE_PUBLIC void linphone_xml_rpc_session_unref(LinphoneXmlRpcSession *session);
@ -207,6 +208,13 @@ LINPHONE_PUBLIC void linphone_xml_rpc_session_set_user_data(LinphoneXmlRpcSessio
LINPHONE_PUBLIC void linphone_xml_rpc_session_send_request(LinphoneXmlRpcSession *session, LinphoneXmlRpcRequest *request);
/**
* Stop and unref an XML rpc session. Pending requests will be aborted.
* @param[in] session LinphoneXmlRpcSession object.
**/
LINPHONE_PUBLIC void linphone_xml_rpc_session_release(LinphoneXmlRpcSession *session);
/**
* Acquire a reference to a LinphoneXmlRpcRequestCbs object.
* @param[in] cbs LinphoneXmlRpcRequestCbs object.