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

Merge branch 'master' of git.linphone.org:linphone into bc_vfs

Browse source
This commit is contained in:
Sandrine Avakian 2016-05-17 15:50:29 +02:00
commit 5e967f62de
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
coreapi/bellesip_sal/sal_impl.c
View file

@ -240,7 +240,8 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
/*special case for Dialog created by notify mathing subscribe*/
belle_sip_transaction_t * sub_trans = belle_sip_dialog_get_last_transaction(dialog);
op = (SalOp*)belle_sip_transaction_get_application_data(sub_trans);
} else if (op==NULL || op->state==SalOpStateTerminated){
}
if (op==NULL || op->state==SalOpStateTerminated){
ms_warning("Receiving request for null or terminated op [%p], ignored",op);
return;
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit 0c53b29f5d5efac175267e3e983b0b55ba5f1dfa
Subproject commit b46d2cf1cb9247a7bd2d57ba312d668981b4eed7

4
tester/accountmanager.c
View file

@ -160,8 +160,8 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
linphone_proxy_config_set_expires(cfg,3*3600); //accounts are valid 3 hours
linphone_core_add_proxy_config(lc,cfg);
if (wait_for_until(lc,NULL,&account->created,1,10000)==FALSE){
/*wait 15 seconds, since the DNS SRV resolution make time a while*/
if (wait_for_until(lc,NULL,&account->created,1,15000)==FALSE){
ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
}
linphone_proxy_config_edit(cfg);