fix small interoperability issues if remote endpoint send progress twice

This commit is contained in:
Georgiewskiy Yuriy 2011-07-19 19:23:54 +04:00
parent c3cbb3df88
commit b0fc1d8fb5
2 changed files with 3 additions and 3 deletions

View File

@ -1,3 +1,4 @@
fix small interoperability issues if remote endpoint send progress twice
make sure dtmfinband gets initialized make sure dtmfinband gets initialized
make gk-identifier and gk-interface settings optional (documentation sayed that about gk-identifier already) 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 fix race condition on destroying signaling thread in h323 library

View File

@ -1138,8 +1138,7 @@ bool FSH323Connection::OnAlerting(const H323SignalPDU &alertingPDU, const PStrin
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"======>PFSH323Connection::OnAlerting user = %s [%p]\n",(const char *)user,this); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"======>PFSH323Connection::OnAlerting user = %s [%p]\n",(const char *)user,this);
unsigned pi; unsigned pi;
switch_status_t status = switch_channel_mark_ring_ready(m_fsChannel); switch_channel_mark_ring_ready(m_fsChannel);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"----------->OnAlerting return = %d\n",status);
if (!alertingPDU.GetQ931().GetProgressIndicator(pi)) if (!alertingPDU.GetQ931().GetProgressIndicator(pi))
pi = 0; pi = 0;
@ -1151,7 +1150,7 @@ bool FSH323Connection::OnAlerting(const H323SignalPDU &alertingPDU, const PStrin
m_ChannelProgress = true; m_ChannelProgress = true;
} }
} }
return ( status == SWITCH_STATUS_SUCCESS); return H323Connection::OnAlerting(alertingPDU,user);
} }
void FSH323Connection::AnsweringCall(AnswerCallResponse response) void FSH323Connection::AnsweringCall(AnswerCallResponse response)