aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-10 16:47:37 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-10 16:47:37 +0000
commit83050d844bd84bb59ce731d338ca0687485789af (patch)
tree9166d0ca4ae61ecaf7791b73960f47a6a41aead3 /channels
parentb65768d7bb7d88b3c43264447574090a24380598 (diff)
Change channel state on local channels for busy,answer,ring.
Previously local channels channel state never changed. This became problematic when the state of the other side of the local channel was lost, for example during a masquerade. Changing the state of the local channel allows for the scenario to be detected when the channel state is set to ringing, but the peer isn't ringing. The specific problem scenario is described in 164201. Although this was noted on one of the issues, here is the tested dialplan verified to work: exten => 9700,1,Dial(Local/*9700@default&Local/0009700@default) exten => *9700,1,Set(GLOBAL(TESTCHAN)=${CHANNEL:0:${MATH(${LEN(${CHANNEL})}-1):0:2}}1) exten => *9700,n,wait(3) ;3 works, 1 did not exten => *9700,n,Dial(SIP/5001) exten => 0009700,1,Wait(1) ;1 works, 3 did not exten => 0009700,n,ChannelRedirect(${TESTCHAN},parkedcalls,701,1) (closes issue #14992) Reported by: davidw git-svn-id: http://svn.digium.com/svn/asterisk/trunk@246070 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_local.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 00c058da1..2fbd77a21 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -257,6 +257,45 @@ 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.integer) {
+ 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_TRANSFER:
+ case AST_CONTROL_CONNECTED_LINE:
+ case AST_CONTROL_REDIRECTING:
+ 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");
+ }
+ }
ast_queue_frame(other, f);
ast_channel_unlock(other);
}