[svn-commits] rmudgett: branch rmudgett/bch_shift_v1.6.2 r311737 - /team/rmudgett/bch_shift...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Mar 28 11:56:59 2011
New Revision: 311737

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311737
Log:
Add some missing exception code and restore some now GR-303 specific code.

Modified:
    team/rmudgett/bch_shift_v1.6.2/channels/chan_dahdi.c

Modified: team/rmudgett/bch_shift_v1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bch_shift_v1.6.2/channels/chan_dahdi.c?view=diff&rev=311737&r1=311736&r2=311737
==============================================================================
--- team/rmudgett/bch_shift_v1.6.2/channels/chan_dahdi.c (original)
+++ team/rmudgett/bch_shift_v1.6.2/channels/chan_dahdi.c Mon Mar 28 11:56:59 2011
@@ -3751,8 +3751,11 @@
 		}
 		if (!(sr = pri_sr_new())) {
 			ast_log(LOG_WARNING, "Failed to allocate setup request channel %d\n", p->channel);
+			pri_destroycall(p->pri->pri, p->call);
+			p->call = NULL;
 			pri_rel(p->pri);
 			ast_mutex_unlock(&p->lock);
+			return -1;
 		}
 		if (p->bearer || (mysig == SIG_FXSKS)) {
 			if (p->bearer) {
@@ -11250,6 +11253,13 @@
 
 	/* If no owner definitely available */
 	if (!p->owner) {
+#ifdef HAVE_PRI
+		/* Trust PRI */
+		if (p->pri) {
+			/* Likely only GR-303 gets here. */
+			return sig_pri_available(p);
+		}
+#endif
 #ifdef HAVE_SS7
 		/* Trust SS7 */
 		if (p->ss7) {