[svn-commits] rmudgett: trunk r210866 - /trunk/channels/sig_pri.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Aug  6 14:52:11 2009
New Revision: 210866

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210866
Log:
Sanity adjustments to pri_ss_thread for sig_pri environment.

Modified:
    trunk/channels/sig_pri.c

Modified: trunk/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/sig_pri.c?view=diff&rev=210866&r1=210865&r2=210866
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Thu Aug  6 14:52:11 2009
@@ -601,11 +601,16 @@
 	int len;
 	int timeout;
 
+	if (!chan) {
+		/* We lost the owner before we could get started. */
+		return NULL;
+	}
+
 	/*
 	 * In the bizarre case where the channel has become a zombie before we
 	 * even get started here, abort safely.
 	 */
-	if (!p) {
+	if (!chan->tech_pvt) {
 		ast_log(LOG_WARNING, "Channel became a zombie before simple switch could be started (%s)\n", chan->name);
 		ast_hangup(chan);
 		return NULL;
@@ -666,7 +671,7 @@
 exit:
 	res = sig_pri_play_tone(p, SIG_PRI_TONE_CONGESTION);
 	if (res < 0)
-			ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", p->channel);
+		ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", p->channel);
 	ast_hangup(chan);
 	return NULL;
 }