diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 21:01:18 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-05-23 21:01:18 +0000 |
commit | 48895d885df432c78156c6c50f1bba3db3b3ba7d (patch) | |
tree | e6cfdf87e36f4a9f67e00bd1642c2a873451126a /channels | |
parent | 5dc23536ec8d397adbe1481c598ef4806d1f8bd1 (diff) |
Merged revisions 65685 via svnmerge from
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
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 3bbae35c3..b2c2a4cc0 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -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; |