[svn-commits] jpeeler: branch jpeeler/dahdi-restart r127964 - /team/jpeeler/dahdi-restart/c...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Jul  3 18:25:13 2008
New Revision: 127964

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127964
Log:
a few fixes for ISDN, still needs work hanging up

Modified:
    team/jpeeler/dahdi-restart/channels/chan_dahdi.c

Modified: team/jpeeler/dahdi-restart/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/dahdi-restart/channels/chan_dahdi.c?view=diff&rev=127964&r1=127963&r2=127964
==============================================================================
--- team/jpeeler/dahdi-restart/channels/chan_dahdi.c (original)
+++ team/jpeeler/dahdi-restart/channels/chan_dahdi.c Thu Jul  3 18:25:13 2008
@@ -1853,6 +1853,8 @@
 {
 	int x, y, res;
 	x = muted;
+	if (!p)
+		return -1;
 	if ((p->sig == SIG_PRI) || (p->sig == SIG_SS7) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP)) {
 		y = 1;
 		res = ioctl(p->subs[SUB_REAL].zfd, DAHDI_AUDIOMODE, &y);
@@ -3428,6 +3430,9 @@
 		errno = EINVAL;
 		return -1;
 	}
+
+	if (!p)
+		return -1;
 
 	switch (option) {
 	case AST_OPTION_TXGAIN:
@@ -11994,6 +11999,8 @@
 	}
 	if (setup_dahdi(2) != 0) {
 		ast_log(LOG_WARNING, "Reload channels from dahdi config failed!\n");
+		ast_mutex_unlock(&ss_thread_lock);
+		restart_pending = 0;
 		return 1;
 	}
 	ast_mutex_unlock(&ss_thread_lock);