Revert "Only consider registering configs in linphone_core_lookup_known_proxy"

This reverts commit eab65df8f3.
This commit is contained in:
Simon Morlat 2014-02-12 17:46:02 +01:00
parent 92f0b5d3d3
commit 36b603f2e8

View file

@ -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;
}