fix crash when receiving an incorrect SDP message in a 200Ok.

[linphone] / coreapi / callbacks.c

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index f166bc49fdd87e29db3831e98f27e55a41b90435..a6b49a0e8e878eb76cee10453ce86a0ab55187bb 100644 (file)
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -41,14 +41,14 @@ void linphone_core_update_streams_destinations(LinphoneCore *lc, LinphoneCall *c
        char *rtp_addr, *rtcp_addr;
        int i;
 
-       for (i = 0; i < old_md->nstreams; i++) {
+       for (i = 0; i < old_md->n_active_streams; i++) {
                if (old_md->streams[i].type == SalAudio) {
                        old_audiodesc = &old_md->streams[i];
                } else if (old_md->streams[i].type == SalVideo) {
                        old_videodesc = &old_md->streams[i];
                }
        }
-       for (i = 0; i < new_md->nstreams; i++) {
+       for (i = 0; i < new_md->n_active_streams; i++) {
                if (new_md->streams[i].type == SalAudio) {
                        new_audiodesc = &new_md->streams[i];
                } else if (new_md->streams[i].type == SalVideo) {
@@ -151,7 +151,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
                bool_t send_ringbacktone=FALSE;
                
                if (call->audiostream==NULL){
-                       /*this happens after pausing the call locally. The streams is destroyed and then we wait the 200Ok to recreate it*/
+                       /*this happens after pausing the call locally. The streams are destroyed and then we wait the 200Ok to recreate them*/
                        linphone_call_init_media_streams (call);
                }
                if (call->state==LinphoneCallIncomingEarlyMedia && linphone_core_get_remote_ringback_tone (lc)!=NULL){
@@ -163,6 +163,9 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
                }
                linphone_call_start_media_streams(call,all_muted,send_ringbacktone);
        }
+       if (call->state==LinphoneCallPausing && call->paused_by_app && ms_list_size(lc->calls)==1){
+               linphone_core_play_named_tone(lc,LinphoneToneCallOnHold);
+       }
 }
 #if 0
 static bool_t is_duplicate_call(LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to){
@@ -348,7 +351,8 @@ static void call_accepted(SalOp *op){
 #endif //BUILD_UPNP
 
        md=sal_call_get_final_media_description(op);
-       call->params.has_video &= linphone_core_media_description_contains_video_stream(md);
+       if (md)
+               call->params.has_video &= linphone_core_media_description_contains_video_stream(md);
        
        if (call->state==LinphoneCallOutgoingProgress ||
            call->state==LinphoneCallOutgoingRinging ||
@@ -356,7 +360,8 @@ static void call_accepted(SalOp *op){
                linphone_call_set_state(call,LinphoneCallConnected,"Connected");
                if (call->referer) linphone_core_notify_refer_state(lc,call->referer,call);
        }
-       if (md && !sal_media_description_empty(md)){
+       if (md && !sal_media_description_empty(md) && !linphone_core_incompatible_security(lc,md)){
+               linphone_call_update_remote_session_id_and_ver(call);
                if (sal_media_description_has_dir(md,SalStreamSendOnly) ||
                    sal_media_description_has_dir(md,SalStreamInactive)){
                        if (lc->vtable.display_status){
@@ -405,7 +410,7 @@ static void call_accepted(SalOp *op){
        }else{
                /*send a bye*/
                ms_error("Incompatible SDP offer received in 200Ok, need to abort the call");
-               linphone_core_abort_call(lc,call,_("Incompatible, check codecs..."));
+               linphone_core_abort_call(lc,call,_("Incompatible, check codecs or security settings..."));
        }
 }
 
@@ -443,6 +448,7 @@ static void call_accept_update(LinphoneCore *lc, LinphoneCall *call){
                linphone_core_update_local_media_description_from_upnp(call->localdesc,call->upnp_session);
        }
 #endif //BUILD_UPNP
+       linphone_call_update_remote_session_id_and_ver(call);
        sal_call_accept(call->op);
        md=sal_call_get_final_media_description(call->op);
        if (md && !sal_media_description_empty(md))
@@ -611,7 +617,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
                                        if (call->state==LinphoneCallOutgoingInit || call->state==LinphoneCallOutgoingProgress){
                                                /* clear SRTP local params */
                                                call->params.media_encryption = LinphoneMediaEncryptionNone;
-                                               for(i=0; i<call->localdesc->nstreams; i++) {
+                                               for(i=0; i<call->localdesc->n_active_streams; i++) {
                                                        call->localdesc->streams[i].proto = SalProtoRtpAvp;
                                                        memset(call->localdesc->streams[i].crypto, 0, sizeof(call->localdesc->streams[i].crypto));
                                                }
@@ -649,6 +655,10 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
        } else if (sr == SalReasonNotFound) {
                call->reason=LinphoneReasonNotFound;
                linphone_call_set_state(call,LinphoneCallError,"User not found.");
+       } else if (sr == SalReasonBusy) {
+               call->reason=LinphoneReasonBusy;
+               linphone_call_set_state(call,LinphoneCallError,"User is busy.");
+               linphone_core_play_named_tone(lc,LinphoneToneBusy);
        } else {
                linphone_call_set_state(call,LinphoneCallError,msg);
        }
@@ -804,7 +814,7 @@ static void refer_received(Sal *sal, SalOp *op, const char *referto){
                }
                if (call->state!=LinphoneCallPaused){
                        ms_message("Automatically pausing current call to accept transfer.");
-                       linphone_core_pause_call(lc,call);
+                       _linphone_core_pause_call(lc,call);
                        call->was_automatically_paused=TRUE;
                        /*then we will start the refered when the pause is accepted, in order to serialize transactions within the dialog.
                         * Indeed we need to avoid to send a NOTIFY to inform about of state of the refered call while the pause isn't completed.
@@ -837,10 +847,10 @@ static bool_t is_duplicate_msg(LinphoneCore *lc, const char *msg_id){
 }
 
 
-static void text_received(Sal *sal, const SalMessage *msg){
-       LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal);
+static void text_received(SalOp *op, const SalMessage *msg){
+       LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
        if (is_duplicate_msg(lc,msg->message_id)==FALSE){
-               linphone_core_message_received(lc,msg->from,msg->text,msg->url);
+               linphone_core_message_received(lc,op,msg);
        }
 }
 
@@ -929,9 +939,11 @@ static void text_delivery_update(SalOp *op, SalTextDeliveryStatus status){
        LinphoneChatMessage *chat_msg=(LinphoneChatMessage* )sal_op_get_user_pointer(op);
        const MSList* calls = linphone_core_get_calls(chat_msg->chat_room->lc);
        
+       chat_msg->state=chatStatusSal2Linphone(status);
+       linphone_chat_message_store_state(chat_msg);
        if (chat_msg && chat_msg->cb) {
                chat_msg->cb(chat_msg
-                       ,chatStatusSal2Linphone(status)
+                       ,chat_msg->state
                        ,chat_msg->cb_ud);
        }
        linphone_chat_message_destroy(chat_msg);