From: Jeff Peeler <jpeeler@digium.com>
Date: Mon, 10 Aug 2009 17:17:06 +0000 (+0000)
Subject: Fix PRI/BRI channels when in alarm condition to only be marked for hangup if
X-Git-Tag: 11.0.0-beta1~4370
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93b6a46fde2c44d2bd0ca01b9129ce4c3484479e;p=thirdparty%2Fasterisk.git

Fix PRI/BRI channels when in alarm condition to only be marked for hangup if
T309 is not enabled.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2a979dd664..ee05f95393 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6563,9 +6563,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
 			if (p->sig == SIG_PRI || p->sig == SIG_BRI || p->sig == SIG_BRI_PTMP) {
 				sig_pri_chan_alarm_notify(p->sig_pvt, 0);
 
-			} else {
-				if (p->owner)
-					p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
 			}
 #endif
 		p->inalarm = 1;
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 6d9bf66b92..307dabe4e9 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -2500,12 +2500,11 @@ void sig_pri_chan_alarm_notify(struct sig_pri_chan *p, int noalarm)
 					} else
 						ast_log(LOG_WARNING, "Failed to grab PRI!\n");
 				} else
-					ast_log(LOG_WARNING, "Failed to grab PRI!\n");
-			} else
-				ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n");
+					ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n");
+			}
+			if (p->owner)
+				ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
 		}
-		if (p->owner)
-			ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
 	} else {
 		p->inalarm = 0;
 	}