Merge pull request #65 in FS/freeswitch from ~MBRANCA/freeswitch:bugfix/OPENZAP-220-ftmod_libpri-don-t-close-channel to master

* commit '7ec7c920d1ef37a6b9753db0321dd19b2f3332a9':
  OPENZAP-220 fix blocked into read and add cause for a correct hangup
This commit is contained in:
Mike Jerris 2014-10-07 11:39:15 -05:00
commit 7802232f16
2 changed files with 3 additions and 1 deletions

View File

@ -1251,6 +1251,8 @@ static ftdm_status_t state_advance(ftdm_channel_t *chan)
} else if (caller_data->hangup_cause == PRI_CAUSE_DESTINATION_OUT_OF_ORDER) { } else if (caller_data->hangup_cause == PRI_CAUSE_DESTINATION_OUT_OF_ORDER) {
/* Can happen when we have a DL link expire or some timer expired */ /* Can happen when we have a DL link expire or some timer expired */
ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE); ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
} else if (caller_data->hangup_cause == PRI_CAUSE_INVALID_NUMBER_FORMAT) {
ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
} }
} }
} }

View File

@ -1402,7 +1402,7 @@ static FIO_READ_FUNCTION(zt_read)
} else { } else {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Skipping one IO read cycle due to DTMF event processing\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Skipping one IO read cycle due to DTMF event processing\n");
} }
continue; break;
} }
/* Read error, keep going unless to many errors force us to abort ...*/ /* Read error, keep going unless to many errors force us to abort ...*/