From a877fe85a9f5a3c31bf1032b2fa4b997358b282f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 16 Dec 2011 23:14:50 +0100
Subject: [PATCH] bugfix for options message

---
 coreapi/linphonecall.c | 2 +-
 coreapi/sal_eXosip2.c  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 45932f3605..f9920a9e62 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -349,7 +349,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 		/*the following sends an option request back to the caller so that
 		 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(from);
+		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_user_pointer(call->ping_op,call);
 		sal_ping(call->ping_op,linphone_core_find_best_identity(lc,from,NULL),from_str);
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index cc747d9a52..533fa860ab 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -722,6 +722,7 @@ int sal_ping(SalOp *op, const char *from, const char *to){
 	
 	sal_op_set_from(op,from);
 	sal_op_set_to(op,to);
+
 	/*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));
-- 
GitLab