apply patch from Jan Willamowius:

make sure dtmfinband gets initialized.
make gk-identifier and gk-interface settings optional (documentation sayed that about gk-identifier already)

diff --git a/src/mod/endpoints/mod_h323/changes.txt b/src/mod/endpoints/mod_h323/changes.txt
index 3af956f0cb0d31623c1ef9d9f0d734f9ad4cf77a..ff99e50bd6c8648902c78994200a8e4e56e937a0 100644 (file)
--- a/src/mod/endpoints/mod_h323/changes.txt
+++ b/src/mod/endpoints/mod_h323/changes.txt
@@ -1,3 +1,5 @@
+make sure dtmfinband gets initialized
+make gk-identifier and gk-interface settings optional (documentation sayed that about gk-identifier already)
 fix race condition on destroying signaling thread in h323 library
 Adds an extra switch_rtp_destroy or switch_rtp_release_port when a session ends 
     - to make sure the port is returned to FS. thx to Peter Olsson.

diff --git a/src/mod/endpoints/mod_h323/h323.conf.xml b/src/mod/endpoints/mod_h323/h323.conf.xml
index bf5929008baa50efd34856b5227845700194c613..21bd80480c4d8883c22f8df4a8ba9016e9801e5a 100644 (file)
--- a/src/mod/endpoints/mod_h323/h323.conf.xml
+++ b/src/mod/endpoints/mod_h323/h323.conf.xml
@@ -9,7 +9,7 @@
     <!-- <param name="ptime-override-value" value="20"/> --> <!-- Override negotiated ptime value with this value -->
     <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=""/>  <!-- mandatory listener interface name -->
+    <param name="gk-interface" value=""/>  <!-- optional UDP listener interface (IP:port) -->
     <param name="gk-retry" value="30"/>  <!-- optional GK register retry timer -->
     <param name="faststart" value="true"/>  <!-- optional -->
     <param name="h245tunneling" value="true"/>  <!-- optional -->

diff --git a/src/mod/endpoints/mod_h323/mod_h323.cpp b/src/mod/endpoints/mod_h323/mod_h323.cpp
index 233e972e32115bab64a1daa4405d7aac5f006558..985f6bb3757115bb849b5a6be842bcb4780f5542 100644 (file)
--- a/src/mod/endpoints/mod_h323/mod_h323.cpp
+++ b/src/mod/endpoints/mod_h323/mod_h323.cpp
@@ -18,6 +18,7 @@
  * License.
  *
  * Contributor(s):
+ * Jan Willamowius.
  * 
  * 
  * 
@@ -223,6 +224,7 @@ class FSTrace : public ostream {
     public:
         Buffer()
             {
+                               // leave 2 chars room at end: 1 for overflow char and1 for \0
                 setg(buffer, buffer, &buffer[sizeof(buffer)-2]);
                 setp(buffer, &buffer[sizeof(buffer)-2]);
             }
@@ -440,8 +442,8 @@ bool FSH323EndPoint::Initialise(switch_loadable_module_interface_t *iface)
                }
        }
 
-       if (!m_gkAddress.IsEmpty() && !m_gkIdentifer.IsEmpty() && !m_gkInterface.IsEmpty()) {
-               m_thread = new FSGkRegThread(this,&m_gkAddress,&m_gkIdentifer,&m_gkInterface,m_gkretry);
+       if (!m_gkAddress.IsEmpty()) {
+               m_thread = new FSGkRegThread(this, &m_gkAddress, &m_gkIdentifer, &m_gkInterface, m_gkretry);
                m_thread->SetAutoDelete();
                m_thread->Resume();
        }
@@ -592,6 +594,7 @@ FSH323EndPoint::FSH323EndPoint()
        :m_faststart(true)
        ,m_h245tunneling(true)
        ,m_h245insetup(true)
+       ,m_dtmfinband(false)
        ,m_thread(NULL)
        ,m_stop_gk(false)
        ,m_fax_old_asn(false)