[asterisk-commits] rmudgett: branch rmudgett/bch_shift_v1.4 r311743 - in /team/rmudgett/bch_shif...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Mar 28 12:50:01 2011
New Revision: 311743

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311743
Log:
Merged revisions 311742 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/rmudgett/bch_shift_v1.6.2

........
  r311742 | rmudgett | 2011-03-28 12:48:57 -0500 (Mon, 28 Mar 2011) | 1 line
  
  Add some consideration for GR-303 on outgoing calls.
........

Modified:
    team/rmudgett/bch_shift_v1.4/   (props changed)
    team/rmudgett/bch_shift_v1.4/channels/chan_dahdi.c

Propchange: team/rmudgett/bch_shift_v1.4/
------------------------------------------------------------------------------
--- bch_shift_v1.6.2-integrated (original)
+++ bch_shift_v1.6.2-integrated Mon Mar 28 12:50:01 2011
@@ -1,1 +1,1 @@
-/team/rmudgett/bch_shift_v1.6.2:1-311737
+/team/rmudgett/bch_shift_v1.6.2:1-311742

Modified: team/rmudgett/bch_shift_v1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bch_shift_v1.4/channels/chan_dahdi.c?view=diff&rev=311743&r1=311742&r2=311743
==============================================================================
--- team/rmudgett/bch_shift_v1.4/channels/chan_dahdi.c (original)
+++ team/rmudgett/bch_shift_v1.4/channels/chan_dahdi.c Mon Mar 28 12:50:01 2011
@@ -9074,6 +9074,8 @@
 			}
 #if defined(HAVE_PRI)
 			switch (p->sig) {
+			case SIG_GR303FXOKS:
+			case SIG_GR303FXSKS:
 			case SIG_PRI_LIB_HANDLE_CASES:
 				/*
 				 * We already have the B channel reserved for this call.  We
@@ -9092,17 +9094,11 @@
 			if (!tmp) {
 				p->outgoing = 0;
 #if defined(HAVE_PRI)
-				switch (p->sig) {
-				case SIG_PRI_LIB_HANDLE_CASES:
-					/*
-					 * This should be the last thing to clear when we are done with
-					 * the channel.
-					 */
-					p->allocated = 0;
-					break;
-				default:
-					break;
-				}
+				/*
+				 * This should be the last thing to clear when we are done with
+				 * the channel.
+				 */
+				p->allocated = 0;
 #endif	/* defined(HAVE_PRI) */
 			}
 #ifdef HAVE_PRI