From 7f849dc29f7a6c57634e478b895c6bf97af21335 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 4 Nov 2011 15:06:09 +0100
Subject: [PATCH] fix for srtp when retrying in unencrypted mode

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

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index f4f0a0425..bfdfde8ee 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -537,6 +537,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
 					!linphone_core_is_media_encryption_mandatory(lc)) {
 					int i;
 					ms_message("Outgoing call failed with SRTP (SAVP) enabled - retrying with AVP");
+					linphone_call_stop_media_streams(call);
 					/* clear SRTP local params */
 					call->params.media_encryption = LinphoneMediaEncryptionNone;
 					for(i=0; i<call->localdesc->nstreams; i++) {
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 918fb1895..39b0389ef 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -325,7 +325,7 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr
 		linphone_core_run_stun_tests(call->core,call);
 	discover_mtu(lc,linphone_address_get_domain (to));
 	if (params->referer){
-		sal_call_set_referer (call->op,params->referer->op);
+		sal_call_set_referer(call->op,params->referer->op);
 	}
 	return call;
 }
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 5314bb281..c1bd5c5ac 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -515,7 +515,6 @@ static void sdp_process(SalOp *h){
 		strcpy(h->result->addr,h->base.remote_media->addr);
 		h->result->bandwidth=h->base.remote_media->bandwidth;
 		
-		//remplacer la cle
 		for(i=0;i<h->result->nstreams;++i){
 			if (h->result->streams[i].port>0){
 				strcpy(h->result->streams[i].addr,h->base.remote_media->streams[i].addr);