kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-24 17:28:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make sure digit events are not reported as "ERROR"

Browse Source 
dahdievent_to_analogevent used a simple switch statement to convert DAHDI
event numbers to "ANALOG_*" event numbers. However "digit" events
(DAHDI_EVENT_PULSEDIGIT, DAHDI_EVENT_DTMFDOWN, DAHDI_EVENT_DTMFUP)
are accompannied by the digit in the low word of the event number.

This fix makes dahdievent_to_analogevent() return the event number as-is
for such an event.

This is also required to fix #15924 (in addition to r222108).  


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@222237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tzafrir Cohen
2009-10-06 16:17:30 +00:00
parent 1c9fe00920
commit 0c3cd2ee45
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+11
View File
@@ -2457,6 +2457,17 @@ static enum analog_event dahdievent_to_analogevent(int event)
res = ANALOG_EVENT_DTMFUP;
break;
default:
switch(event & 0xFFFF0000) {
case DAHDI_EVENT_PULSEDIGIT:
case DAHDI_EVENT_DTMFDOWN:
case DAHDI_EVENT_DTMFUP:
/* The event includes a digit number in the low word.
* Converting it to a 'enum analog_event' would remove
* that information. Thus it is returned as-is.
*/
return event;
}
res = ANALOG_EVENT_ERROR;
break;
}