[asterisk-commits] jpeeler: branch 1.6.2 r207862 - in /branches/1.6.2: ./ channels/chan_dahdi.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jul 21 15:30:38 CDT 2009
Author: jpeeler
Date: Tue Jul 21 15:30:33 2009
New Revision: 207862
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207862
Log:
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
........
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/channels/chan_dahdi.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=207862&r1=207861&r2=207862
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Tue Jul 21 15:30:33 2009
@@ -6407,7 +6407,6 @@
break;
case SIG_EM:
case SIG_EM_E1:
- case SIG_EMWINK:
case SIG_FEATD:
case SIG_SF:
case SIG_SFWINK:
@@ -6443,7 +6442,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) {
More information about the asterisk-commits
mailing list