From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 21 Jul 2009 20:29:08 +0000 (+0000)
Subject: Merged revisions 207854 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d494d954905ebc2bf2ebe650ece69321f4e5f189;p=thirdparty%2Fasterisk.git

Merged revisions 207854 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r207854 | jpeeler | 2009-07-21 15:26:02 -0500 (Tue, 21 Jul 2009) | 16 lines

  Merged revisions 207827 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r207827 | jpeeler | 2009-07-21 15:16:55 -0500 (Tue, 21 Jul 2009) | 9 lines

    Wait for wink before dialing when using E&M wink signaling

    There was already code for other signaling types in dahdi_handle_event to
    handle dialing if a dial operation dial string was present. Simply add
    SIG_EMWINK to the list.

    (closes issue #14434)
    Reported by: araasch
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@207861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 232d28857d..010d46c537 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5365,7 +5365,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
 				break;
 			case SIG_EM:
 			case SIG_EM_E1:
-			case SIG_EMWINK:
 			case SIG_FEATD:
 			case SIG_SF:
 			case SIG_SFWINK:
@@ -5401,7 +5400,8 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
 			case SIG_FEATB:
 			case SIG_SF_FEATDMF:
 			case SIG_SF_FEATB:
-				/* FGD MF *Must* wait for wink */
+			case SIG_EMWINK:
+				/* FGD MF and EMWINK *Must* wait for wink */
 				if (!ast_strlen_zero(p->dop.dialstr)) {
 					res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_DIAL, &p->dop);
 					if (res < 0) {