From 07bb116dac22c028c4cbbb667e6b496ba0a7412b Mon Sep 17 00:00:00 2001 From: jpeeler Date: Wed, 3 Mar 2010 19:04:11 +0000 Subject: Make sure to clear red alarm after polarity reversal. From the issue: The automatic overnight line tests (or manual ones) used on UK (BT) lines causes a red alarm on a dahdi / TDM400P connected channel. This is because the line uses voltage tests (battery loss) and polarity reversal. The polarity reversal causes chan_dahdi to initiate v23 CallerID processing but during this the event DAHDI_EVENT_NOALARM is ignored so that the alarm is never cleared. (closes issue #14163) Reported by: jedi98 Patches: chan_dahdi-1.4-inalarm.diff uploaded by jedi98 (license 653) Tested by: mattbrown, Chainsaw, mikeeccleston git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@250480 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'channels/chan_dahdi.c') diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 954c72352..257a888f4 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -6653,6 +6653,9 @@ static void *ss_thread(void *data) if (i & DAHDI_IOMUX_SIGEVENT) { res = dahdi_get_event(p->subs[index].dfd); ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res)); + if (res == DAHDI_EVENT_NOALARM) { + p->inalarm = 0; + } if (p->cid_signalling == CID_SIG_V23_JP) { #ifdef DAHDI_EVENT_RINGBEGIN @@ -6756,6 +6759,9 @@ static void *ss_thread(void *data) if (i & DAHDI_IOMUX_SIGEVENT) { res = dahdi_get_event(p->subs[index].dfd); ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res)); + if (res == DAHDI_EVENT_NOALARM) { + p->inalarm = 0; + } res = 0; /* Let us detect distinctive ring */ @@ -6861,6 +6867,9 @@ static void *ss_thread(void *data) if (i & DAHDI_IOMUX_SIGEVENT) { res = dahdi_get_event(p->subs[index].dfd); ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res)); + if (res == DAHDI_EVENT_NOALARM) { + p->inalarm = 0; + } /* If we get a PR event, they hung up while processing calerid */ if ( res == DAHDI_EVENT_POLARITY && p->hanguponpolarityswitch && p->polarity == POLARITY_REV) { ast_log(LOG_DEBUG, "Hanging up due to polarity reversal on channel %d while detecting callerid\n", p->channel); @@ -6932,6 +6941,9 @@ static void *ss_thread(void *data) if (i & DAHDI_IOMUX_SIGEVENT) { res = dahdi_get_event(p->subs[index].dfd); ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res)); + if (res == DAHDI_EVENT_NOALARM) { + p->inalarm = 0; + } res = 0; /* Let us detect callerid when the telco uses distinctive ring */ -- cgit v1.2.3