kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that we don't accept an answer on an inbound call and don't permit asterisk to answer an outbound call

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-05-09 15:01:10 +00:00
parent f429105aae
commit f2bc3c61cc
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channel.c
View File

@@ -1485,6 +1485,9 @@ int ast_answer(struct ast_channel *chan)
{ {
int res = 0; int res = 0;
ast_channel_lock(chan); ast_channel_lock(chan);
/* You can't answer an outbound call */
if (ast_test_flag(chan, AST_FLAG_OUTGOING))
return 0;
/* Stop if we're a zombie or need a soft hangup */ /* Stop if we're a zombie or need a soft hangup */
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
ast_channel_unlock(chan); ast_channel_unlock(chan);
@@ -1953,13 +1956,17 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
switch (f->frametype) { switch (f->frametype) {
case AST_FRAME_CONTROL: case AST_FRAME_CONTROL:
if (f->subclass == AST_CONTROL_ANSWER) { if (f->subclass == AST_CONTROL_ANSWER) {
if (prestate == AST_STATE_UP) { if (!ast_test_flag(chan, AST_FLAG_OUTGOING)) {
ast_log(LOG_DEBUG, "Ignoring answer on an inbound call!\n");
f = &ast_null_frame;
} else if (prestate == AST_STATE_UP) {
ast_log(LOG_DEBUG, "Dropping duplicate answer!\n"); ast_log(LOG_DEBUG, "Dropping duplicate answer!\n");
f = &ast_null_frame; f = &ast_null_frame;
} else {
/* Answer the CDR */
ast_setstate(chan, AST_STATE_UP);
ast_cdr_answer(chan->cdr);
} }
/* Answer the CDR */
ast_setstate(chan, AST_STATE_UP);
ast_cdr_answer(chan->cdr);
} }
break; break;
case AST_FRAME_DTMF: case AST_FRAME_DTMF:
@@ -2638,9 +2645,11 @@ int ast_call(struct ast_channel *chan, char *addr, int timeout)
int res = -1; int res = -1;
/* Stop if we're a zombie or need a soft hangup */ /* Stop if we're a zombie or need a soft hangup */
ast_channel_lock(chan); ast_channel_lock(chan);
if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) {
if (chan->tech->call) if (chan->tech->call)
res = chan->tech->call(chan, addr, timeout); res = chan->tech->call(chan, addr, timeout);
ast_set_flag(chan, AST_FLAG_OUTGOING);
}
ast_channel_unlock(chan); ast_channel_unlock(chan);
return res; return res;
} }

1
include/asterisk/channel.h
View File

@@ -466,6 +466,7 @@ struct ast_channel {
so when ->priority is set, it will get incremented before so when ->priority is set, it will get incremented before
finding the next priority to run finding the next priority to run
*/ */
#define AST_FLAG_OUTGOING (1 << 10) /*! Is this call outgoing */
/* @} */ /* @} */
#define AST_FEATURE_PLAY_WARNING (1 << 0) #define AST_FEATURE_PLAY_WARNING (1 << 0)