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

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;

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;
 	}