dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@207854 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
jpeeler 2009-07-21 20:26:02 +00:00
parent 5bc2ee7e25
commit 9c195f37e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_dahdi.c
View File

@ -7041,7 +7041,6 @@ winkflashdone:
break;
case SIG_EM:
case SIG_EM_E1:
case SIG_EMWINK:
case SIG_FEATD:
case SIG_SF:
case SIG_SFWINK:
@ -7075,7 +7074,8 @@ winkflashdone:
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) {

4
channels/sig_analog.c
View File

@ -2670,7 +2670,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
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 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
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) {