From 510387202791da73c9cbbf367dcad7acafd60838 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 12 Apr 2016 10:25:56 +0200 Subject: [PATCH 1/2] fix incorrectly formatted log. --- coreapi/vtables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/vtables.c b/coreapi/vtables.c index e31962f5a..292d698d9 100644 --- a/coreapi/vtables.c +++ b/coreapi/vtables.c @@ -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)); } From 47e3693511fdd3f8821d49bafeff04d2e2113cef Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 12 Apr 2016 11:00:39 +0200 Subject: [PATCH 2/2] tester: accountmanager should temporary deal with both old and new flexisip servers --- tester/accountmanager.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tester/accountmanager.c b/tester/accountmanager.c index 8de7b9854..d4c0cb5cd 100644 --- a/tester/accountmanager.c +++ b/tester/accountmanager.c @@ -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;