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

fix incoming UPDATE without sdp (session timer case)

Browse source
This commit is contained in:
Jehan Monnier 2014-09-11 15:08:45 +02:00
parent 323fcf498f
commit a3e84af3fb
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
coreapi/bellesip_sal/sal_op_call.c
View file

@ -528,10 +528,19 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
op->state=SalOpStateTerminating;
/*call end not notified by dialog deletion because transaction can end before dialog*/
} else if(strcmp("INVITE",method)==0 || (is_update=(strcmp("UPDATE",method)==0)) ) {
/*re-invite*/
sal_op_reset_descriptions(op);
if (process_sdp_for_invite(op,req)==0)
op->base.root->callbacks.call_updating(op,is_update);
if (is_update && !belle_sip_message_get_body(BELLE_SIP_MESSAGE(req))) {
/*session timer case*/
/*session expire should be handled. to be done when real session timer (rfc4028) will be implemented*/
resp=sal_op_create_response_from_request(op,req,200);
belle_sip_server_transaction_send_response(server_transaction,resp);
belle_sip_object_unref(op->pending_update_server_trans);
op->pending_update_server_trans=NULL;
} else {
/*re-invite*/
sal_op_reset_descriptions(op);
if (process_sdp_for_invite(op,req)==0)
op->base.root->callbacks.call_updating(op,is_update);
}
} else if (strcmp("INFO",method)==0){
if (belle_sip_message_get_body(BELLE_SIP_MESSAGE(req))
&& strstr(belle_sip_message_get_body(BELLE_SIP_MESSAGE(req)),"picture_fast_update")) {

2
coreapi/linphonecore.c
View file

@ -4175,7 +4175,7 @@ void linphone_core_set_ringback(LinphoneCore *lc, const char *path){
if (lc->sound_conf.remote_ring!=0){
ms_free(lc->sound_conf.remote_ring);
}
lc->sound_conf.remote_ring=path?ms_strdup(path):path;
lc->sound_conf.remote_ring=path?ms_strdup(path):NULL;
}
/**

2
tester/flexisip/flexisip.conf
View file

@ -41,7 +41,7 @@ transports=sip:*:5060 sips:*:5061;tls-certificates-dir=/etc/flexisip/tls/certif
# An absolute path of a directory where TLS server certificate and
# private key can be found, concatenated inside an 'agent.pem' file.
# Default value: /etc/flexisip/tls
tls-certificates-dir=./certificates/cn
tls-certificates-dir=/etc/flexisip/tls/certificates/cn
#tls-certificates-dir=/media/sf_workspaces/workspace-macosx/flexisip
##