schedule call release after sending the bye, to allow possible authentication challenge

diff --git a/NEWS b/NEWS
index 2f74239aa4cf1759f90457dc7348e849725629b8..ab77e82026bbeaed567da9a5c74e2bea4ba35f72 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,10 @@ linphone-3.4.0 -- XXXXX
                - creation of another outgoing call while already in call
                - blind call transfer
                - attended call transfer
+                       **CAUTION**: LinphoneCoreVTable has changed: pay attention to this when upgrading an old application to a newer liblinphone.
        * improve bandwidth management (one b=AS line is used for audio+video)
-       * improvements in the echo limiter
+       * improvements in the echo limiter performance
+       * implement a echo calibration feature (see linphone_core_start_echo_calibration()).
        * stun support bugfixes
        * possibility to use two video windows, one for local preview, one for remote video (linphonec only)
        * optimize by not re-creating streams when SDP is unchanged during a reinvite

diff --git a/console/Makefile.am b/console/Makefile.am
index cf6a336ed70e95bdc48cd18a7ed9075056dee6d0..4ae2c794751de551b4d588f184e3e8936605ec9f 100644 (file)
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -33,17 +33,6 @@ linphoned_LDADD=$(linphonec_LDADD)
 endif
 
 
-sipomatic_SOURCES=\
-       sipomatic.c sipomatic.h
-sipomatic_CFLAGS= $(COMMON_CFLAGS) $(CONSOLE_FLAGS)
-
-sipomatic_LDADD=       $(INTLLIBS)  \
-                       $(top_builddir)/coreapi/liblinphone.la \
-                       $(MEDIASTREAMER_LIBS) \
-                       $(ORTP_LIBS) \
-                       $(SPEEX_LIBS) \
-                       $(OSIP_LIBS)
-
 linphonecsh_SOURCES = shell.c
 linphonecsh_CFLAGS = $(CONSOLE_FLAGS)
 linphonecsh_LDADD = $(ORTP_LIBS)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index bf60f4c0d0f609a4e7807d8a5014081e1bf92173..f9204791328b21bbb0eeb164c62cfc31278ae47c 100644 (file)
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -501,6 +501,11 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
        }
 }
 
+static void call_released(SalOp *op){
+       LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
+       linphone_call_set_state(call,LinphoneCallReleased,"Call released");
+}
+
 static void auth_requested(SalOp *h, const char *realm, const char *username){
        LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(h));
        LinphoneAuthInfo *ai=(LinphoneAuthInfo*)linphone_core_find_auth_info(lc,realm,username);
@@ -676,6 +681,7 @@ SalCallbacks linphone_sal_callbacks={
        call_updating,
        call_terminated,
        call_failure,
+       call_released,
        auth_requested,
        auth_success,
        register_success,

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index cea826a25aacfdb285ce3f6e9418d5125679cb5b..a926096378c3ac909d6b448437bd6ad45ce88125 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -236,13 +236,6 @@ static void linphone_call_set_terminated(LinphoneCall *call){
        if (ms_list_size(lc->calls)==0)
                linphone_core_notify_all_friends(lc,lc->presence_mode);
        
-       if (call->op!=NULL) {
-               /* so that we cannot have anymore upcalls for SAL
-                concerning this call*/
-               sal_op_release(call->op);
-               call->op=NULL;
-       }
-       linphone_call_unref(call);
 }
 
 const char *linphone_call_state_to_string(LinphoneCallState cs){
@@ -283,13 +276,15 @@ const char *linphone_call_state_to_string(LinphoneCallState cs){
                        return "LinphoneCallIncomingEarlyMedia";
                case LinphoneCallUpdated:
                        return "LinphoneCallUpdated";
+               case LinphoneCallReleased:
+                       return "LinphoneCallReleased";
        }
        return "undefined state";
 }
 
 void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const char *message){
        LinphoneCore *lc=call->core;
-       bool_t finalize_call=FALSE;
+
        if (call->state!=cstate){
                ms_message("Call %p: moving from state %s to %s",call,linphone_call_state_to_string(call->state),
                           linphone_call_state_to_string(cstate));
@@ -299,14 +294,19 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
                        call->state=cstate;
                }
                if (cstate==LinphoneCallEnd || cstate==LinphoneCallError){
-                       finalize_call=TRUE;
-                       linphone_call_ref(call);
                        linphone_call_set_terminated (call);
                }
                if (lc->vtable.call_state_changed)
                        lc->vtable.call_state_changed(lc,call,cstate,message);
-               if (finalize_call)
+               if (cstate==LinphoneCallReleased){
+                       if (call->op!=NULL) {
+                               /* so that we cannot have anymore upcalls for SAL
+                                concerning this call*/
+                               sal_op_release(call->op);
+                               call->op=NULL;
+                       }
                        linphone_call_unref(call);
+               }
        }
 }
 

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 7861632cfa96564261e6f9ad961307a16273edc0..72bc5e2d0bba04fa2cd7dfa51e4534ba20df133b 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -590,6 +590,8 @@ static void rtp_config_read(LinphoneCore *lc)
        jitt_comp=lp_config_get_int(lc->config,"rtp","audio_jitt_comp",60);
        linphone_core_set_audio_jittcomp(lc,jitt_comp);
        jitt_comp=lp_config_get_int(lc->config,"rtp","video_jitt_comp",60);
+       if (jitt_comp==0) jitt_comp=60;
+       lc->rtp_conf.video_jitt_comp=jitt_comp;
        nortp_timeout=lp_config_get_int(lc->config,"rtp","nortp_timeout",30);
        linphone_core_set_nortp_timeout(lc,nortp_timeout);
        rtp_no_xmit_on_audio_mute=lp_config_get_int(lc->config,"rtp","rtp_no_xmit_on_audio_mute",FALSE);

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 6ad65d8d470b0def4ef2d3fbd9243710c007a82b..04be47483e4065a0a29e10610fb8c2150fd00257 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -221,7 +221,8 @@ typedef enum _LinphoneCallState{
        LinphoneCallPausedByRemote, /**<The call is paused by remote end*/
        LinphoneCallUpdatedByRemote, /**<The call's parameters are updated, used for example when video is asked by remote */
        LinphoneCallIncomingEarlyMedia, /**<We are proposing early media to an incoming call */
-       LinphoneCallUpdated /**<The remote accepted the call update initiated by us */
+       LinphoneCallUpdated, /**<The remote accepted the call update initiated by us */
+       LinphoneCallReleased /**< The call object is no more retained by the core */
 } LinphoneCallState;
 
 const char *linphone_call_state_to_string(LinphoneCallState cs);

diff --git a/coreapi/sal.h b/coreapi/sal.h
index 3434b54c27dce30f7cc92cf5fdacb6f695e20cdd..f20555b0a8ad8b3a64e66f414e66b3096fccc600 100644 (file)
--- a/coreapi/sal.h
+++ b/coreapi/sal.h
@@ -192,6 +192,7 @@ typedef void (*SalOnCallAck)(SalOp *op);
 typedef void (*SalOnCallUpdating)(SalOp *op);/*< Called when a reINVITE is received*/
 typedef void (*SalOnCallTerminated)(SalOp *op, const char *from);
 typedef void (*SalOnCallFailure)(SalOp *op, SalError error, SalReason reason, const char *details, int code);
+typedef void (*SalOnCallReleased)(SalOp *salop);
 typedef void (*SalOnAuthRequested)(SalOp *op, const char *realm, const char *username);
 typedef void (*SalOnAuthSuccess)(SalOp *op, const char *realm, const char *username);
 typedef void (*SalOnRegisterSuccess)(SalOp *op, bool_t registered);
@@ -215,6 +216,7 @@ typedef struct SalCallbacks{
        SalOnCallUpdating call_updating;
        SalOnCallTerminated call_terminated;
        SalOnCallFailure call_failure;
+       SalOnCallReleased call_released;
        SalOnAuthRequested auth_requested;
        SalOnAuthSuccess auth_success;
        SalOnRegisterSuccess register_success;

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index f4bc032805aec84b0ac4e72133cfab9deecf6436..b993d88bd8cacabc85b4d3e24524d5a8635e55f1 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -296,6 +296,8 @@ void sal_set_callbacks(Sal *ctx, const SalCallbacks *cbs){
                ctx->callbacks.call_failure=(SalOnCallFailure)unimplemented_stub;
        if (ctx->callbacks.call_terminated==NULL) 
                ctx->callbacks.call_terminated=(SalOnCallTerminated)unimplemented_stub;
+       if (ctx->callbacks.call_released==NULL)
+               ctx->callbacks.call_released=(SalOnCallReleased)unimplemented_stub;
        if (ctx->callbacks.call_updating==NULL) 
                ctx->callbacks.call_updating=(SalOnCallUpdating)unimplemented_stub;
        if (ctx->callbacks.auth_requested==NULL) 
@@ -764,8 +766,6 @@ int sal_call_terminate(SalOp *h){
        if (err!=0){
                ms_warning("Exosip could not terminate the call: cid=%i did=%i", h->cid,h->did);
        }
-       sal_remove_call(h->base.root,h);
-       h->cid=-1;
        return 0;
 }
 
@@ -1054,8 +1054,6 @@ static void call_terminated(Sal *sal, eXosip_event_t *ev){
        if (ev->request){
                osip_from_to_str(ev->request->from,&from);
        }
-       sal_remove_call(sal,op);
-       op->cid=-1;
        sal->callbacks.call_terminated(op,from!=NULL ? from : sal_op_get_from(op));
        if (from) osip_free(from);
 }
@@ -1066,9 +1064,10 @@ static void call_released(Sal *sal, eXosip_event_t *ev){
                ms_warning("No op associated to this call_released()");
                return;
        }
-       op->cid=-1;
-       if (op->did==-1) 
+       if (op->did==-1) {
                sal->callbacks.call_failure(op,SalErrorNoResponse,SalReasonUnknown,NULL, 487);
+       }
+       sal->callbacks.call_released(op);
 }
 
 static int get_auth_data_from_response(osip_message_t *resp, const char **realm, const char **username){

diff --git a/mediastreamer2 b/mediastreamer2
index fa8cbea18aae52d4bafc948687d678dfe453b628..664e9338cf0f963ef6ab6caad9679abcdfeb60c9 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit fa8cbea18aae52d4bafc948687d678dfe453b628
+Subproject commit 664e9338cf0f963ef6ab6caad9679abcdfeb60c9