[asterisk-commits] rmudgett: trunk r261405 - /trunk/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed May  5 17:22:14 2010
New Revision: 261405

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261405
Log:
Avoid a crash on SS7 channels.

Modified:
    trunk/channels/chan_dahdi.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=261405&r1=261404&r2=261405
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed May  5 17:22:14 2010
@@ -12083,9 +12083,9 @@
 
 		if (!here) {
 			tmp->locallyblocked = tmp->remotelyblocked = 0;
-			switch (chan_sig) {
+			switch (tmp->sig) {
+#if defined(HAVE_PRI)
 			case SIG_PRI_LIB_HANDLE_CASES:
-			case SIG_SS7:
 				tmp->inservice = 0;
 #if defined(HAVE_PRI_SERVICE_MESSAGES)
 				((struct sig_pri_chan *) tmp->sig_pvt)->service_status = 0;
@@ -12117,6 +12117,12 @@
 				}
 #endif	/* defined(HAVE_PRI_SERVICE_MESSAGES) */
 				break;
+#endif	/* defined(HAVE_PRI) */
+#if defined(HAVE_SS7)
+			case SIG_SS7:
+				tmp->inservice = 0;
+				break;
+#endif	/* defined(HAVE_SS7) */
 			default:
 				 /* We default to in service on protocols that don't have a reset */
 				tmp->inservice = 1;