[asterisk-commits] jpeeler: trunk r211435 - in /trunk/channels: chan_dahdi.c sig_pri.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Mon Aug 10 12:17:06 2009
New Revision: 211435

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211435
Log:
Fix PRI/BRI channels when in alarm condition to only be marked for hangup if 
T309 is not enabled.

Modified:
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_pri.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=211435&r1=211434&r2=211435
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Mon Aug 10 12:17:06 2009
@@ -6563,9 +6563,6 @@
 			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;

Modified: trunk/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/sig_pri.c?view=diff&rev=211435&r1=211434&r2=211435
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Mon Aug 10 12:17:06 2009
@@ -2500,12 +2500,11 @@
 					} 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");
-		}
-		if (p->owner)
-			ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
+					ast_log(LOG_WARNING, "The PRI Call has not been destroyed\n");
+			}
+			if (p->owner)
+				ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
+		}
 	} else {
 		p->inalarm = 0;
 	}