mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-09 19:38:22 +00:00
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/branches/1.8@309126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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++;
|
||||||
|
|||||||
Reference in New Issue
Block a user