[svn-commits] jpeeler: trunk r207854 - in /trunk: ./ channels/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Jul 21 15:26:02 2009
New Revision: 207854

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_analog.c

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=207854&r1=207853&r2=207854
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Jul 21 15:26:02 2009
@@ -7041,7 +7041,6 @@
 			break;
 		case SIG_EM:
 		case SIG_EM_E1:
-		case SIG_EMWINK:
 		case SIG_FEATD:
 		case SIG_SF:
 		case SIG_SFWINK:
@@ -7075,7 +7074,8 @@
 		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) {

Modified: trunk/channels/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/sig_analog.c?view=diff&rev=207854&r1=207853&r2=207854
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Tue Jul 21 15:26:02 2009
@@ -2670,7 +2670,6 @@
 			break;
 		case ANALOG_SIG_EM:
 		case ANALOG_SIG_EM_E1:
-		case ANALOG_SIG_EMWINK:
 		case ANALOG_SIG_FEATD:
 		case ANALOG_SIG_SF:
 		case ANALOG_SIG_SFWINK:
@@ -2704,7 +2703,8 @@
 		case ANALOG_SIG_FEATB:
 		case ANALOG_SIG_SF_FEATDMF:
 		case ANALOG_SIG_SF_FEATB:
-			/* FGD MF *Must* wait for wink */
+		case ANALOG_SIG_EMWINK:
+			/* FGD MF and EMWINK *Must* wait for wink */
 			if (!ast_strlen_zero(p->dop.dialstr)) {
 				res = analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop);
 				if (res < 0) {