From dfca1faff43d12ebbefbdffb37b99d3f5f1b58b3 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 6 Apr 2017 09:01:54 +0200 Subject: [PATCH] Use default config settings (proxy_default_values) for default account creator constructor call back - linphone_account_creator_constructor_linphone --- coreapi/account_creator.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/coreapi/account_creator.c b/coreapi/account_creator.c index 3ec020f9b..8096fe99a 100644 --- a/coreapi/account_creator.c +++ b/coreapi/account_creator.c @@ -627,10 +627,14 @@ LinphoneAccountCreatorStatus linphone_account_creator_update_account(LinphoneAcc LinphoneAccountCreatorStatus linphone_account_creator_constructor_linphone(LinphoneAccountCreator *creator) { LinphoneAddress *addr; - linphone_proxy_config_set_realm(creator->proxy_cfg, "sip.linphone.org"); - linphone_proxy_config_set_route(creator->proxy_cfg, "sip.linphone.org"); - linphone_proxy_config_set_server_addr(creator->proxy_cfg, "sip.linphone.org"); - addr = linphone_address_new("sip:username@sip.linphone.org"); + const char *identity = lp_config_get_default_string(creator->core->config, "proxy", "reg_identity", NULL); + const char *proxy = lp_config_get_default_string(creator->core->config, "proxy", "reg_proxy", NULL); + const char *route = lp_config_get_default_string(creator->core->config, "proxy", "reg_route", NULL); + const char *realm = lp_config_get_default_string(creator->core->config, "proxy", "realm", NULL); + linphone_proxy_config_set_realm(creator->proxy_cfg, realm ? realm : "sip.linphone.org"); + linphone_proxy_config_set_route(creator->proxy_cfg, route ? route : "sip.linphone.org"); + linphone_proxy_config_set_server_addr(creator->proxy_cfg, proxy ? proxy : "sip.linphone.org"); + addr = linphone_address_new(identity ? identity : "sip:username@sip.linphone.org"); linphone_proxy_config_set_identity_address(creator->proxy_cfg, addr); linphone_address_unref(addr); return LinphoneAccountCreatorStatusRequestOk;