fix for srtp when retrying in unencrypted mode

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index f4f0a0425e463355a8c58fdef691d90828ce2b8e..bfdfde8ee772fcfb431de22a88e5355c18418b01 100644 (file)
--- 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 918fb18951a5ee4044decdda4d63521b5721178d..39b0389efad9d8d5a22eae57b4f7ffc8b3b4144c 100644 (file)
--- 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 5314bb28160b83b06ce7e4bbda891b710034fe30..c1bd5c5ac9cda6652bd535cf5e1df31b18466fec 100644 (file)
--- 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);