From 020284bf968a8740200afd28caa3a12aedbc0e75 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Sat, 19 Nov 2022 00:08:18 +0100
Subject: [PATCH] FS: Bind external IP by interface

Let's use freeswitch's interface: capability rather than specify a static IP
to bind to, which breaks then on systems attached to a DHCP router.
---
 .../rhizo_base/files/etc/freeswitch/sip_profiles/extrtp.xml   | 4 ++--
 modules/rhizo_base/files/etc/freeswitch/sip_profiles/lan.xml  | 4 ++--
 modules/rhizo_base/manifests/freeswitch.pp                    | 1 +
 modules/rhizo_base/templates/vars.xml.erb                     | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/rhizo_base/files/etc/freeswitch/sip_profiles/extrtp.xml b/modules/rhizo_base/files/etc/freeswitch/sip_profiles/extrtp.xml
index d4b8f08..4131326 100644
--- a/modules/rhizo_base/files/etc/freeswitch/sip_profiles/extrtp.xml
+++ b/modules/rhizo_base/files/etc/freeswitch/sip_profiles/extrtp.xml
@@ -58,8 +58,8 @@
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->
-    <param name="rtp-ip" value="$${external_ip}"/>
-    <param name="sip-ip" value="$${local_ip_v4}"/>
+    <param name="rtp-ip" value="$${interface_ip}"/>
+    <param name="sip-ip" value="$${interface_ip}"/>
     <param name="ext-rtp-ip" value="stun:meet.rhizomatica.org:4445"/>
     <param name="ext-sip-ip" value="$${local_ip_v4}"/>
     <param name="rtp-timeout-sec" value="90"/>
diff --git a/modules/rhizo_base/files/etc/freeswitch/sip_profiles/lan.xml b/modules/rhizo_base/files/etc/freeswitch/sip_profiles/lan.xml
index af0d767..5b1a347 100644
--- a/modules/rhizo_base/files/etc/freeswitch/sip_profiles/lan.xml
+++ b/modules/rhizo_base/files/etc/freeswitch/sip_profiles/lan.xml
@@ -25,8 +25,8 @@
     <param name="inbound-codec-prefs" value="$${global_codec_prefs}"/>
     <param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
     <param name="rtp-timer-name" value="soft"/>
-    <param name="rtp-ip" value="$${external_ip}"/>
-    <param name="sip-ip" value="$${external_ip}"/>
+    <param name="rtp-ip" value="$${interface_ip}"/>
+    <param name="sip-ip" value="$${interface_ip}"/>
     <param name="aggressive-nat-detection" value="false"/>
     <param name="apply-inbound-acl" value="domains"/>
     <param name="apply-register-acl" value="domains"/>    
diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index a0f1634..7172061 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -109,6 +109,7 @@ class rhizo_base::freeswitch::common {
 
   $vpn_ip_address = $rhizo_base::vpn_ip_address
   $wan_ip_address = $rhizo_base::wan_ip_address
+  $fs_bound_if    = $rhizo_base::stats_if
 
   $voip_username  = $rhizo_base::voip_username
   $voip_fromuser  = $rhizo_base::voip_fromuser
diff --git a/modules/rhizo_base/templates/vars.xml.erb b/modules/rhizo_base/templates/vars.xml.erb
index 30e1a31..33025fe 100644
--- a/modules/rhizo_base/templates/vars.xml.erb
+++ b/modules/rhizo_base/templates/vars.xml.erb
@@ -37,6 +37,7 @@
   -->
 
   <X-PRE-PROCESS cmd="set" data="local_ip_v4=<%= @vpn_ip_address %>"/>
+  <X-PRE-PROCESS cmd="set" data="interface_ip=interface:<%= @fs_bound_if %>"/>
   <X-PRE-PROCESS cmd="set" data="external_ip=<%= @wan_ip_address %>"/>
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/rccn"/>