Added XML config for H.323 User Input Indication (DTMF) mode

diff --git a/conf/curl/autoload_configs/opal.conf.xml b/conf/curl/autoload_configs/opal.conf.xml
index c0844214a39c10fd282d89d5886d08ef04e4c590..280b69304e224ac119f8771d86fc2c48c927cbc0 100644 (file)
--- a/conf/curl/autoload_configs/opal.conf.xml
+++ b/conf/curl/autoload_configs/opal.conf.xml
@@ -1,15 +1,21 @@
 <configuration name="opal.conf" description="Opal Endpoints">
-  <settings>
-    <param name="trace-level" value="4"/>
-    <param name="context" value="default"/>
-    <param name="dialplan" value="XML"/>
-    <param name="codec-prefs" value="PCMU"/>
-  </settings>
-  <listeners>
-    <listener name="default">
-      <param name="h323-ip" value="$${local_ip_v4}"/>
-      <param name="h323-port" value="1720"/>
-    </listener>
-  </listeners>
+   <settings>
+      <param name="trace-level" value="3"/>
+      <param name="context" value="default"/>
+      <param name="dialplan" value="XML"/>
+      <param name="dtmf-type" value="signal"/>                   <!-- string, signal, rfc2833, in-band -->
+      <param name="jitter-size" value="40,100"/>                 <!-- Jitter buffer min/max size, milliseconds -->
+      <!-- <param name="codec-prefs" value="PCMU,PCMA"/> -->     <!-- list, and preferecnce order, of codecs -->
+      <!-- <param name="disable-transcoding" value="true"/> -->  <!-- do not transcode, use source channel codec only -->
+      <param name="gk-address" value=""/>                        <!-- empty to disable, "*" to search LAN -->
+      <param name="gk-identifer" value=""/>                      <!-- optional name of gk -->
+      <param name="gk-interface" value="$${local_ip_v4}"/>       <!-- optional listener interface name -->
+   </settings>
+   <listeners>
+      <listener name="default">
+         <param name="h323-ip" value="$${local_ip_v4}"/>
+         <param name="h323-port" value="1720"/>
+      </listener>
+   </listeners>
 </configuration>
 

diff --git a/conf/insideout/autoload_configs/opal.conf.xml b/conf/insideout/autoload_configs/opal.conf.xml
index c0844214a39c10fd282d89d5886d08ef04e4c590..280b69304e224ac119f8771d86fc2c48c927cbc0 100644 (file)
--- a/conf/insideout/autoload_configs/opal.conf.xml
+++ b/conf/insideout/autoload_configs/opal.conf.xml
@@ -1,15 +1,21 @@
 <configuration name="opal.conf" description="Opal Endpoints">
-  <settings>
-    <param name="trace-level" value="4"/>
-    <param name="context" value="default"/>
-    <param name="dialplan" value="XML"/>
-    <param name="codec-prefs" value="PCMU"/>
-  </settings>
-  <listeners>
-    <listener name="default">
-      <param name="h323-ip" value="$${local_ip_v4}"/>
-      <param name="h323-port" value="1720"/>
-    </listener>
-  </listeners>
+   <settings>
+      <param name="trace-level" value="3"/>
+      <param name="context" value="default"/>
+      <param name="dialplan" value="XML"/>
+      <param name="dtmf-type" value="signal"/>                   <!-- string, signal, rfc2833, in-band -->
+      <param name="jitter-size" value="40,100"/>                 <!-- Jitter buffer min/max size, milliseconds -->
+      <!-- <param name="codec-prefs" value="PCMU,PCMA"/> -->     <!-- list, and preferecnce order, of codecs -->
+      <!-- <param name="disable-transcoding" value="true"/> -->  <!-- do not transcode, use source channel codec only -->
+      <param name="gk-address" value=""/>                        <!-- empty to disable, "*" to search LAN -->
+      <param name="gk-identifer" value=""/>                      <!-- optional name of gk -->
+      <param name="gk-interface" value="$${local_ip_v4}"/>       <!-- optional listener interface name -->
+   </settings>
+   <listeners>
+      <listener name="default">
+         <param name="h323-ip" value="$${local_ip_v4}"/>
+         <param name="h323-port" value="1720"/>
+      </listener>
+   </listeners>
 </configuration>
 

diff --git a/conf/vanilla/autoload_configs/opal.conf.xml b/conf/vanilla/autoload_configs/opal.conf.xml
index 2378d1d6e0011a0ba9954591f7374622b5ad08b3..280b69304e224ac119f8771d86fc2c48c927cbc0 100644 (file)
--- a/conf/vanilla/autoload_configs/opal.conf.xml
+++ b/conf/vanilla/autoload_configs/opal.conf.xml
@@ -1,20 +1,21 @@
 <configuration name="opal.conf" description="Opal Endpoints">
-  <settings>
-    <param name="trace-level" value="3"/>
-    <param name="context" value="default"/>
-    <param name="dialplan" value="XML"/>
-    <param name="jitter-size" value="40,100"/>                <!-- Jitter buffer min/max size, milliseconds -->
-    <!-- <param name="codec-prefs" value="PCMU,PCMA"/> -->    <!-- list, and preferecnce order, of codecs -->
-    <!-- <param name="disable-transcoding" value="true"/> --> <!-- do not transcode, use source channel codec only -->
-    <param name="gk-address" value=""/>                       <!-- empty to disable, "*" to search LAN -->
-    <param name="gk-identifer" value=""/>                     <!-- optional name of gk -->
-    <param name="gk-interface" value="$${local_ip_v4}"/>      <!-- optional listener interface name -->
-  </settings>
-  <listeners>
-    <listener name="default">
-      <param name="h323-ip" value="$${local_ip_v4}"/>
-      <param name="h323-port" value="1720"/>
-    </listener>
-  </listeners>
+   <settings>
+      <param name="trace-level" value="3"/>
+      <param name="context" value="default"/>
+      <param name="dialplan" value="XML"/>
+      <param name="dtmf-type" value="signal"/>                   <!-- string, signal, rfc2833, in-band -->
+      <param name="jitter-size" value="40,100"/>                 <!-- Jitter buffer min/max size, milliseconds -->
+      <!-- <param name="codec-prefs" value="PCMU,PCMA"/> -->     <!-- list, and preferecnce order, of codecs -->
+      <!-- <param name="disable-transcoding" value="true"/> -->  <!-- do not transcode, use source channel codec only -->
+      <param name="gk-address" value=""/>                        <!-- empty to disable, "*" to search LAN -->
+      <param name="gk-identifer" value=""/>                      <!-- optional name of gk -->
+      <param name="gk-interface" value="$${local_ip_v4}"/>       <!-- optional listener interface name -->
+   </settings>
+   <listeners>
+      <listener name="default">
+         <param name="h323-ip" value="$${local_ip_v4}"/>
+         <param name="h323-port" value="1720"/>
+      </listener>
+   </listeners>
 </configuration>
 

diff --git a/src/mod/endpoints/mod_opal/mod_opal.cpp b/src/mod/endpoints/mod_opal/mod_opal.cpp
index 15d86f610641d33ef64ae74acae376ea13ad921a..1becc0dcc2d586005fe7bb979c1c903f95a9723b 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.cpp
+++ b/src/mod/endpoints/mod_opal/mod_opal.cpp
@@ -364,6 +364,15 @@ switch_status_t FSManager::ReadConfig(int reload)
                 m_codecPrefs = val;\r
             } else if (var == "disable-transcoding") {\r
                 m_disableTranscoding = switch_true(val);\r
+            } else if (var == "dtmf-type") {\r
+                if (val == "string")\r
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsString);\r
+                else if (val == "signal")\r
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsTone);\r
+                else if (val == "rfc2833")\r
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputAsRFC2833);\r
+                else if (val == "in-band")\r
+                  m_h323ep->SetSendUserInputMode(OpalConnection::SendUserInputInBand);\r
             } else if (var == "jitter-size") {\r
                 SetAudioJitterDelay(val.AsUnsigned(), val.Mid(val.Find(',')+1).AsUnsigned()); // In milliseconds\r
             } else if (var == "gk-address") {\r
@@ -649,6 +658,7 @@ PBoolean FSConnection::SendUserInputTone(char tone, unsigned duration)
         return false;\r
 \r
     switch_dtmf_t dtmf = { tone, duration };\r
+    PTRACE(4, "mod_opal\tSending DTMF to FS: tone=" << tone << ", duration=" << duration);\r
     return switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS;\r
 }\r
 \r
@@ -925,6 +935,7 @@ switch_status_t FSConnection::kill_channel(int sig)
 \r
 switch_status_t FSConnection::send_dtmf(const switch_dtmf_t *dtmf)\r
 {\r
+    PTRACE(4, "mod_opal\tReceived DTMF from FS: tone=" << dtmf->digit << ", duration=" << dtmf->duration);\r
     OnUserInputTone(dtmf->digit, dtmf->duration);\r
     return SWITCH_STATUS_SUCCESS;\r
 }\r