kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 65685 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65685 | kpfleming | 2007-05-23 16:59:19 -0400 (Wed, 23 May 2007) | 2 lines

start the delayed PBX when receive voice or video full frames as well, and comment this delayed-PBX activity

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-05-23 21:01:18 +00:00
parent 5dc23536ec
commit 48895d885d
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+22 -12
View File
@@ -6927,6 +6927,25 @@ static int socket_process(struct iax2_thread *thread)
f.data = empty;
memset(&ies, 0, sizeof(ies));
}
/* when we receive the first full frame for a new incoming channel,
it is safe to start the PBX on the channel because we have now
completed a 3-way handshake with the peer */
if ((f.frametype == AST_FRAME_VOICE) ||
(f.frametype == AST_FRAME_VIDEO) ||
(f.frametype == AST_FRAME_IAX)) {
if (ast_test_flag(iaxs[fr->callno], IAX_DELAYPBXSTART)) {
ast_clear_flag(iaxs[fr->callno], IAX_DELAYPBXSTART);
if (ast_pbx_start(iaxs[fr->callno]->owner)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", iaxs[fr->callno]->owner->name);
ast_hangup(iaxs[fr->callno]->owner);
iaxs[fr->callno]->owner = NULL;
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
}
}
if (f.frametype == AST_FRAME_VOICE) {
if (f.subclass != iaxs[fr->callno]->voiceformat) {
iaxs[fr->callno]->voiceformat = f.subclass;
@@ -6989,17 +7008,6 @@ retryowner:
ast_log(LOG_DEBUG, "For call=%d, set last=%d\n", fr->callno, fr->ts);
}
if (ast_test_flag(iaxs[fr->callno], IAX_DELAYPBXSTART)) {
ast_clear_flag(iaxs[fr->callno], IAX_DELAYPBXSTART);
if (ast_pbx_start(iaxs[fr->callno]->owner)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", iaxs[fr->callno]->owner->name);
ast_hangup(iaxs[fr->callno]->owner);
iaxs[fr->callno]->owner = NULL;
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
}
switch(f.subclass) {
case IAX_COMMAND_ACK:
/* Do nothing */
@@ -7210,7 +7218,9 @@ retryowner:
VERBOSE_PREFIX_4,
using_prefs);
if(!(c = ast_iax2_new(fr->callno, AST_STATE_RING, format, 1)))
/* create an Asterisk channel for this call, but don't start
a PBX on it until we have received a full frame from the peer */
if (!(c = ast_iax2_new(fr->callno, AST_STATE_RING, format, 1)))
iax2_destroy(fr->callno);
else if (ies.vars) {
struct ast_variable *var, *prev = NULL;