From: Christian Richter Date: Wed, 4 Jul 2007 08:43:27 +0000 (+0000) Subject: Merged revisions 73208 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2159 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939705cfe488887df0f73f8cb3dfc96f45332c35;p=thirdparty%2Fasterisk.git Merged revisions 73208 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r73208 | crichter | 2007-07-04 10:27:44 +0200 (Mi, 04 Jul 2007) | 9 lines Merged revisions 73207 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r73207 | crichter | 2007-07-04 10:20:54 +0200 (Mi, 04 Jul 2007) | 1 line bad bug in overlapdial case, we called start_pbx multiple times, because the state wasn't changed.. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73209 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index d29cfe8237..eaa96a8f3b 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -3860,6 +3860,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) if (ast_exists_extension(ch->ast, ch->context, "i", 1, bc->oad)) { ast_log(LOG_WARNING, "Extension can never match, So jumping to 'i' extension. port(%d)\n", bc->port); strcpy(ch->ast->exten, "i"); + + ch->state = MISDN_DIALING; start_pbx(ch, bc, ch->ast); break; } @@ -3888,8 +3890,11 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) break; } - if (ast_exists_extension(ch->ast, ch->context, bc->dad, 1, bc->oad)) + if (ast_exists_extension(ch->ast, ch->context, bc->dad, 1, bc->oad)) { + + ch->state = MISDN_DIALING; start_pbx(ch, bc, ch->ast); + } } else { /* sending INFOS as DTMF-Frames :) */ struct ast_frame fr;