From 36b603f2e881d2ac7e0156b183e4eda56e165430 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 Feb 2014 17:46:02 +0100 Subject: [PATCH] Revert "Only consider registering configs in linphone_core_lookup_known_proxy" This reverts commit eab65df8f3a743dbc8149ab54a0af5dc4d415294. --- coreapi/linphonecore.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 45bb40393..ea94da3fa 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2501,12 +2501,11 @@ LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const L } } - /*otherwise iterate through the other proxy config and return the first enabled matching*/ + /*otherwise iterate through the other proxy config and return the first matching*/ for (elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=elem->next){ LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data; const char *domain=linphone_proxy_config_get_domain(cfg); - bool_t enabled = linphone_proxy_config_register_enabled(cfg); - if (enabled && domain!=NULL && strcmp(domain,linphone_address_get_domain(uri))==0){ + if (domain!=NULL && strcmp(domain,linphone_address_get_domain(uri))==0){ found_cfg=cfg; goto end; } @@ -2514,8 +2513,7 @@ LinphoneProxyConfig * linphone_core_lookup_known_proxy(LinphoneCore *lc, const L end: if (found_cfg!=NULL && found_cfg!=default_cfg){ ms_debug("Overriding default proxy setting for this call/message/subscribe operation."); - } - else found_cfg=default_cfg; + }else found_cfg=default_cfg; return found_cfg; }