aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-04 19:09:15 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-04 19:09:15 +0000
commit20079bcfdfb269f01de6ed74430231568b9c5f6e (patch)
tree678e3d7ec4ca568bc7081c8966c846a70f50dfee /channels
parenta7f978baee0c1e06350abe5b5f3beb39c37f8023 (diff)
Merged revisions 154268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r154268 | rmudgett | 2008-11-04 13:07:26 -0600 (Tue, 04 Nov 2008) | 11 lines Merged revisions 154266 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r154266 | rmudgett | 2008-11-04 13:01:08 -0600 (Tue, 04 Nov 2008) | 4 lines JIRA ABE-1703 mISDN sets the channel to the wrong state when it receives the indication AST_CONTROL_RINGING. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@154269 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_misdn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index d5bf3c0ab..fc6b492b5 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2479,7 +2479,7 @@ static int misdn_indication(struct ast_channel *ast, int cond, const void *data,
}
chan_misdn_log(3, p->bc->port, " --> * SEND: State Ring pid:%d\n", p->bc ? p->bc->pid : -1);
- ast_setstate(ast, AST_STATE_RINGING);
+ ast_setstate(ast, AST_STATE_RING);
if ( !p->bc->nt && (p->originator == ORG_MISDN) && !p->incoming_early_audio )
chan_misdn_log(2, p->bc->port, " --> incoming_early_audio off\n");