From eb6462663a6116117a2b6a6ae92b80d672d94c54 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 16 May 2014 22:13:48 +0200 Subject: [PATCH] adapt to lastest belle-sip and fix bad naming of variables. --- coreapi/remote_provisioning.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/coreapi/remote_provisioning.c b/coreapi/remote_provisioning.c index 3eb848b71..8c57b47ef 100644 --- a/coreapi/remote_provisioning.c +++ b/coreapi/remote_provisioning.c @@ -84,11 +84,11 @@ static int linphone_remote_provisioning_load_file( LinphoneCore* lc, const char* static void belle_request_process_response_event(void *ctx, const belle_http_response_event_t *event) { LinphoneCore *lc = (LinphoneCore *)ctx; - belle_sip_message_t *body = BELLE_SIP_MESSAGE(event->response); - const char *message = belle_sip_message_get_body(body); + belle_sip_message_t *message = BELLE_SIP_MESSAGE(event->response); + const char *body = belle_sip_message_get_body(message); if (belle_http_response_get_status_code(event->response) == 200) { - linphone_remote_provisioning_apply(lc, message); + linphone_remote_provisioning_apply(lc, body); } else { linphone_configuring_terminated(lc, LinphoneConfiguringFailed, "http error"); } @@ -118,14 +118,17 @@ int linphone_remote_provisioning_download_and_apply(LinphoneCore *lc, const char return linphone_remote_provisioning_load_file(lc, file_path); } else { belle_generic_uri_t *uri=belle_generic_uri_parse(remote_provisioning_uri); - belle_http_request_listener_callbacks_t belle_request_listener = { - belle_request_process_response_event, - belle_request_process_io_error, - belle_request_process_timeout, - belle_request_process_auth_requested - }; - belle_http_request_listener_t *listener = belle_http_request_listener_create_from_callbacks(&belle_request_listener, lc); + belle_http_request_listener_callbacks_t belle_request_listener={0}; + belle_http_request_listener_t *listener; belle_http_request_t *request; + + belle_request_listener.process_response=belle_request_process_response_event; + belle_request_listener.process_auth_requested=belle_request_process_auth_requested; + belle_request_listener.process_io_error=belle_request_process_io_error; + belle_request_listener.process_timeout=belle_request_process_timeout; + + listener = belle_http_request_listener_create_from_callbacks(&belle_request_listener, lc); + if (uri==NULL) { belle_sip_error("Invalid provisioning URI [%s]",remote_provisioning_uri);