From 9563b0d159377905b34db0948b5084214d6d3210 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 14 Feb 2012 10:41:20 +0100
Subject: [PATCH] fix missing "lr" causing old fashioned outbound proxy routing

---
 coreapi/linphonecall.c         |  2 +-
 coreapi/proxy.c                | 20 ++++++++++++--------
 coreapi/sal_eXosip2.c          |  6 +++---
 coreapi/sal_eXosip2_presence.c |  1 +
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 15672211f..31c9cbfcb 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -350,7 +350,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		 we get a chance to discover our nat'd address before answering.*/
 		call->ping_op=sal_op_new(lc->sal);
 		from_str=linphone_address_as_string_uri_only(from);
-		sal_op_set_route(call->ping_op,sal_op_get_network_origin(call->op));
+		sal_op_set_route(call->ping_op,sal_op_get_network_origin(op));
 		sal_op_set_user_pointer(call->ping_op,call);
 		sal_ping(call->ping_op,linphone_core_find_best_identity(lc,from,NULL),from_str);
 		ms_free(from_str);
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index c708dcf40..a01f1ffd0 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -172,16 +172,20 @@ int linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route)
 		obj->reg_route=NULL;
 	}
 	if (route!=NULL){
-		LinphoneAddress *addr;
+		SalAddress *addr;
+		char *tmp;
 		/*try to prepend 'sip:' */
 		if (strstr(route,"sip:")==NULL){
-			obj->reg_route=ms_strdup_printf("sip:%s",route);
-		}else obj->reg_route=ms_strdup(route);
-		addr=linphone_address_new(obj->reg_route);
-		if (addr==NULL){
-			ms_free(obj->reg_route);
-			obj->reg_route=NULL;
-		}else linphone_address_destroy(addr);
+			tmp=ms_strdup_printf("sip:%s",route);
+		}else tmp=ms_strdup(route);
+		addr=sal_address_new(tmp);
+		if (addr!=NULL){
+			sal_address_destroy(addr);
+		}else{
+			ms_free(tmp);
+			tmp=NULL;
+		}
+		obj->reg_route=tmp;
 	}
 	return 0;
 }
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index ace208e1b..1c7fd5b51 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -717,8 +717,8 @@ int sal_ping(SalOp *op, const char *from, const char *to){
 	
 	sal_op_set_from(op,from);
 	sal_op_set_to(op,to);
+	sal_exosip_fix_route(op);
 
-	/*bug here: eXosip2 does not honor the route argument*/
 	eXosip_options_build_request (&options, sal_op_get_to(op),
 			sal_op_get_from(op),sal_op_get_route(op));
 	if (options){
@@ -2216,10 +2216,10 @@ void sal_address_set_param(SalAddress *u,const char* name,const char* value) {
 	osip_uri_param_t *param=NULL;
     osip_uri_uparam_get_byname(((osip_from_t*)u)->url,(char*)name,&param);
     if (param == NULL){
-        osip_uri_uparam_add	(((osip_from_t*)u)->url,ms_strdup(name),ms_strdup(value));
+        osip_uri_uparam_add	(((osip_from_t*)u)->url,ms_strdup(name),value ? ms_strdup(value) : NULL);
     } else {
         osip_free(param->gvalue);
-        param->gvalue=osip_strdup(value);
+        param->gvalue=value ? osip_strdup(value) : NULL;
     }
     
 }
diff --git a/coreapi/sal_eXosip2_presence.c b/coreapi/sal_eXosip2_presence.c
index 4a18c4611..f79866a0a 100644
--- a/coreapi/sal_eXosip2_presence.c
+++ b/coreapi/sal_eXosip2_presence.c
@@ -92,6 +92,7 @@ int sal_text_send(SalOp *op, const char *from, const char *to, const char *msg){
 		if (to)
 			sal_op_set_to(op,to);
 
+		sal_exosip_fix_route(op);
 		eXosip_lock();
 		eXosip_message_build_request(&sip,"MESSAGE",sal_op_get_to(op),
 			sal_op_get_from(op),sal_op_get_route(op));