From b0fc1d8fb58a64e59748cbc5b87b982b22d628d1 Mon Sep 17 00:00:00 2001 From: Georgiewskiy Yuriy Date: Tue, 19 Jul 2011 19:23:54 +0400 Subject: [PATCH] fix small interoperability issues if remote endpoint send progress twice --- src/mod/endpoints/mod_h323/changes.txt | 1 + src/mod/endpoints/mod_h323/mod_h323.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mod/endpoints/mod_h323/changes.txt b/src/mod/endpoints/mod_h323/changes.txt index ff99e50bd6..0076291621 100644 --- a/src/mod/endpoints/mod_h323/changes.txt +++ b/src/mod/endpoints/mod_h323/changes.txt @@ -1,3 +1,4 @@ +fix small interoperability issues if remote endpoint send progress twice 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 diff --git a/src/mod/endpoints/mod_h323/mod_h323.cpp b/src/mod/endpoints/mod_h323/mod_h323.cpp index 985f6bb375..72846b07dc 100644 --- a/src/mod/endpoints/mod_h323/mod_h323.cpp +++ b/src/mod/endpoints/mod_h323/mod_h323.cpp @@ -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); unsigned pi; - switch_status_t status = switch_channel_mark_ring_ready(m_fsChannel); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"----------->OnAlerting return = %d\n",status); + switch_channel_mark_ring_ready(m_fsChannel); if (!alertingPDU.GetQ931().GetProgressIndicator(pi)) pi = 0; @@ -1151,7 +1150,7 @@ bool FSH323Connection::OnAlerting(const H323SignalPDU &alertingPDU, const PStrin m_ChannelProgress = true; } } - return ( status == SWITCH_STATUS_SUCCESS); + return H323Connection::OnAlerting(alertingPDU,user); } void FSH323Connection::AnsweringCall(AnswerCallResponse response)