mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 02:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix incoming re-INVITE without SDP.

Browse source
This commit is contained in:
Simon Morlat 2012-03-07 16:42:54 +01:00
parent 8845953c54
commit 42267c4ce2
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coreapi/callbacks.c
View file

@ -443,6 +443,13 @@ static void call_updating(SalOp *op){
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
SalMediaDescription *rmd=sal_call_get_remote_media_description(op);
if (rmd==NULL){
/* case of a reINVITE without SDP */
call_accept_update(lc,call);
call->media_pending=TRUE;
return;
}
switch(call->state){
case LinphoneCallPausedByRemote:
if (sal_media_description_has_dir(rmd,SalStreamSendRecv) || sal_media_description_has_dir(rmd,SalStreamRecvOnly)){

15
coreapi/sal_eXosip2.c
View file

@ -1006,7 +1006,6 @@ static void inc_new_call(Sal *sal, eXosip_event_t *ev){
static void handle_reinvite(Sal *sal, eXosip_event_t *ev){
SalOp *op=find_op(sal,ev);
sdp_message_t *sdp;
osip_message_t *msg=NULL;
if (op==NULL) {
ms_warning("Reinvite for non-existing operation !");
@ -1028,18 +1027,11 @@ static void handle_reinvite(Sal *sal, eXosip_event_t *ev){
op->base.remote_media=sal_media_description_new();
sdp_to_media_description(sdp,op->base.remote_media);
sdp_message_free(sdp);
sal->callbacks.call_updating(op);
}else {
op->sdp_offering=TRUE;
eXosip_lock();
eXosip_call_build_answer(ev->tid,200,&msg);
if (msg!=NULL){
set_sdp_from_desc(msg,op->base.local_media);
eXosip_call_send_answer(ev->tid,200,msg);
}
eXosip_unlock();
}
sal->callbacks.call_updating(op);
}
static void handle_ack(Sal *sal, eXosip_event_t *ev){
@ -1064,9 +1056,8 @@ static void handle_ack(Sal *sal, eXosip_event_t *ev){
}
if (op->reinvite){
op->reinvite=FALSE;
}else{
sal->callbacks.call_ack(op);
}
sal->callbacks.call_ack(op);
}
static void update_contact_from_response(SalOp *op, osip_message_t *response){