diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index db3b000ab..f26ebdac9 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -399,7 +399,7 @@ static int find_port_offset(LinphoneCore *lc, int stream_index, int base_port){
 	int tried_port;
 	int existing_port;
 	bool_t already_used=FALSE;
-	
+
 	for(offset=0;offset<100;offset+=2){
 		tried_port=base_port+offset;
 		already_used=FALSE;
@@ -485,10 +485,10 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
 
 	linphone_core_get_audio_port_range(call->core, &min_port, &max_port);
 	port_config_set(call,0,min_port,max_port);
-	
+
 	linphone_core_get_video_port_range(call->core, &min_port, &max_port);
 	port_config_set(call,1,min_port,max_port);
-	
+
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_AUDIO], LINPHONE_CALL_STATS_AUDIO);
 	linphone_call_init_stats(&call->stats[LINPHONE_CALL_STATS_VIDEO], LINPHONE_CALL_STATS_VIDEO);
 }
@@ -781,7 +781,7 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
 			 Indeed it does not change the state of the call (still paused or running)*/
 			call->state=cstate;
 		}
-		
+
 		if (cstate==LinphoneCallEnd || cstate==LinphoneCallError){
 			switch(call->non_op_error.reason){
 				case SalReasonDeclined:
@@ -1304,7 +1304,7 @@ const char *linphone_call_params_get_session_name(const LinphoneCallParams *cp){
 /**
  * Set the session name of the media session (ie in SDP). Subject from the SIP message (which is different) can be set using linphone_call_params_set_custom_header().
  * @param cp the call parameters.
- * @param name the session name 
+ * @param name the session name
 **/
 void linphone_call_params_set_session_name(LinphoneCallParams *cp, const char *name){
 	if (cp->session_name){
@@ -1454,17 +1454,17 @@ static void _linphone_call_prepare_ice_for_stream(LinphoneCall *call, int stream
 int linphone_call_prepare_ice(LinphoneCall *call, bool_t incoming_offer){
 	SalMediaDescription *remote;
 	bool_t has_video=FALSE;
-	
+
 	if ((linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) && (call->ice_session != NULL)){
 		if (incoming_offer){
 			remote=sal_call_get_remote_media_description(call->op);
 			has_video=linphone_core_media_description_contains_video_stream(remote);
 		}else has_video=call->params.has_video;
-		
+
 		_linphone_call_prepare_ice_for_stream(call,0,TRUE);
 		if (has_video) _linphone_call_prepare_ice_for_stream(call,1,TRUE);
 		/*start ICE gathering*/
-		if (incoming_offer) 
+		if (incoming_offer)
 			linphone_core_update_ice_from_remote_media_description(call,remote);
 		if (!ice_session_candidates_gathered(call->ice_session)){
 			if (call->audiostream->ms.state==MSStreamInitialized)
@@ -1539,7 +1539,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 
 	call->audiostream_app_evq = ortp_ev_queue_new();
 	rtp_session_register_event_queue(audiostream->ms.sessions.rtp_session,call->audiostream_app_evq);
-	
+
 	_linphone_call_prepare_ice_for_stream(call,0,FALSE);
 }
 
@@ -1551,7 +1551,7 @@ void linphone_call_init_video_stream(LinphoneCall *call){
 		int video_recv_buf_size=lp_config_get_int(lc->config,"video","recv_buf_size",0);
 		int dscp=linphone_core_get_video_dscp(lc);
 		const char *display_filter=linphone_core_get_video_display_filter(lc);
-		
+
 		if (call->sessions[1].rtp_session==NULL){
 			call->videostream=video_stream_new(call->media_ports[1].rtp_port,call->media_ports[1].rtcp_port, call->af==AF_INET6);
 		}else{
@@ -1961,7 +1961,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 #ifdef VIDEO_ENABLED
 	LinphoneCore *lc=call->core;
 	int used_pt=-1;
-	
+
 	/* look for savp stream first */
 	const SalStreamDescription *vstream=sal_media_description_find_stream(call->resultdesc,
 							SalProtoRtpSavp,SalVideo);
@@ -1983,7 +1983,7 @@ static void linphone_call_start_video_stream(LinphoneCall *call, const char *cna
 		const char *rtp_addr=vstream->rtp_addr[0]!='\0' ? vstream->rtp_addr : call->resultdesc->addr;
 		const char *rtcp_addr=vstream->rtcp_addr[0]!='\0' ? vstream->rtcp_addr : call->resultdesc->addr;
 		const SalStreamDescription *local_st_desc=sal_media_description_find_stream(call->localdesc,vstream->proto,SalVideo);
-		
+
 		call->video_profile=make_profile(call,call->resultdesc,vstream,&used_pt);
 
 		if (used_pt!=-1){
@@ -2147,7 +2147,7 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
 	SalStreamDescription *old_stream;
 	SalStreamDescription *new_stream;
 	const SalStreamDescription *local_st_desc;
-	
+
 	local_st_desc = sal_media_description_find_stream(call->localdesc, SalProtoRtpSavp, SalAudio);
 	old_stream = sal_media_description_find_stream(old_md, SalProtoRtpSavp, SalAudio);
 	new_stream = sal_media_description_find_stream(new_md, SalProtoRtpSavp, SalAudio);
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index af627ad4c..b0d1dff8e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -614,7 +614,7 @@ static void sound_config_read(LinphoneCore *lc)
 
 	linphone_core_set_play_file(lc,lp_config_get_string(lc->config,"sound","hold_music",PACKAGE_SOUND_DIR "/" HOLD_MUSIC));
 	lc->sound_conf.latency=0;
-#ifndef __ios 
+#ifndef __ios
 	tmp=TRUE;
 #else
 	tmp=FALSE; /* on iOS we have builtin echo cancellation.*/
@@ -633,7 +633,7 @@ static void sound_config_read(LinphoneCore *lc)
 
 	/*just parse requested stream feature once at start to print out eventual errors*/
 	linphone_core_get_audio_features(lc);
-	
+
 	_linphone_core_set_tone(lc,LinphoneReasonBusy,LinphoneToneBusy,NULL);
 }
 
@@ -647,7 +647,7 @@ static void certificates_config_read(LinphoneCore *lc)
 #endif
 	linphone_core_set_root_ca(lc,rootca);
 	linphone_core_verify_server_certificates(lc,lp_config_get_int(lc->config,"sip","verify_server_certs",TRUE));
-	linphone_core_verify_server_cn(lc,lp_config_get_int(lc->config,"sip","verify_server_cn",TRUE)); 
+	linphone_core_verify_server_cn(lc,lp_config_get_int(lc->config,"sip","verify_server_cn",TRUE));
 }
 
 static void sip_config_read(LinphoneCore *lc)
@@ -670,12 +670,12 @@ static void sip_config_read(LinphoneCore *lc)
 	}
 	linphone_core_enable_ipv6(lc,ipv6);
 	memset(&tr,0,sizeof(tr));
-	
+
 	tr.udp_port=lp_config_get_int(lc->config,"sip","sip_port",5060);
 	tr.tcp_port=lp_config_get_int(lc->config,"sip","sip_tcp_port",5060);
 	/*we are not listening inbound connection for tls, port has no meaning*/
 	tr.tls_port=lp_config_get_int(lc->config,"sip","sip_tls_port",LC_SIP_TRANSPORT_RANDOM);
-	
+
 	certificates_config_read(lc);
 	/*setting the dscp must be done before starting the transports, otherwise it is not taken into effect*/
 	sal_set_dscp(lc->sal,linphone_core_get_sip_dscp(lc));
@@ -710,7 +710,7 @@ static void sip_config_read(LinphoneCore *lc)
 
 	tmp=lp_config_get_int(lc->config,"sip","in_call_timeout",0);
 	linphone_core_set_in_call_timeout(lc,tmp);
-	
+
 	tmp=lp_config_get_int(lc->config,"sip","delayed_timeout",4);
 	linphone_core_set_delayed_timeout(lc,tmp);
 
@@ -982,8 +982,8 @@ static void video_config_read(LinphoneCore *lc){
 	int capture, display, self_view;
 	int automatic_video=1;
 #endif
-	const char *str;	
-#ifdef VIDEO_ENABLED	
+	const char *str;
+#ifdef VIDEO_ENABLED
 	LinphoneVideoPolicy vpol;
 	memset(&vpol, 0, sizeof(LinphoneVideoPolicy));
 #endif
@@ -1046,7 +1046,7 @@ bool_t linphone_core_tunnel_available(void){
 
 /**
  * Enable adaptive rate control.
- * 
+ *
  * @ingroup media_parameters
  *
  * Adaptive rate control consists in using RTCP feedback provided information to dynamically
@@ -1060,7 +1060,7 @@ void linphone_core_enable_adaptive_rate_control(LinphoneCore *lc, bool_t enabled
 
 /**
  * Returns whether adaptive rate control is enabled.
- * 
+ *
  * @ingroup media_parameters
  *
  * See linphone_core_enable_adaptive_rate_control().
@@ -1080,7 +1080,7 @@ bool_t linphone_core_rtcp_enabled(const LinphoneCore *lc){
  * calls (within SDP messages) so that the remote end can have
  * sufficient knowledge to properly configure its audio & video
  * codec output bitrate to not overflow available bandwidth.
- * 
+ *
  * @ingroup media_parameters
  *
  * @param lc the LinphoneCore object
@@ -1166,7 +1166,7 @@ void linphone_core_set_upload_ptime(LinphoneCore *lc, int ptime){
  * Set audio packetization time linphone will send (in absence of requirement from peer)
  * A value of 0 stands for the current codec default packetization time.
  *
- * 
+ *
  * @ingroup media_parameters
 **/
 int linphone_core_get_upload_ptime(LinphoneCore *lc){
@@ -1187,14 +1187,14 @@ const char * linphone_core_get_version(void){
 
 static void linphone_core_assign_payload_type(LinphoneCore *lc, PayloadType *const_pt, int number, const char *recv_fmtp){
 	PayloadType *pt;
-	
+
 #ifdef ANDROID
 	if (const_pt->channels==2){
 		ms_message("Stereo %s codec not supported on this platform.",const_pt->mime_type);
 		return;
 	}
 #endif
-	
+
 	pt=payload_type_clone(const_pt);
 	if (number==-1){
 		/*look for a free number */
@@ -1258,10 +1258,10 @@ void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const
 static void misc_config_read(LinphoneCore *lc) {
 	LpConfig *config=lc->config;
 	const char *uuid;
-	
+
 	lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",15);
 	lc->max_calls=lp_config_get_int(config,"misc","max_calls",NB_MAX_CALLS);
-	
+
 	uuid=lp_config_get_string(config,"misc","uuid",NULL);
 	if (!uuid){
 		char tmp[64];
@@ -1297,12 +1297,12 @@ static void linphone_core_start(LinphoneCore * lc) {
 void linphone_configuring_terminated(LinphoneCore *lc, LinphoneConfiguringState state, const char *message) {
 	if (lc->vtable.configuring_status)
 		lc->vtable.configuring_status(lc, state, message);
-	
+
 	if (state == LinphoneConfiguringSuccessful) {
 		if (linphone_core_is_provisioning_transient(lc) == TRUE)
 			linphone_core_set_provisioning_uri(lc, NULL);
 	}
-	
+
 	linphone_core_start(lc);
 }
 
@@ -1349,7 +1349,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	linphone_core_assign_payload_type(lc,&payload_type_mp4v,99,"profile-level-id=3");
 	linphone_core_assign_payload_type(lc,&payload_type_h264,102,"profile-level-id=42801F");
 	linphone_core_assign_payload_type(lc,&payload_type_vp8,103,NULL);
-	
+
 	linphone_core_assign_payload_type(lc,&payload_type_theora,97,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_x_snow,-1,NULL);
 	/* due to limited space in SDP, we have to disable this h264 line which is normally no more necessary */
@@ -1379,7 +1379,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 	linphone_core_assign_payload_type(lc,&payload_type_opus,-1,"useinbandfec=1; usedtx=0; cbr=1");
 	linphone_core_assign_payload_type(lc,&payload_type_isac,-1,NULL);
 	linphone_core_handle_static_payloads(lc);
-	
+
 	ms_init();
 	/* create a mediastreamer2 event queue and set it as global */
 	/* This allows to run event's callback in linphone_core_iterate() */
@@ -1393,13 +1393,13 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 
         lc->network_last_check = 0;
         lc->network_last_status = FALSE;
-	
+
 	lc->http_provider = belle_sip_stack_create_http_provider(sal_get_belle_sip_stack(lc->sal), "0.0.0.0");
 	lc->http_verify_policy = belle_tls_verify_policy_new();
 	belle_http_provider_set_tls_verify_policy(lc->http_provider,lc->http_verify_policy);
-	
+
 	certificates_config_read(lc);
-	
+
 	remote_provisioning_uri = linphone_core_get_provisioning_uri(lc);
 	if (remote_provisioning_uri == NULL) {
 		linphone_configuring_terminated(lc, LinphoneConfiguringSkipped, NULL);
@@ -1944,7 +1944,7 @@ static int apply_transports(LinphoneCore *lc){
 
 	/*first of all invalidate all current registrations so that we can register again with new transports*/
 	__linphone_core_invalidate_registers(lc);
-	
+
 	if (lc->sip_conf.ipv6_enabled)
 		anyaddr="::0";
 	else
@@ -2216,7 +2216,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 	int elapsed;
 	bool_t one_second_elapsed=FALSE;
 	const char *remote_provisioning_uri = NULL;
-	
+
 	if (linphone_core_get_global_state(lc) == LinphoneGlobalStartup) {
 		if (sal_get_root_ca(lc->sal)) {
 			belle_tls_verify_policy_t *tls_policy = belle_tls_verify_policy_new();
@@ -2227,7 +2227,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 		if (lc->vtable.display_status)
 			lc->vtable.display_status(lc, _("Configuring"));
 		linphone_core_set_state(lc, LinphoneGlobalConfiguring, "Configuring");
-		
+
 		remote_provisioning_uri = linphone_core_get_provisioning_uri(lc);
 		if (remote_provisioning_uri) {
 			int err = linphone_remote_provisioning_download_and_apply(lc, remote_provisioning_uri);
@@ -2250,7 +2250,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 			if (ecs==LinphoneEcCalibratorDone){
 				int len=lp_config_get_int(lc->config,"sound","ec_tail_len",0);
 				int margin=len/2;
-				
+
 				lp_config_set_int(lc->config, "sound", "ec_delay",MAX(lc->ecc->delay-margin,0));
 			} else if (ecs == LinphoneEcCalibratorFailed) {
 				lp_config_set_int(lc->config, "sound", "ec_delay", -1);/*use default value from soundcard*/
@@ -2363,7 +2363,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 /**
  * Interpret a call destination as supplied by the user, and returns a fully qualified
  * LinphoneAddress.
- * 
+ *
  * @ingroup call_control
  *
  * A sip address should look like DisplayName <sip:username@domain:port> .
@@ -2382,7 +2382,7 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
 	LinphoneProxyConfig *proxy=lc->default_proxy;
 	char *tmpurl;
 	LinphoneAddress *uri;
-	
+
 	if (*url=='\0') return NULL;
 
 	if (is_enum(url,&enum_domain)){
@@ -2432,7 +2432,7 @@ LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc, const char *url)
 	if (uri!=NULL){
 		return uri;
 	}
-	
+
 	return NULL;
 }
 
@@ -2470,7 +2470,7 @@ const char * linphone_core_get_route(LinphoneCore *lc){
  * Start a new call as a consequence of a transfer request received from a call.
  * This function is for advanced usage: the execution of transfers is automatically managed by the LinphoneCore. However if an application
  * wants to have control over the call parameters for the new call, it should call this function immediately during the LinphoneCallRefered notification.
- * @see LinphoneCoreVTable::call_state_changed 
+ * @see LinphoneCoreVTable::call_state_changed
  * @param lc the LinphoneCore
  * @param call a call that has just been notified about LinphoneCallRefered state event.
  * @param params the call parameters to be applied to the new call.
@@ -2479,13 +2479,13 @@ const char * linphone_core_get_route(LinphoneCore *lc){
 LinphoneCall * linphone_core_start_refered_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){
 	LinphoneCallParams *cp=params ? linphone_call_params_copy(params) : linphone_core_create_default_call_parameters(lc);
 	LinphoneCall *newcall;
-	
+
 	if (call->state!=LinphoneCallPaused){
 		ms_message("Automatically pausing current call to accept transfer.");
 		_linphone_core_pause_call(lc,call);
 		call->was_automatically_paused=TRUE;
 	}
-	
+
 	if (!params){
 		cp->has_video = call->current_params.has_video; /*start the call to refer-target with video enabled if original call had video*/
 	}
@@ -2525,7 +2525,7 @@ void linphone_core_notify_refer_state(LinphoneCore *lc, LinphoneCall *referer, L
    nodes with the basic SIP routing policy in order to get a workable
    system.
 */
-	
+
 static MSList *make_routes_for_proxy(LinphoneProxyConfig *proxy, const LinphoneAddress *dest){
 	MSList *ret=NULL;
 	const char *local_route=linphone_proxy_config_get_route(proxy);
@@ -2820,7 +2820,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 	bool_t defer = FALSE;
 
 	linphone_core_preempt_sound_resources(lc);
-	
+
 	if(!linphone_core_can_we_add_call(lc)){
 		if (lc->vtable.display_warning)
 			lc->vtable.display_warning(lc,_("Sorry, we have reached the maximum number of simultaneous calls"));
@@ -2852,7 +2852,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 	linphone_call_set_state (call,LinphoneCallOutgoingInit,"Starting outgoing call");
 	call->log->start_date_time=time(NULL);
 	linphone_call_init_media_streams(call);
-	
+
 	if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) {
 		/* Defer the start of the call after the ICE gathering process. */
 		if (linphone_call_prepare_ice(call,FALSE)==1)
@@ -2884,7 +2884,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
 			defer = TRUE;
 		}
 	}
-	
+
 	if (defer==FALSE) linphone_core_start_invite(lc,call,NULL);
 
 	if (real_url!=NULL) ms_free(real_url);
@@ -2897,7 +2897,7 @@ LinphoneCall * linphone_core_invite_address_with_params(LinphoneCore *lc, const
  * @ingroup call_control
  * The remote endpoint is expected to issue a new call to the specified destination.
  * The current call remains active and thus can be later paused or terminated.
- * 
+ *
  * It is possible to follow the progress of the transfer provided that transferee sends notification about it.
  * In this case, the transfer_state_changed callback of the #LinphoneCoreVTable is invoked to notify of the state of the new call at the other party.
  * The notified states are #LinphoneCallOutgoingInit , #LinphoneCallOutgoingProgress, #LinphoneCallOutgoingRinging and #LinphoneCallOutgoingConnected.
@@ -2929,7 +2929,7 @@ int linphone_core_transfer_call(LinphoneCore *lc, LinphoneCall *call, const char
  * @param lc linphone core object
  * @param call a running call you want to transfer
  * @param dest a running call whose remote person will receive the transfer
- * 
+ *
  * @ingroup call_control
  *
  * The transfered call is supposed to be in paused state, so that it is able to accept the transfer immediately.
@@ -2937,7 +2937,7 @@ int linphone_core_transfer_call(LinphoneCore *lc, LinphoneCall *call, const char
  * This method will send a transfer request to the transfered person. The phone of the transfered is then
  * expected to automatically call to the destination of the transfer. The receiver of the transfer will then automatically
  * close the call with us (the 'dest' call).
- * 
+ *
  * It is possible to follow the progress of the transfer provided that transferee sends notification about it.
  * In this case, the transfer_state_changed callback of the #LinphoneCoreVTable is invoked to notify of the state of the new call at the other party.
  * The notified states are #LinphoneCallOutgoingInit , #LinphoneCallOutgoingProgress, #LinphoneCallOutgoingRinging and #LinphoneCallOutgoingConnected.
@@ -2962,7 +2962,7 @@ bool_t linphone_core_inc_invite_pending(LinphoneCore*lc){
 bool_t linphone_core_media_description_has_srtp(const SalMediaDescription *md){
 	int i;
 	if (md->n_active_streams==0) return FALSE;
-	
+
 	for(i=0;i<md->n_active_streams;i++){
 		const SalStreamDescription *sd=&md->streams[i];
 		if (sd->proto!=SalProtoRtpSavp){
@@ -3035,11 +3035,11 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 	if (call->state==LinphoneCallIncomingReceived){
 		/*try to be best-effort in giving real local or routable contact address for 100Rel case*/
 		linphone_call_set_contact_op(call);
-		
+
 		if (propose_early_media || ringback_tone!=NULL){
 			linphone_core_accept_early_media(lc,call);
 		}else sal_call_notify_ringing(call->op,FALSE);
-		
+
 		if (sal_call_get_replaces(call->op)!=NULL && lp_config_get_int(lc->config,"sip","auto_answer_replacing_calls",1)){
 			linphone_core_accept_call(lc,call);
 		}
@@ -3065,7 +3065,7 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
 int linphone_core_accept_early_media_with_params(LinphoneCore* lc, LinphoneCall* call, const LinphoneCallParams* params) {
 	if (call->state==LinphoneCallIncomingReceived){
 		SalMediaDescription* md;
-		
+
 		/*try to be best-effort in giving real local or routable contact address for 100Rel case*/
 		linphone_call_set_contact_op(call);
 
@@ -3076,7 +3076,7 @@ int linphone_core_accept_early_media_with_params(LinphoneCore* lc, LinphoneCall*
 			sal_call_set_local_media_description ( call->op,call->localdesc );
 			sal_op_set_sent_custom_header ( call->op,params->custom_headers );
 		}
-		
+
 		sal_call_notify_ringing(call->op,TRUE);
 
 		linphone_call_set_state(call,LinphoneCallIncomingEarlyMedia,"Incoming call early media");
@@ -3206,15 +3206,15 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 /**
  * @ingroup call_control
  * When receiving a #LinphoneCallUpdatedByRemote state notification, prevent LinphoneCore from performing an automatic answer.
- * 
+ *
  * When receiving a #LinphoneCallUpdatedByRemote state notification (ie an incoming reINVITE), the default behaviour of
  * LinphoneCore is to automatically answer the reINIVTE with call parameters unchanged.
  * However when for example when the remote party updated the call to propose a video stream, it can be useful
- * to prompt the user before answering. This can be achieved by calling linphone_core_defer_call_update() during 
+ * to prompt the user before answering. This can be achieved by calling linphone_core_defer_call_update() during
  * the call state notifiacation, to deactivate the automatic answer that would just confirm the audio but reject the video.
  * Then, when the user responds to dialog prompt, it becomes possible to call linphone_core_accept_call_update() to answer
  * the reINVITE, with eventually video enabled in the LinphoneCallParams argument.
- * 
+ *
  * @return 0 if successful, -1 if the linphone_core_defer_call_update() was done outside a #LinphoneCallUpdatedByRemote notification, which is illegal.
 **/
 int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call){
@@ -3420,7 +3420,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 		sal_call_set_local_media_description(call->op,call->localdesc);
 		sal_op_set_sent_custom_header(call->op,params->custom_headers);
 	}
-	
+
 	/*give a chance a set card prefered sampling frequency*/
 	if (call->localdesc->streams[0].max_rate>0) {
 		ms_message ("configuring prefered card sampling rate to [%i]",call->localdesc->streams[0].max_rate);
@@ -3429,7 +3429,7 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
 		if (lc->sound_conf.capt_sndcard)
 			ms_snd_card_set_preferred_sample_rate(lc->sound_conf.capt_sndcard, call->localdesc->streams[0].max_rate);
 	}
-	
+
 	if (!was_ringing && call->audiostream->ms.state==MSStreamInitialized){
 		audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard);
 	}
@@ -3547,9 +3547,9 @@ int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *the_call)
 
 /**
  * Decline a pending incoming call, with a reason.
- * 
+ *
  * @ingroup call_control
- * 
+ *
  * @param lc the linphone core
  * @param call the LinphoneCall, must be in the IncomingReceived state.
  * @param reason the reason for rejecting the call: LinphoneReasonDeclined or LinphoneReasonBusy
@@ -3683,12 +3683,12 @@ int linphone_core_pause_all_calls(LinphoneCore *lc){
 
 void linphone_core_preempt_sound_resources(LinphoneCore *lc){
 	LinphoneCall *current_call;
-	
+
 	if (linphone_core_is_in_conference(lc)){
 		linphone_core_leave_conference(lc);
 		return;
 	}
-	
+
 	current_call=linphone_core_get_current_call(lc);
 	if(current_call != NULL){
 		ms_message("Pausing automatically the current call.");
@@ -3707,7 +3707,7 @@ void linphone_core_preempt_sound_resources(LinphoneCore *lc){
 int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 	char temp[255]={0};
 	const char *subject="Call resuming";
-	
+
 	if(call->state!=LinphoneCallPaused ){
 		ms_warning("we cannot resume a call that has not been established and paused before");
 		return -1;
@@ -3722,7 +3722,7 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call){
 	}
 
 	call->was_automatically_paused=FALSE;
-	
+
 	/* Stop playing music immediately. If remote side is a conference it
 	 prevents the participants to hear it while the 200OK comes back.*/
 	if (call->audiostream) audio_stream_play(call->audiostream, NULL);
@@ -3758,7 +3758,7 @@ static int remote_address_compare(LinphoneCall *call, const LinphoneAddress *rad
  * @param lc
  * @param remote_address
  * @return the LinphoneCall of the call if found
- * 
+ *
  * @ingroup call_control
  */
 LinphoneCall *linphone_core_get_call_by_remote_address(LinphoneCore *lc, const char *remote_address){
@@ -4361,7 +4361,7 @@ const char *linphone_core_get_root_ca(LinphoneCore *lc){
 
 /**
  * Specify whether the tls server certificate must be verified when connecting to a SIP/TLS server.
- * 
+ *
  * @ingroup initializing
 **/
 void linphone_core_verify_server_certificates(LinphoneCore *lc, bool_t yesno){
@@ -4478,7 +4478,7 @@ void linphone_core_mute_mic(LinphoneCore *lc, bool_t val){
 		if ( linphone_core_get_rtp_no_xmit_on_audio_mute(lc) ){
 			audio_stream_mute_rtp(st,val);
 		}
-		
+
 	}
 }
 
@@ -4564,7 +4564,7 @@ void linphone_core_set_stun_server(LinphoneCore *lc, const char *server){
 	if (server)
 		lc->net_conf.stun_server=ms_strdup(server);
 	else lc->net_conf.stun_server=NULL;
-	
+
 	/* each time the stun server is changed, we must clean the resolved cached addrinfo*/
 	if (lc->net_conf.stun_addrinfo){
 		freeaddrinfo(lc->net_conf.stun_addrinfo);
@@ -4574,7 +4574,7 @@ void linphone_core_set_stun_server(LinphoneCore *lc, const char *server){
 	if (lc->net_conf.stun_server){
 		linphone_core_resolve_stun_server(lc);
 	}
-	
+
 	if (linphone_core_ready(lc))
 		lp_config_set_string(lc->config,"net","stun_server",lc->net_conf.stun_server);
 }
@@ -4631,7 +4631,7 @@ const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc)
 	char ipstring [INET6_ADDRSTRLEN];
 
 	if (lc->net_conf.nat_address==NULL) return NULL;
-	
+
 	if (parse_hostname_to_addr (lc->net_conf.nat_address, &ss, &ss_len, 5060)<0) {
 		return lc->net_conf.nat_address;
 	}
@@ -5000,7 +5000,7 @@ int linphone_core_set_static_picture(LinphoneCore *lc, const char *path) {
 const char *linphone_core_get_static_picture(LinphoneCore *lc) {
 	const char *path=NULL;
 #ifdef VIDEO_ENABLED
-	path=ms_static_image_get_default_image();	
+	path=ms_static_image_get_default_image();
 #else
 	ms_warning("Video support not compiled.");
 #endif
@@ -5075,7 +5075,7 @@ static void unset_video_window_id(LinphoneCore *lc, bool_t preview, unsigned lon
 	LinphoneCall *call;
 	MSList *elem;
 #endif
-	
+
 	if (id!=0 && id!=-1) {
 		ms_error("Invalid use of unset_video_window_id()");
 		return;
@@ -5239,7 +5239,7 @@ static MSVideoSizeDef supported_resolutions[]={
 #if !TARGET_OS_MAC || TARGET_OS_IPHONE /* OS_MAC is 1 for iPhone, but we need QVGA */
 	{	{ MS_VIDEO_SIZE_QVGA_W, MS_VIDEO_SIZE_QVGA_H }	,	"qvga"	},
 #endif
-	{	{ MS_VIDEO_SIZE_QCIF_W, MS_VIDEO_SIZE_QCIF_H }	,	"qcif"	},	
+	{	{ MS_VIDEO_SIZE_QCIF_W, MS_VIDEO_SIZE_QCIF_H }	,	"qcif"	},
 	{	{ 0,0 }			,	NULL	}
 };
 
@@ -5484,7 +5484,7 @@ void linphone_core_play_named_tone(LinphoneCore *lc, LinphoneToneID toneid){
 					def.frequencies[0]=620;
 					def.interval=250;
 					def.repeat_count=3;
-					
+
 				break;
 				default:
 					ms_warning("Unhandled tone id.");
@@ -5550,7 +5550,7 @@ int linphone_core_get_mtu(const LinphoneCore *lc){
  * Sets the maximum transmission unit size in bytes.
  * This information is useful for sending RTP packets.
  * Default value is 1500.
- * 
+ *
  * @ingroup media_parameters
 **/
 void linphone_core_set_mtu(LinphoneCore *lc, int mtu){
@@ -5644,7 +5644,7 @@ void sip_config_uninit(LinphoneCore *lc)
 	int i;
 	sip_config_t *config=&lc->sip_conf;
 	bool_t still_registered=TRUE;
-	
+
 	lp_config_set_int(lc->config,"sip","guess_hostname",config->guess_hostname);
 	lp_config_set_string(lc->config,"sip","contact",config->contact);
 	lp_config_set_int(lc->config,"sip","inc_timeout",config->inc_timeout);
@@ -5659,7 +5659,7 @@ void sip_config_uninit(LinphoneCore *lc)
 			LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)(elem->data);
 			linphone_proxy_config_edit(cfg);	/* to unregister */
 		}
-	
+
 		ms_message("Unregistration started.");
 
 		for (i=0;i<20&&still_registered;i++){
@@ -5691,7 +5691,7 @@ void sip_config_uninit(LinphoneCore *lc)
 		ms_message("Tunnel destroyed.");
 	}
 #endif
-	
+
 	sal_reset_transports(lc->sal);
 	sal_unlisten_ports(lc->sal); /*to make sure no new messages are received*/
 	if (lc->http_provider) {
@@ -5897,7 +5897,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
 		linphone_presence_model_unref(lc->presence_model);
 	}
 	linphone_core_free_payload_types(lc);
-	
+
 	linphone_core_message_storage_close(lc);
 	ms_exit();
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
@@ -5906,7 +5906,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
 static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime){
 	// second get the list of available proxies
 	const MSList *elem=linphone_core_get_proxy_config_list(lc);
-	
+
 	if (lc->network_reachable==isReachable) return; // no change, ignore.
 
 	ms_message("Network state is now [%s]",isReachable?"UP":"DOWN");
@@ -5923,7 +5923,7 @@ static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t cu
 	}
 	lc->netup_time=curtime;
 	lc->network_reachable=isReachable;
-	
+
 	if (!lc->network_reachable){
 		linphone_core_invalidate_friend_subscriptions(lc);
 		sal_reset_transports(lc->sal);
@@ -6397,7 +6397,7 @@ int linphone_core_set_media_encryption(LinphoneCore *lc, LinphoneMediaEncryption
 
 LinphoneMediaEncryption linphone_core_get_media_encryption(LinphoneCore *lc) {
 	const char* menc = lp_config_get_string(lc->config, "sip", "media_encryption", NULL);
-	
+
 	if (menc == NULL)
 		return LinphoneMediaEncryptionNone;
 	else if (strcmp(menc, "srtp")==0)
@@ -6433,10 +6433,10 @@ const char*  linphone_core_get_device_identifier(const LinphoneCore *lc) {
 
 /**
  * Set the DSCP field for SIP signaling channel.
- * 
+ *
  * @ingroup network_parameters
  * * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 void linphone_core_set_sip_dscp(LinphoneCore *lc, int dscp){
 	sal_set_dscp(lc->sal,dscp);
@@ -6448,10 +6448,10 @@ void linphone_core_set_sip_dscp(LinphoneCore *lc, int dscp){
 
 /**
  * Get the DSCP field for SIP signaling channel.
- * 
+ *
  * @ingroup network_parameters
  * * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 int linphone_core_get_sip_dscp(const LinphoneCore *lc){
 	return lp_config_get_int(lc->config,"sip","dscp",0x1a);
@@ -6462,7 +6462,7 @@ int linphone_core_get_sip_dscp(const LinphoneCore *lc){
  *
  * @ingroup network_parameters
  * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 void linphone_core_set_audio_dscp(LinphoneCore *lc, int dscp){
 	if (linphone_core_ready(lc))
@@ -6474,7 +6474,7 @@ void linphone_core_set_audio_dscp(LinphoneCore *lc, int dscp){
  *
  * @ingroup network_parameters
  * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 int linphone_core_get_audio_dscp(const LinphoneCore *lc){
 	return lp_config_get_int(lc->config,"rtp","audio_dscp",0x2e);
@@ -6485,12 +6485,12 @@ int linphone_core_get_audio_dscp(const LinphoneCore *lc){
  *
  * @ingroup network_parameters
  * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 void linphone_core_set_video_dscp(LinphoneCore *lc, int dscp){
 	if (linphone_core_ready(lc))
 		lp_config_set_int_hex(lc->config,"rtp","video_dscp",dscp);
-	
+
 }
 
 /**
@@ -6498,7 +6498,7 @@ void linphone_core_set_video_dscp(LinphoneCore *lc, int dscp){
  *
  * @ingroup network_parameters
  * The DSCP defines the quality of service in IP packets.
- * 
+ *
 **/
 int linphone_core_get_video_dscp(const LinphoneCore *lc){
 	return lp_config_get_int(lc->config,"rtp","video_dscp",0);
diff --git a/coreapi/presence.c b/coreapi/presence.c
index 08996329f..fa4b97014 100644
--- a/coreapi/presence.c
+++ b/coreapi/presence.c
@@ -1467,7 +1467,7 @@ void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from){
 	char *tmp;
 	LinphoneAddress *uri;
 	LinphoneProxyConfig *cfg;
-	
+
 	uri=linphone_address_new(from);
 	linphone_address_clean(uri);
 	tmp=linphone_address_as_string(uri);
@@ -1482,7 +1482,7 @@ void linphone_subscription_new(LinphoneCore *lc, SalOp *op, const char *from){
 			}
 		}
 	}
-	
+
 	/* check if we answer to this subscription */
 	if (linphone_find_friend_by_address(lc->friends,uri,&lf)!=NULL){
 		lf->insub=op;
diff --git a/coreapi/private.h b/coreapi/private.h
index efc622b31..9de726b9a 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -677,7 +677,7 @@ struct _LinphoneCore
 	bool_t use_preview_window;
 
 	time_t network_last_check;
-	
+
 	bool_t network_last_status;
 	bool_t ringstream_autorelease;
 	bool_t pad[2];
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 89b61f513..a118ba50a 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -17,7 +17,7 @@ Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
+
 #include "linphonecore.h"
 #include "sipsetup.h"
 #include "lpconfig.h"
@@ -31,7 +31,7 @@ void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc){
 	MSList *elem;
 	int i;
 	if (!linphone_core_ready(lc)) return;
-	
+
 	for(elem=lc->sip_conf.proxies,i=0;elem!=NULL;elem=ms_list_next(elem),i++){
 		LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
 		linphone_proxy_config_write_to_config_file(lc->config,cfg,i);
@@ -49,7 +49,7 @@ static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *ob
 	const char *statistics_collector = lc ? lp_config_get_default_string(lc->config, "proxy", "reg_statistics_collector", NULL) : NULL;
 	const char *contact_params = lc ? lp_config_get_default_string(lc->config, "proxy", "contact_parameters", NULL) : NULL;
 	const char *contact_uri_params = lc ? lp_config_get_default_string(lc->config, "proxy", "contact_uri_parameters", NULL) : NULL;
-	
+
 	memset(obj, 0, sizeof(LinphoneProxyConfig));
 	obj->magic = linphone_proxy_config_magic;
 	obj->expires = lc ? lp_config_get_default_int(lc->config, "proxy", "reg_expires", 3600) : 3600;
@@ -88,7 +88,7 @@ LinphoneProxyConfig * linphone_core_create_proxy_config(LinphoneCore *lc) {
 
 /**
  * Destroys a proxy config.
- * 
+ *
  * @note: LinphoneProxyConfig that have been removed from LinphoneCore with
  * linphone_core_remove_proxy_config() must not be freed.
 **/
@@ -127,10 +127,10 @@ bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj){
 int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr){
 	LinphoneAddress *addr=NULL;
 	char *modified=NULL;
-	
+
 	if (obj->reg_proxy!=NULL) ms_free(obj->reg_proxy);
 	obj->reg_proxy=NULL;
-	
+
 	if (server_addr!=NULL && strlen(server_addr)>0){
 		if (strstr(server_addr,"sip:")==NULL && strstr(server_addr,"sips:")==NULL){
 			modified=ms_strdup_printf("sip:%s",server_addr);
@@ -153,7 +153,7 @@ int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *
 /**
  * Sets the user identity as a SIP address.
  *
- * This identity is normally formed with display name, username and domain, such 
+ * This identity is normally formed with display name, username and domain, such
  * as:
  * Alice <sip:alice@example.net>
  * The REGISTER messages will have from and to set to this identity.
@@ -301,14 +301,14 @@ LinphoneAddress *guess_contact_for_register(LinphoneProxyConfig *obj){
 	LinphoneAddress *ret=NULL;
 	LinphoneAddress *proxy=linphone_address_new(obj->reg_proxy);
 	const char *host;
-	
+
 	if (proxy==NULL) return NULL;
 	host=linphone_address_get_domain(proxy);
 	if (host!=NULL){
 		int localport = -1;
 		const char *localip = NULL;
 		LinphoneAddress *contact=linphone_address_new(obj->reg_identity);
-		
+
 		linphone_address_clean(contact);
 
 		if (obj->contact_params) {
@@ -378,7 +378,7 @@ void linphone_proxy_config_refresh_register(LinphoneProxyConfig *obj){
 
 
 /**
- * Sets a dialing prefix to be automatically prepended when inviting a number with 
+ * Sets a dialing prefix to be automatically prepended when inviting a number with
  * linphone_core_invite();
  * This dialing prefix shall usually be the country code of the country where the user is living.
  *
@@ -394,7 +394,7 @@ void linphone_proxy_config_set_dial_prefix(LinphoneProxyConfig *cfg, const char
 /**
  * Returns dialing prefix.
  *
- * 
+ *
 **/
 const char *linphone_proxy_config_get_dial_prefix(const LinphoneProxyConfig *cfg){
 	return cfg->dial_prefix;
@@ -435,7 +435,7 @@ void linphone_proxy_config_set_statistics_collector(LinphoneProxyConfig *cfg, co
 			if (addr)
 				linphone_address_destroy(addr);
 		} else {
-			if (cfg->reg_statistics_collector != NULL) 
+			if (cfg->reg_statistics_collector != NULL)
 				ms_free(cfg->reg_statistics_collector);
 			cfg->reg_statistics_collector = ms_strdup(collector);
 			linphone_address_destroy(addr);
@@ -458,7 +458,7 @@ typedef struct dial_plan{
 	char  ccc[8]; /*country calling code*/
 	int nnl; /*maximum national number length*/
 	const char * icp; /*international call prefix, ex: 00 in europe*/
-	
+
 }dial_plan_t;
 
 /* TODO: fill with information for all countries over the world*/
@@ -743,7 +743,7 @@ static void lookup_dial_plan(const char *ccc, dial_plan_t *plan){
 static bool_t is_a_phone_number(const char *username){
 	const char *p;
 	for(p=username;*p!='\0';++p){
-		if (isdigit(*p) || 
+		if (isdigit(*p) ||
 		    *p==' ' ||
 		    *p=='.' ||
 		    *p=='-' ||
@@ -771,12 +771,12 @@ static char *flatten_number(const char *number){
 
 static void replace_plus(const char *src, char *dest, size_t destlen, const char *icp){
 	int i=0;
-	
+
 	if (icp && src[0]=='+' && (destlen>(i=strlen(icp))) ){
 		src++;
 		strcpy(dest,icp);
 	}
-	
+
 	for(;(i<destlen-1) && *src!='\0';++i){
 		dest[i]=*src;
 		src++;
@@ -791,7 +791,7 @@ int linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const cha
 		char *flatten;
 		flatten=flatten_number(username);
 		ms_message("Flattened number is '%s'",flatten);
-		
+
 		if (proxy->dial_prefix==NULL || proxy->dial_prefix[0]=='\0'){
 			/*no prefix configured, nothing else to do*/
 			strncpy(result,flatten,result_len);
@@ -859,7 +859,7 @@ void linphone_proxy_config_set_realm(LinphoneProxyConfig *cfg, const char *realm
 
 int linphone_proxy_config_send_publish(LinphoneProxyConfig *proxy, LinphonePresenceModel *presence){
 	int err=0;
-	
+
 	if (proxy->state==LinphoneRegistrationOk || proxy->state==LinphoneRegistrationCleared){
 		if (proxy->publish_op==NULL){
 			proxy->publish_op=sal_op_new(proxy->lc->sal);
@@ -1050,7 +1050,7 @@ void linphone_core_set_default_proxy(LinphoneCore *lc, LinphoneProxyConfig *conf
 	lc->default_proxy=config;
 	if (linphone_core_ready(lc))
 		lp_config_set_int(lc->config,"sip","default_proxy",linphone_core_get_default_proxy(lc,NULL));
-}	
+}
 
 void linphone_core_set_default_proxy_index(LinphoneCore *lc, int index){
 	if (index<0) linphone_core_set_default_proxy(lc,NULL);
@@ -1124,7 +1124,7 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LpConfig *config
 	const char *proxy;
 	LinphoneProxyConfig *cfg;
 	char key[50];
-	
+
 	sprintf(key,"proxy_%i",index);
 
 	if (!lp_config_has_section(config,key)){
@@ -1133,12 +1133,12 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LpConfig *config
 
 	cfg=linphone_proxy_config_new();
 
-	identity=lp_config_get_string(config,key,"reg_identity",NULL);	
+	identity=lp_config_get_string(config,key,"reg_identity",NULL);
 	proxy=lp_config_get_string(config,key,"reg_proxy",NULL);
-	
+
 	linphone_proxy_config_set_identity(cfg,identity);
 	linphone_proxy_config_set_server_addr(cfg,proxy);
-	
+
 	tmp=lp_config_get_string(config,key,"reg_route",NULL);
 	if (tmp!=NULL) linphone_proxy_config_set_route(cfg,tmp);
 
@@ -1147,19 +1147,19 @@ LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LpConfig *config
 	linphone_proxy_config_enable_statistics(cfg,lp_config_get_int(config,key,"send_statistics",0));
 
 	linphone_proxy_config_set_contact_parameters(cfg,lp_config_get_string(config,key,"contact_parameters",NULL));
-	
+
 	linphone_proxy_config_set_contact_uri_parameters(cfg,lp_config_get_string(config,key,"contact_uri_parameters",NULL));
-	
+
 	linphone_proxy_config_expires(cfg,lp_config_get_int(config,key,"reg_expires",lp_config_get_default_int(config,"proxy","reg_expires",600)));
 	linphone_proxy_config_enableregister(cfg,lp_config_get_int(config,key,"reg_sendregister",0));
-	
+
 	linphone_proxy_config_enable_publish(cfg,lp_config_get_int(config,key,"publish",0));
 
 	linphone_proxy_config_set_dial_escape_plus(cfg,lp_config_get_int(config,key,"dial_escape_plus",lp_config_get_default_int(config,"proxy","dial_escape_plus",0)));
 	linphone_proxy_config_set_dial_prefix(cfg,lp_config_get_string(config,key,"dial_prefix",lp_config_get_default_string(config,"proxy","dial_prefix",NULL)));
-	
+
 	tmp=lp_config_get_string(config,key,"type",NULL);
-	if (tmp!=NULL && strlen(tmp)>0) 
+	if (tmp!=NULL && strlen(tmp)>0)
 		linphone_proxy_config_set_sip_setup(cfg,tmp);
 
 	linphone_proxy_config_set_privacy(cfg,lp_config_get_int(config,key,"privacy",lp_config_get_default_int(config,"proxy","privacy",LinphonePrivacyDefault)));
@@ -1198,7 +1198,7 @@ static void linphone_proxy_config_activate_sip_setup(LinphoneProxyConfig *cfg){
 			ms_error("Could not retrieve proxy uri !");
 		}
 	}
-	
+
 }
 
 SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg){
@@ -1213,7 +1213,7 @@ static bool_t can_register(LinphoneProxyConfig *cfg){
 	LinphoneCore *lc=cfg->lc;
 #ifdef BUILD_UPNP
 	if (linphone_core_get_firewall_policy(lc)==LinphonePolicyUseUpnp){
-		if(lc->sip_conf.register_only_when_upnp_is_ok && 
+		if(lc->sip_conf.register_only_when_upnp_is_ok &&
 			(lc->upnp == NULL || !linphone_upnp_context_is_ready_for_register(lc->upnp))) {
 			return FALSE;
 		}
@@ -1369,7 +1369,7 @@ void * linphone_proxy_config_get_user_data(LinphoneProxyConfig *cr) {
 void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrationState state, const char *message){
 	LinphoneCore *lc=cfg->lc;
 	bool_t update_friends=FALSE;
-	
+
 	if (cfg->state!=state || state==LinphoneRegistrationOk) { /*allow multiple notification of LinphoneRegistrationOk for refreshing*/
 		ms_message("Proxy config [%p] for identity [%s] moving from state [%s] to [%s]"	, cfg,
 								linphone_proxy_config_get_identity(cfg),
@@ -1380,7 +1380,7 @@ void linphone_proxy_config_set_state(LinphoneProxyConfig *cfg, LinphoneRegistrat
 				|| (state!=LinphoneRegistrationOk && cfg->state==LinphoneRegistrationOk);
 		}
 		cfg->state=state;
-		
+
 		if (update_friends){
 			linphone_core_update_friends_subscriptions(lc,cfg,TRUE);
 		}
diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c
index 441957736..a415824e4 100644
--- a/coreapi/quality_reporting.c
+++ b/coreapi/quality_reporting.c
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /***************************************************************************
  *  				TODO / REMINDER LIST
- ****************************************************************************/	
+ ****************************************************************************/
 	// For codecs that are able to change sample rates, the lowest and highest sample rates MUST be reported (e.g., 8000;16000).
 	// range 0 - 255 instead of 0 - 5 for metrics->quality_estimates.rcq, metrics->quality_estimates.moslq, metrics->quality_estimates.moscq
  	// Know issue: if call is stopped to early, IP are invalid
@@ -115,7 +115,7 @@ static bool_t are_metrics_filled(const reporting_content_metrics_t rm) {
 	IF_NUM_IN_RANGE(rm.jitter_buffer.adaptive, 0, 3, return TRUE);
 	IF_NUM_IN_RANGE(rm.jitter_buffer.nominal, 0, 65535, return TRUE);
 	IF_NUM_IN_RANGE(rm.jitter_buffer.max, 0, 65535, return TRUE);
-	IF_NUM_IN_RANGE(rm.jitter_buffer.abs_max, 0, 65535, return TRUE); 
+	IF_NUM_IN_RANGE(rm.jitter_buffer.abs_max, 0, 65535, return TRUE);
 
 	IF_NUM_IN_RANGE(rm.delay.round_trip_delay, 0, 65535, return TRUE);
 	IF_NUM_IN_RANGE(rm.delay.end_system_delay, 0, 65535, return TRUE);
@@ -141,9 +141,9 @@ static void append_metrics_to_buffer(char ** buffer, size_t * size, size_t * off
 	char * moslq_str = NULL;
 	char * moscq_str = NULL;
 
-	if (rm.timestamps.start > 0) 
+	if (rm.timestamps.start > 0)
 		timestamps_start_str = linphone_timestamp_to_rfc3339_string(rm.timestamps.start);
-	if (rm.timestamps.stop > 0) 
+	if (rm.timestamps.stop > 0)
 		timestamps_stop_str = linphone_timestamp_to_rfc3339_string(rm.timestamps.stop);
 
 	IF_NUM_IN_RANGE(rm.packet_loss.network_packet_loss_rate, 0, 255, network_packet_loss_rate_str = float_to_one_decimal_string(rm.packet_loss.network_packet_loss_rate / 256));
@@ -173,7 +173,7 @@ static void append_metrics_to_buffer(char ** buffer, size_t * size, size_t * off
 		// APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " JBR=%d", rm.jitter_buffer.rate, 0, 15);
 		APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " JBN=%d", rm.jitter_buffer.nominal, 0, 65535);
 		APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " JBM=%d", rm.jitter_buffer.max, 0, 65535);
-		APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " JBX=%d",  rm.jitter_buffer.abs_max, 0, 65535); 
+		APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " JBX=%d",  rm.jitter_buffer.abs_max, 0, 65535);
 
 	append_to_buffer(buffer, size, offset, "\r\nPacketLoss:");
 		APPEND_IF_NOT_NULL_STR(buffer, size, offset, " NLR=%s", network_packet_loss_rate_str);
@@ -184,7 +184,7 @@ static void append_metrics_to_buffer(char ** buffer, size_t * size, size_t * off
 	// 	append_to_buffer(buffer, size, offset, " BD=%d", rm.burst_gap_loss.burst_duration);
 	// 	APPEND_IF_NOT_NULL_STR(buffer, size, offset, " GLD=%s", gap_loss_density_str);
 	// 	append_to_buffer(buffer, size, offset, " GD=%d", rm.burst_gap_loss.gap_duration);
-	// 	append_to_buffer(buffer, size, offset, " GMIN=%d", rm.burst_gap_loss.min_gap_threshold); 
+	// 	append_to_buffer(buffer, size, offset, " GMIN=%d", rm.burst_gap_loss.min_gap_threshold);
 
 	append_to_buffer(buffer, size, offset, "\r\nDelay:");
 		APPEND_IF_NUM_IN_RANGE(buffer, size, offset, " RTD=%d", rm.delay.round_trip_delay, 0, 65535);
@@ -256,10 +256,10 @@ static void reporting_publish(const LinphoneCall* call, const reporting_session_
 	APPEND_IF_NOT_NULL_STR(&buffer, &size, &offset, "LocalMAC: %s\r\n", report->info.local_mac_addr);
 	append_to_buffer(&buffer, &size, &offset, "RemoteAddr: IP=%s PORT=%d SSRC=%d\r\n", report->info.remote_addr.ip, report->info.remote_addr.port, report->info.remote_addr.ssrc);
 	APPEND_IF_NOT_NULL_STR(&buffer, &size, &offset, "RemoteMAC: %s\r\n", report->info.remote_mac_addr);
-	
+
 	append_to_buffer(&buffer, &size, &offset, "LocalMetrics:\r\n");
 	append_metrics_to_buffer(&buffer, &size, &offset, report->local_metrics);
-		
+
 	if (are_metrics_filled(report->remote_metrics)) {
 		append_to_buffer(&buffer, &size, &offset, "RemoteMetrics:\r\n");
 		append_metrics_to_buffer(&buffer, &size, &offset, report->remote_metrics);
@@ -302,7 +302,7 @@ static void reporting_update_ip(LinphoneCall * call, int stats_type) {
 	if (call->log->reports[stats_type] != NULL) {
 		const SalStreamDescription * local_desc = get_media_stream_for_desc(call->localdesc, sal_stream_type);
 		const SalStreamDescription * remote_desc = get_media_stream_for_desc(sal_call_get_remote_media_description(call->op), sal_stream_type);
-		
+
 		// local info are always up-to-date and correct
 		if (local_desc != NULL) {
 			call->log->reports[stats_type]->info.local_addr.port = local_desc->rtp_port;
@@ -332,7 +332,7 @@ void linphone_reporting_update_ip(LinphoneCall * call) {
 	// - 1) at start when call is starting, remote ip/port info might be the proxy ones to which callee is registered
 	// - 2) later, if we found a direct route between caller and callee with ICE/Stun, ip/port are updated for the direct route access
 
-	if (! reporting_enabled(call)) 
+	if (! reporting_enabled(call))
 		return;
 
 	reporting_update_ip(call, LINPHONE_CALL_STATS_AUDIO);
@@ -349,7 +349,7 @@ void linphone_reporting_update(LinphoneCall * call, int stats_type) {
 	const PayloadType * remote_payload = NULL;
 	const LinphoneCallParams * current_params = linphone_call_get_current_params(call);
 
-	if (! reporting_enabled(call)) 
+	if (! reporting_enabled(call))
 		return;
 
 	STR_REASSIGN(report->info.call_id, ms_strdup(call->log->call_id));
@@ -376,7 +376,7 @@ void linphone_reporting_update(LinphoneCall * call, int stats_type) {
 	//we use same timestamps for remote too
 	report->remote_metrics.timestamps.start = call->log->start_date_time;
 	report->remote_metrics.timestamps.stop = call->log->start_date_time + linphone_call_get_duration(call);
-	
+
 	// yet we use the same payload config for local and remote, since this is the largest case
 	if (stats_type == LINPHONE_CALL_STATS_AUDIO && call->audiostream != NULL) {
 		stream = &call->audiostream->ms;
@@ -417,7 +417,7 @@ void linphone_reporting_call_stats_updated(LinphoneCall *call, int stats_type) {
 	LinphoneCallStats stats = call->stats[stats_type];
     mblk_t *block = NULL;
 
-    if (! reporting_enabled(call)) 
+    if (! reporting_enabled(call))
 		return;
 
     if (stats.updated == LINPHONE_CALL_STATS_RECEIVED_RTCP_UPDATE) {
@@ -463,7 +463,7 @@ void linphone_reporting_publish(LinphoneCall* call) {
 		reporting_publish(call, call->log->reports[LINPHONE_CALL_STATS_AUDIO]);
 	}
 
-	if (call->log->reports[LINPHONE_CALL_STATS_VIDEO] != NULL 
+	if (call->log->reports[LINPHONE_CALL_STATS_VIDEO] != NULL
 		&& linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
 		reporting_publish(call, call->log->reports[LINPHONE_CALL_STATS_VIDEO]);
 	}
diff --git a/coreapi/quality_reporting.h b/coreapi/quality_reporting.h
index f3d311ad9..c817feba9 100644
--- a/coreapi/quality_reporting.h
+++ b/coreapi/quality_reporting.h
@@ -57,7 +57,7 @@ typedef struct reporting_content_metrics {
 	struct {
 		int adaptive; // constant
 		// int rate; // constant
-		int nominal; // no may vary during the call <- average? worst score? 
+		int nominal; // no may vary during the call <- average? worst score?
 		int max; // no may vary during the call <- average?
 		int abs_max; // constant
 	} jitter_buffer;
@@ -68,10 +68,10 @@ typedef struct reporting_content_metrics {
 		float jitter_buffer_discard_rate; //idem
 	} packet_loss;
 
-	// burst gap loss - optional 
+	// burst gap loss - optional
 	// (no) currently not implemented
 	// struct {
-	// 	int burst_loss_density; 
+	// 	int burst_loss_density;
 	// 	int burst_duration;
 	// 	float gap_loss_density;
 	// 	int gap_duration;
@@ -90,7 +90,7 @@ typedef struct reporting_content_metrics {
 
 	// signal - optional
 	struct {
-		int level; // no - vary 
+		int level; // no - vary
 		int noise_level; // no - vary
 		// int residual_echo_return_loss;
 	} signal;
@@ -101,7 +101,7 @@ typedef struct reporting_content_metrics {
 		int rcq; //voip metrics R factor - no - vary or avg  in [0..120]
 		float moslq; // no - vary or avg - voip metrics - in [0..4.9]
 		float moscq; // no - vary or avg - voip metrics - in [0..4.9]
-		
+
 
 		// int extri;
 		// int extro;
@@ -114,7 +114,7 @@ typedef struct reporting_content_metrics {
 		// char * qoestalg;
 	} quality_estimates;
 } reporting_content_metrics_t;
- 
+
 typedef struct reporting_session_report {
 	struct {
 		char * call_id;
diff --git a/coreapi/sal.c b/coreapi/sal.c
index e42c124cc..5404210f3 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -17,9 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-/** 
+/**
  This header files defines the Signaling Abstraction Layer.
- The purpose of this layer is too allow experiment different call signaling 
+ The purpose of this layer is too allow experiment different call signaling
  protocols and implementations under linphone, for example SIP, JINGLE...
 **/
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@ const char* sal_transport_to_string(SalTransport transport) {
 		default: {
 			ms_fatal("Unexpected transport [%i]",transport);
 			return NULL;
-		}    
+		}
 	}
 }
 
@@ -409,17 +409,17 @@ void __sal_op_free(SalOp *op){
 		sal_address_destroy(b->to_address);
 		b->to_address=NULL;
 	}
-	
+
 	if (b->service_route){
 		sal_address_destroy(b->service_route);
 		b->service_route=NULL;
 	}
-	
+
 	if (b->origin_address){
 		sal_address_destroy(b->origin_address);
 		b->origin_address=NULL;
 	}
-	
+
 	if (b->from) {
 		ms_free(b->from);
 		b->from=NULL;
@@ -624,7 +624,7 @@ static int line_get_value(const char *input, const char *key, char *value, size_
 
 int sal_lines_get_value(const char *data, const char *key, char *value, size_t value_size){
 	int read=0;
-	
+
 	do{
 		if (line_get_value(data,key,value,value_size,&read))
 			return TRUE;
@@ -634,7 +634,7 @@ int sal_lines_get_value(const char *data, const char *key, char *value, size_t v
 }
 
 int sal_body_has_type(const SalBody *body, const char *type, const char *subtype){
-	return body->type && body->subtype 
+	return body->type && body->subtype
 		&& strcmp(body->type,type)==0
 		&& strcmp(body->subtype,subtype)==0;
 }
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 7ec00f596..b6356350a 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -17,9 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-/** 
+/**
  This header files defines the Signaling Abstraction Layer.
- The purpose of this layer is too allow experiment different call signaling 
+ The purpose of this layer is too allow experiment different call signaling
  protocols and implementations under linphone, for example SIP, JINGLE...
 **/
 
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 999dc0d77..51fb39859 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -103,10 +103,10 @@ void liblinphone_tester_check_rtcp(LinphoneCoreManager* caller, LinphoneCoreMana
 
 	c1=linphone_core_get_current_call(caller->lc);
 	c2=linphone_core_get_current_call(callee->lc);
-	
+
 	CU_ASSERT_PTR_NOT_NULL(c1);
 	CU_ASSERT_PTR_NOT_NULL(c2);
-	
+
 	if (!c1 || !c2) return;
 
 	for (i=0; i<24 /*=12s need at least one exchange of SR to maybe 10s*/; i++) {
@@ -316,7 +316,7 @@ static void cancelled_call(void) {
 static void disable_all_codecs_except_one(LinphoneCore *lc, const char *mime){
 	const MSList *elem=linphone_core_get_audio_codecs(lc);
 	PayloadType *pt;
-	
+
 	for(;elem!=NULL;elem=elem->next){
 		pt=(PayloadType*)elem->data;
 		linphone_core_enable_payload_type(lc,pt,FALSE);
@@ -351,7 +351,7 @@ static void call_with_dns_time_out(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new2( "empty_rc", FALSE);
 	LCSipTransports transport = {9773,0,0,0};
 	int i;
-	
+
 	linphone_core_set_sip_transports(marie->lc,&transport);
 	linphone_core_iterate(marie->lc);
 	sal_set_dns_timeout(marie->lc->sal,0);
@@ -359,7 +359,7 @@ static void call_with_dns_time_out(void) {
 	for(i=0;i<10;i++){
 		ms_usleep(200000);
 		linphone_core_iterate(marie->lc);
-	}	
+	}
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingInit,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallOutgoingProgress,1);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallError,1);
@@ -372,21 +372,21 @@ static void early_cancelled_call(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new2( "empty_rc",FALSE);
 
 	LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity);
-	
+
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallOutgoingInit,1));
 	linphone_core_terminate_call(pauline->lc,out_call);
-	
+
 	/*since everything is executed in a row, no response can be received from the server, thus the CANCEL cannot be sent.
 	 It will ring at Marie's side.*/
-	
+
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
-	
+
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallEnd,1);
-	
+
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallIncomingReceived,1));
 	/* now the CANCEL should have been sent and the the call at marie's side should terminate*/
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
-	
+
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallReleased,1));
 
 	linphone_core_manager_destroy(marie);
@@ -426,7 +426,7 @@ static void early_declined_call(void) {
 	CU_ASSERT_TRUE(wait_for_until(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallError,1,33000));
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallError,1);
 	/* FIXME http://git.linphone.org/mantis/view.php?id=757
-	
+
 	CU_ASSERT_EQUAL(linphone_call_get_reason(out_call),LinphoneReasonBusy);
 	 */
 	if (ms_list_size(linphone_core_get_call_logs(pauline->lc))>0) {
@@ -466,7 +466,7 @@ static void call_declined(void) {
 static void call_terminated_by_caller(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	CU_ASSERT_TRUE(call(pauline,marie));
 	/*just to sleep*/
 	linphone_core_terminate_all_calls(pauline->lc);
@@ -480,7 +480,7 @@ static void call_terminated_by_caller(void) {
 static void call_with_no_sdp(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	linphone_core_enable_sdp_200_ack(marie->lc,TRUE);
 
 	CU_ASSERT_TRUE(call(marie,pauline));
@@ -500,7 +500,7 @@ static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee
 
 	c1=linphone_core_get_current_call(caller->lc);
 	c2=linphone_core_get_current_call(callee->lc);
-	
+
 	CU_ASSERT_PTR_NOT_NULL(c1);
 	CU_ASSERT_PTR_NOT_NULL(c2);
 
@@ -522,12 +522,12 @@ static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee
 static void _call_with_ice(bool_t random_ports) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
 	linphone_core_set_stun_server(marie->lc,"stun.linphone.org");
 	linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce);
 	linphone_core_set_stun_server(pauline->lc,"stun.linphone.org");
-	
+
 	if (random_ports){
 		linphone_core_set_audio_port(marie->lc,-1);
 		linphone_core_set_video_port(marie->lc,-1);
@@ -541,9 +541,9 @@ static void _call_with_ice(bool_t random_ports) {
 	/*wait for the ICE reINVITE to complete*/
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallStreamsRunning,2));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallStreamsRunning,2));
-	
+
 	CU_ASSERT_TRUE(check_ice(pauline,marie,LinphoneIceStateHostConnection));
-	
+
 	liblinphone_tester_check_rtcp(marie,pauline);
 	/*then close the call*/
 	linphone_core_terminate_all_calls(pauline->lc);
@@ -581,17 +581,17 @@ static void call_with_custom_headers(void) {
 	ms_free(tmp);
 	linphone_address_destroy(marie->identity);
 	marie->identity=marie_identity;
-	
+
 	params=linphone_core_create_default_call_parameters(marie->lc);
 	linphone_call_params_add_custom_header(params,"Weather","bad");
 	linphone_call_params_add_custom_header(params,"Working","yes");
-	
+
 	CU_ASSERT_TRUE(call_with_caller_params(pauline,marie,params));
 	linphone_call_params_destroy(params);
-	
+
 	call_marie=linphone_core_get_current_call(marie->lc);
 	call_pauline=linphone_core_get_current_call(pauline->lc);
-	
+
 	CU_ASSERT_PTR_NOT_NULL(call_marie);
 	CU_ASSERT_PTR_NOT_NULL(call_pauline);
 
@@ -752,12 +752,12 @@ static void call_with_video_added(void) {
 static void call_with_video_added_random_ports(void) {
 	LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
-	
+
 	linphone_core_set_audio_port(marie->lc,-1);
 	linphone_core_set_video_port(marie->lc,-1);
 	linphone_core_set_audio_port(pauline->lc,-1);
 	linphone_core_set_video_port(pauline->lc,-1);
-	
+
 	CU_ASSERT_TRUE(call(pauline,marie));
 
 	CU_ASSERT_TRUE(add_video(pauline,marie));
@@ -848,17 +848,17 @@ static void _call_with_media_relay(bool_t random_ports) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 	linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL);
 	linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL);
-	
+
 	if (random_ports){
 		linphone_core_set_audio_port(marie->lc,-1);
 		linphone_core_set_video_port(marie->lc,-1);
 		linphone_core_set_audio_port(pauline->lc,-1);
 		linphone_core_set_video_port(pauline->lc,-1);
 	}
-	
+
 	CU_ASSERT_TRUE(call(pauline,marie));
 	liblinphone_tester_check_rtcp(pauline,marie);
-	
+
 #ifdef VIDEO_ENABLED
 	CU_ASSERT_TRUE(add_video(pauline,marie));
 	liblinphone_tester_check_rtcp(pauline,marie);
@@ -944,7 +944,7 @@ static void call_with_privacy2(void) {
 	LinphoneProxyConfig* pauline_proxy;
 	params=linphone_core_create_default_call_parameters(pauline->lc);
 	linphone_call_params_set_privacy(params,LinphonePrivacyId);
-	
+
 	linphone_core_get_default_proxy(pauline->lc,&pauline_proxy);
 	linphone_proxy_config_edit(pauline_proxy);
 	linphone_proxy_config_enable_register(pauline_proxy,FALSE);
@@ -1151,7 +1151,7 @@ static void encrypted_call(LinphoneMediaEncryption mode) {
 
 		CU_ASSERT_EQUAL(linphone_core_get_media_encryption(marie->lc),mode);
 		CU_ASSERT_EQUAL(linphone_core_get_media_encryption(pauline->lc),mode);
-		if (linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP 
+		if (linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP
 			&& linphone_core_get_media_encryption(pauline->lc) == LinphoneMediaEncryptionZRTP) {
 			/*check SAS*/
 			CU_ASSERT_STRING_EQUAL(linphone_call_get_authentication_token(linphone_core_get_current_call(pauline->lc))
@@ -1233,7 +1233,7 @@ static void srtp_ice_call(void) {
 		/*wait for ice to found the direct path*/
 		CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_IframeDecoded,1));
 #endif
-		
+
 
 		/*just to sleep*/
 		linphone_core_terminate_all_calls(marie->lc);
@@ -1258,19 +1258,19 @@ static void early_media_call(void) {
 
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingEarlyMedia,1);
 	CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1);
-	
+
 	wait_for_until(pauline->lc,marie->lc,NULL,0,1000);
-	
+
 	/*added because a bug related to early-media caused the Connected state to be reached two times*/
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallConnected,1);
-	
+
 	/*just to sleep*/
 	linphone_core_terminate_all_calls(marie->lc);
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
 	CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1));
 
-	
-	
+
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -1287,7 +1287,7 @@ static void early_media_call_with_ringing(void){
 	/*
 		Marie calls Pauline, and after the call has rung, transitions to an early_media session
 	*/
-	
+
 	/*use playfile for callee to avoid locking on capture card*/
 	linphone_core_use_files (pauline->lc,TRUE);
 	snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
@@ -1323,7 +1323,7 @@ static void early_media_call_with_ringing(void){
 
 
 	ms_list_free(lcs);
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }
@@ -1446,9 +1446,9 @@ static void simple_call_transfer(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallPaused,1,2000));
 	/*marie calling laure*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
-	
+
 	CU_ASSERT_PTR_NOT_NULL(linphone_call_get_transfer_target_call(marie_calling_pauline));
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallOutgoingInit,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallIncomingReceived,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallOutgoingRinging,1,2000));
@@ -1458,11 +1458,11 @@ static void simple_call_transfer(void) {
 	CU_ASSERT_TRUE(wait_for_list(lcs,&laure->stat.number_of_LinphoneCallStreamsRunning,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallConnected,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	
+
 	marie_calling_laure=linphone_core_get_current_call(marie->lc);
 	CU_ASSERT_PTR_NOT_NULL_FATAL(marie_calling_laure);
 	CU_ASSERT_TRUE(linphone_call_get_transferer_call(marie_calling_laure)==marie_calling_pauline);
-	
+
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneTransferCallConnected,1,2000));
 
 	/*terminate marie to pauline call*/
@@ -1496,11 +1496,11 @@ static void unattended_call_transfer(void) {
 
 	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,laure_identity);
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-	
+
 	/*marie ends the call  */
 	linphone_core_terminate_call(marie->lc,pauline_called_by_marie);
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallEnd,1,2000));
-	
+
 	/*Pauline starts the transfer*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingProgress,1,2000));
@@ -1537,21 +1537,21 @@ static void unattended_call_transfer_with_error(void) {
 
 	linphone_core_transfer_call(marie->lc,pauline_called_by_marie,"unknown_user");
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallRefered,1,2000));
-	
+
 	/*Pauline starts the transfer*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallOutgoingInit,1,2000));
 	/* and immediately get an error*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallError,1,2000));
-	
+
 	/*the error must be reported back to marie*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneTransferCallError,1,2000));
 
 	/*and pauline should resume the call automatically*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneCallResuming,1,2000));
-	
+
 	/*and call should be resumed*/
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallStreamsRunning,1,2000));
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	ms_list_free(lcs);
@@ -1705,7 +1705,7 @@ static void call_established_with_rejected_incoming_reinvite(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
 
 	CU_ASSERT_TRUE(call(pauline,marie));
-	
+
 	/*wait for ACK to be transmitted before going to reINVITE*/
 	wait_for_until(marie->lc,pauline->lc,NULL,0,1000);
 
@@ -1750,7 +1750,7 @@ static void call_redirect(void){
 	/*
 		Marie calls Pauline, which will redirect the call to Laure via a 302
 	*/
-	
+
 	/*use playfile for callee to avoid locking on capture card*/
 	linphone_core_use_files (pauline->lc,TRUE);
 	linphone_core_use_files (laure->lc,TRUE);
@@ -1788,7 +1788,7 @@ static void call_redirect(void){
 	CU_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneCallEnd,1,1000));
 
 	ms_list_free(lcs);
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 	linphone_core_manager_destroy(laure);
@@ -1901,7 +1901,7 @@ static void statistics_not_used_without_config() {
 	CU_ASSERT_TRUE(linphone_proxy_config_send_statistics_enabled(call_marie->dest_proxy));
 	CU_ASSERT_FALSE(linphone_proxy_config_send_statistics_enabled(call_pauline->dest_proxy));
 
-	CU_ASSERT_EQUAL(strcmp("sip:collector@sip.linphone.org", 
+	CU_ASSERT_EQUAL(strcmp("sip:collector@sip.example.org",
 		linphone_proxy_config_get_statistics_collector(call_marie->dest_proxy)), 0);
 
 	// this field should be already filled
@@ -1935,7 +1935,7 @@ static void statistics_not_sent_if_call_not_started() {
 
 	// wait a few time...
 	wait_for(marie->lc,NULL,NULL,0);
-	// since the callee was busy, there shouldn't be no publish to do 
+	// since the callee was busy, there shouldn't be no publish to do
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishProgress,0);
 	CU_ASSERT_EQUAL(marie->stat.number_of_LinphonePublishOk,0);
 
@@ -1964,7 +1964,7 @@ static void statistics_sent_at_call_termination() {
 	// PUBLISH submission to the collector should be ok
 	CU_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphonePublishProgress,1));
 	CU_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphonePublishOk,1)); // failing since server side is not implemented
-	
+
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 }