<h1>Project "FreeSWITCH Source" received a push.</h1>

<h2>branch: master updated</h2>
<pre>
       via: 7c3ee98d3375dcab851ed8f4eb4b3d6a991295b1 (commit)
      from: 1932b3fe3bc8de85098eaf9b810da9d3b027d865 (commit)


</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Konrad Hammel
comments: 
freetdm: ss7 - bug fix: fix for bug introduced by merge of RELAY work

<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #000080; font-weight: bold">index c971179..adee000 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c</span>
<span style="color: #800080; font-weight: bold">@@ -495,8 +495,6 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)</span>
         /**************************************************************************/
         case FTDM_CHANNEL_STATE_COLLECT:        /* IAM received but wating on digits */
 
<span style="color: #A00000">-                isup_intf = &amp;g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info-&gt;circuit-&gt;infId];</span>
<span style="color: #A00000">-</span>
                 if (ftdmchan-&gt;last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
                         SS7_DEBUG(&quot;re-entering state from processing block/unblock request ... do nothing\n&quot;);
                         break;
<span style="color: #800080; font-weight: bold">@@ -516,8 +514,8 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)</span>
                         /*now go to the RING state */
                         ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
                         
<span style="color: #A00000">-                } else if (i &gt;= isup_intf-&gt;min_digits) {</span>
<span style="color: #A00000">-                        SS7_DEBUG_CHAN(ftdmchan, &quot;Received %d digits (min digits = %d)\n&quot;, i, isup_intf-&gt;min_digits);</span>
<span style="color: #00A000">+                } else if (i &gt;= sngss7_info-&gt;circuit-&gt;min_digits) {</span>
<span style="color: #00A000">+                        SS7_DEBUG_CHAN(ftdmchan, &quot;Received %d digits (min digits = %d)\n&quot;, i, sngss7_info-&gt;circuit-&gt;min_digits);</span>
 
                         /*now go to the RING state */
                         ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
<span style="color: #800080; font-weight: bold">@@ -527,7 +525,7 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)</span>
                         if (ftdmchan-&gt;last_state != FTDM_CHANNEL_STATE_IDLE) {
                                 SS7_INFO_CHAN(ftdmchan,&quot;Received %d out of %d so far: %s...starting T35\n&quot;,
                                                                                 i,
<span style="color: #A00000">-                                                                                isup_intf-&gt;min_digits,</span>
<span style="color: #00A000">+                                                                                sngss7_info-&gt;circuit-&gt;min_digits,</span>
                                                                                 ftdmchan-&gt;caller_data.dnis.digits);
                 
                                 /* start ISUP t35 */
<span style="color: #000080; font-weight: bold">diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #000080; font-weight: bold">index 93f2678..d2fa973 100644</span>
<span style="color: #A00000">--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #00A000">+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c</span>
<span style="color: #800080; font-weight: bold">@@ -1509,11 +1509,6 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)</span>
 
                         SS7_DEBUG(&quot;Found an isup mptRouteId = %d\n&quot;, sng_isup.mtpRouteId);
                 /**********************************************************************/
<span style="color: #A00000">-                } else if (!strcasecmp(parm-&gt;var, &quot;min_digits&quot;)) {</span>
<span style="color: #A00000">-                        sng_isup.min_digits = atoi(parm-&gt;val);</span>
<span style="color: #A00000">-</span>
<span style="color: #A00000">-                        SS7_DEBUG(&quot;\tFound min_digits = %d\n&quot;, sng_isup.min_digits);</span>
<span style="color: #A00000">-                /**********************************************************************/</span>
                 } else if (!strcasecmp(parm-&gt;var, &quot;ssf&quot;)) {
                 /**********************************************************************/
                         ret = find_ssf_type_in_map(parm-&gt;val);
</pre></div>
========================================================================<pre>

Summary of changes:
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c     |    8 +++-----
 .../ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c      |    5 -----
 2 files changed, 3 insertions(+), 10 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>