kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 309126 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309126 | rmudgett | 2011-03-01 12:44:05 -0600 (Tue, 01 Mar 2011) | 16 lines
  
  Chan_dahdi does not retain CID when detecting DTMF CID without polarity reversal.
  
  Looks like an unintended change when sig_analog.c was extracted from
  chan_dahdi.c.
  
  Removed useless conditional around needed code and fixed resulting
  compiler warning.
  
  (closes issue #18667)
  Reported by: enegaard
  Patches:
        issue18667.patch uploaded by enegaard (license 1197)
  Tested by: enegaard
  
  JIRA SWP-2965
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-03-01 18:50:07 +00:00
parent 8e603ab4e1
commit 72260849b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/sig_analog.c
View File

@@ -3019,7 +3019,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
break; break;
} }
break; break;
#ifdef ANALOG_EVENT_RINGBEGIN
case ANALOG_EVENT_RINGBEGIN: case ANALOG_EVENT_RINGBEGIN:
switch (p->sig) { switch (p->sig) {
case ANALOG_SIG_FXSLS: case ANALOG_SIG_FXSLS:
@@ -3029,9 +3028,10 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
analog_set_ringtimeout(p, p->ringt_base); analog_set_ringtimeout(p, p->ringt_base);
} }
break; break;
default:
break;
} }
break; break;
#endif
case ANALOG_EVENT_RINGEROFF: case ANALOG_EVENT_RINGEROFF:
if (p->inalarm) break; if (p->inalarm) break;
ast->rings++; ast->rings++;