mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into zrtphash

Browse source
This commit is contained in:
Johan Pascal 2016-04-12 14:11:00 +02:00
commit 83f861b35b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/vtables.c
View file

@ -289,7 +289,7 @@ void v_table_reference_destroy(VTableReference *ref){
}
void _linphone_core_add_listener(LinphoneCore *lc, LinphoneCoreVTable *vtable, bool_t autorelease, bool_t internal) {
ms_message("Vtable [%p] registered on core [%p]",lc,vtable);
ms_message("Vtable [%p] registered on core [%p]",vtable, lc);
lc->vtable_refs=ms_list_append(lc->vtable_refs,v_table_reference_new(vtable, autorelease, internal));
}

11
tester/accountmanager.c
View file

@ -112,6 +112,15 @@ static void account_created_on_server_cb(LinphoneCore *lc, LinphoneProxyConfig *
}
}
// TEMPORARY CODE: remove function below when flexisip is updated, this is not needed anymore!
// The new flexisip now answer "200 Test account created" when creating a test account, and do not
// challenge authentication anymore! so this code is not used for newer version
static void account_created_auth_requested_cb(LinphoneCore *lc, const char *username, const char *realm, const char *domain){
Account *account=(Account*)linphone_core_get_user_data(lc);
account->created=1;
}
// TEMPORARY CODE: remove line above when flexisip is updated, this is not needed anymore!
void account_create_on_server(Account *account, const LinphoneProxyConfig *refcfg){
LinphoneCoreVTable vtable={0};
LinphoneCore *lc;
@ -123,6 +132,8 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
LCSipTransports tr;
vtable.registration_state_changed=account_created_on_server_cb;
// TEMPORARY CODE: remove line below when flexisip is updated, this is not needed anymore!
vtable.auth_info_requested=account_created_auth_requested_cb;
lc=configure_lc_from(&vtable,bc_tester_get_resource_dir_prefix(),NULL,account);
tr.udp_port=LC_SIP_TRANSPORT_RANDOM;
tr.tcp_port=LC_SIP_TRANSPORT_RANDOM;