From a212633bb8d23be970e6e2a44144998e388010d2 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Mon, 1 Mar 2010 17:13:16 +0000 Subject: Merged revisions 249538 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r249538 | jpeeler | 2010-03-01 11:11:31 -0600 (Mon, 01 Mar 2010) | 18 lines Merged revisions 249536 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r249536 | jpeeler | 2010-03-01 11:02:03 -0600 (Mon, 01 Mar 2010) | 11 lines Modify queued frames from local channels to not set the other side to up In this case, attended transfers were broken due to ast_feature_request_and_dial detecting the channel being set to up before the answer frame could be read and therefore failing to mark the channel as ready. This fix is a regression fix for 244785, which should continue to work properly as well. (closes issue #16816) Reported by: jamhed Tested by: jamhed, corruptor ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@249539 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_local.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/channels/chan_local.c b/channels/chan_local.c index 1dc41bd59..385344461 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -217,41 +217,8 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra } if (other) { - if (f->frametype == AST_FRAME_CONTROL) { - switch (f->subclass) { - case AST_CONTROL_RINGING: - ast_setstate(other, AST_STATE_RINGING); - break; - case AST_CONTROL_ANSWER: - ast_setstate(other, AST_STATE_UP); - break; - case AST_CONTROL_BUSY: - ast_setstate(other, AST_STATE_BUSY); - break; - - /* not going to handle these */ - case AST_CONTROL_HANGUP: - case AST_CONTROL_RING: - case AST_CONTROL_TAKEOFFHOOK: - case AST_CONTROL_OFFHOOK: - case AST_CONTROL_CONGESTION: - case AST_CONTROL_FLASH: - case AST_CONTROL_WINK: - case AST_CONTROL_OPTION: - case AST_CONTROL_RADIO_KEY: - case AST_CONTROL_RADIO_UNKEY: - case AST_CONTROL_PROGRESS: - case AST_CONTROL_PROCEEDING: - case AST_CONTROL_HOLD: - case AST_CONTROL_UNHOLD: - case AST_CONTROL_VIDUPDATE: - case AST_CONTROL_SRCUPDATE: - case AST_CONTROL_T38_PARAMETERS: - break; - default: - /* since we're switching on an int, we can't rely on the compiler */ - ast_log(LOG_WARNING, "New unhandled control frame added!!!\n"); - } + if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_RINGING) { + ast_setstate(other, AST_STATE_RINGING); } ast_queue_frame(other, f); ast_channel_unlock(other); -- cgit v1.2.3