[asterisk-commits] crichter: trunk r73209 - in /trunk: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: crichter
Date: Wed Jul  4 03:43:27 2007
New Revision: 73209

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73209
Log:
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..
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=73209&r1=73208&r2=73209
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Wed Jul  4 03:43:27 2007
@@ -3860,6 +3860,8 @@
 				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 @@
 				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;