[asterisk-commits] crichter: branch 1.4 r71123 - in /branches/1.4: ./ channels/ channels/misdn/

[SVN commits to the Asterisk project]

Author: crichter
Date: Fri Jun 22 10:38:08 2007
New Revision: 71123

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71123
Log:
Merged revisions 70672 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r70672 | crichter | 2007-06-21 15:11:29 +0200 (Do, 21 Jun 2007) | 1 line

we activate the bchannels in TE mode on incoming calls only when we want to connect the call.
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_misdn.c
    branches/1.4/channels/misdn/isdn_lib.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?view=diff&rev=71123&r1=71122&r2=71123
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Fri Jun 22 10:38:08 2007
@@ -5297,7 +5297,6 @@
 				chan_misdn_log(1, ch->bc->port, "SETOPT: HDLC \n");
 				if (!ch->bc->hdlc) {
 					ch->bc->hdlc=1;
-					misdn_lib_setup_bc(ch->bc);
 				}
 			}  
 			ch->bc->capability=INFO_CAPABILITY_DIGITAL_UNRESTRICTED;

Modified: branches/1.4/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/misdn/isdn_lib.c?view=diff&rev=71123&r1=71122&r2=71123
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Fri Jun 22 10:38:08 2007
@@ -3276,6 +3276,8 @@
 	case EVENT_ALERTING:
 	case EVENT_PROCEEDING:
 	case EVENT_SETUP_ACKNOWLEDGE:
+		if (!stack->nt) break;
+
 	case EVENT_CONNECT:
 	case EVENT_RETRIEVE_ACKNOWLEDGE: