From afb87c66bb05634b446950461b2ca7a5a71ab62b Mon Sep 17 00:00:00 2001 From: guidosarducci Date: Sun, 2 Jul 2017 19:56:53 -0700 Subject: [PATCH] siproxd: fix support for domain-specific proxies Use lists for the config entries outbound_domain_{name,host,port}. This permits multiple outbound proxies and fixes: https://github.com/openwrt/telephony/issues/127 Signed-off-by: Tony Ambardar --- net/siproxd/files/siproxd.init | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/siproxd/files/siproxd.init b/net/siproxd/files/siproxd.init index 5054f3c..d122ad1 100644 --- a/net/siproxd/files/siproxd.init +++ b/net/siproxd/files/siproxd.init @@ -76,9 +76,6 @@ start_instance() { config_get use_rport "$cfg" use_rport 0 config_get outbound_proxy_host "$cfg" outbound_proxy_host config_get outbound_proxy_port "$cfg" outbound_proxy_port - config_get outbound_domain_name "$cfg" outbound_domain_name - config_get outbound_domain_host "$cfg" outbound_domain_host - config_get outbound_domain_port "$cfg" outbound_domain_port if [ -f "$siproxd_conf_prefix$cfg.conf" ]; then rm "$siproxd_conf_prefix$cfg.conf" @@ -129,9 +126,9 @@ start_instance() { append_conf_if_set use_rport append_conf_if_set outbound_proxy_host append_conf_if_set outbound_proxy_port - append_conf_if_set outbound_domain_name - append_conf_if_set outbound_domain_host - append_conf_if_set outbound_domain_port + config_list_foreach "$cfg" 'outbound_domain_name' deal_with_lists "outbound_domain_name" + config_list_foreach "$cfg" 'outbound_domain_host' deal_with_lists "outbound_domain_host" + config_list_foreach "$cfg" 'outbound_domain_port' deal_with_lists "outbound_domain_port" # handle plugins config_get plugindir "$cfg" plugindir "/usr/lib/siproxd/"