From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 3 Mar 2010 19:07:49 +0000 (+0000)
Subject: Merged revisions 250481 via svnmerge from
X-Git-Tag: 1.6.0.26-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6976143657dac932089a333513cc3f7dd34af01a;p=thirdparty%2Fasterisk.git

Merged revisions 250481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250481 | jpeeler | 2010-03-03 13:06:06 -0600 (Wed, 03 Mar 2010) | 22 lines

  Merged revisions 250480 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r250480 | jpeeler | 2010-03-03 13:04:11 -0600 (Wed, 03 Mar 2010) | 15 lines

    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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@250482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 94a8995491..b726fb6d5a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7303,6 +7303,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) {
 								if (res == DAHDI_EVENT_RINGBEGIN) {
@@ -7404,6 +7407,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 */
 		
@@ -7555,6 +7561,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);
@@ -7624,6 +7633,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 */