From 2b2b138f4330b1f12eee755f9c9ac62112141387 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 16 Mar 2015 16:29:01 +0100 Subject: [PATCH] revert my changes about reusing sip.instance, it is not compatible with tests checking call forking --- tester/accountmanager.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tester/accountmanager.c b/tester/accountmanager.c index f786fa295..80bc7942e 100644 --- a/tester/accountmanager.c +++ b/tester/accountmanager.c @@ -23,7 +23,6 @@ struct _Account{ LinphoneAddress *identity; LinphoneAddress *modified_identity; char *password; - char *instance_id; int created; int done; int auth_requested; @@ -50,7 +49,6 @@ Account *account_new(LinphoneAddress *identity, const char *unique_id){ void account_destroy(Account *obj){ linphone_address_unref(obj->identity); linphone_address_unref(obj->modified_identity); - ms_free(obj->instance_id); ms_free(obj->password); ms_free(obj); } @@ -126,7 +124,6 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf vtable.registration_state_changed=account_created_on_server_cb; vtable.auth_info_requested=account_created_auth_requested_cb; lc=configure_lc_from(&vtable,liblinphone_tester_file_prefix,NULL,account); - account->instance_id = ms_strdup(lp_config_get_string(lc->config,"misc","uuid",NULL)); tr.udp_port=LC_SIP_TRANSPORT_RANDOM; tr.tcp_port=LC_SIP_TRANSPORT_RANDOM; tr.tls_port=LC_SIP_TRANSPORT_RANDOM; @@ -205,9 +202,7 @@ LinphoneAddress *account_manager_check_account(AccountManager *m, LinphoneProxyC if (create_account){ account_create_on_server(account,cfg); - lp_config_set_string(lc->config, "misc", "uuid", account->instance_id); } - sal_set_uuid(lc->sal, account->instance_id); ai=linphone_auth_info_new(linphone_address_get_username(account->modified_identity), NULL, account->password,NULL,NULL,linphone_address_get_domain(account->modified_identity));