From: guidosarducci <guidosarducci@users.noreply.github.com>
Date: Sun, 18 Jun 2017 23:04:15 +0000 (-0700)
Subject: siproxd: use standard interface names by default
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8e0055e03f5eca02efecca369fdc70cf1304f1e6;p=feed%2Ftelephony.git

siproxd: use standard interface names by default

Support using standard interface names and make "lan"/"wan" the defaults
for inbound/outbound SIP traffic. This change makes siproxd more portable
but preserves backwards compatibility for upgrades.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
---

diff --git a/net/siproxd/files/siproxd.config b/net/siproxd/files/siproxd.config
index b65148c..be953eb 100644
--- a/net/siproxd/files/siproxd.config
+++ b/net/siproxd/files/siproxd.config
@@ -1,3 +1,3 @@
 config siproxd general
-	option if_inbound	lan
-	option if_outbound	wan
+	option interface_inbound lan
+	option interface_outbound wan
diff --git a/net/siproxd/files/siproxd.init b/net/siproxd/files/siproxd.init
index 1ad6e0f..0dbdeb0 100644
--- a/net/siproxd/files/siproxd.init
+++ b/net/siproxd/files/siproxd.init
@@ -18,9 +18,22 @@ deal_with_lists () {
 
 start_instance() {
 	local cfg="$1"
+	local _int_inbound
+	local _int_outbound
+	local _dev_inbound
+	local _dev_outbound
+
+	config_get _int_inbound "$cfg" interface_inbound
+	config_get _int_outbound "$cfg" interface_outbound
+
+	scan_interfaces
+	network_get_physdev _dev_inbound $_int_inbound
+	network_get_physdev _dev_outbound $_int_outbound
+
+	config_load 'siproxd'
+	config_get if_inbound "$cfg" if_inbound $_dev_inbound
+	config_get if_outbound "$cfg" if_outbound $_dev_outbound
 
-	config_get if_inbound "$cfg" if_inbound
-	config_get if_outbound "$cfg" if_outbound
 	config_get host_outbound "$cfg" host_outbound
 	config_get hosts_allow_reg "$cfg" hosts_allow_reg
 	config_get hosts_allow_sip "$cfg" hosts_allow_sip
@@ -225,6 +238,8 @@ start() {
 		chown nobody:nogroup "$siproxd_pid_dir"
 	}
 
+	include /lib/network
+	. /lib/functions/network.sh
 	config_load 'siproxd'
 	config_foreach start_instance 'siproxd'
 }