[svn-commits] crichter: trunk r71499 - in /trunk: ./ channels/ channels/misdn/

[SVN commits to the Digium repositories]

Author: crichter
Date: Mon Jun 25 04:44:35 2007
New Revision: 71499

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

................
r71123 | crichter | 2007-06-22 17:38:08 +0200 (Fr, 22 Jun 2007) | 9 lines

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:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c
    trunk/channels/misdn/isdn_lib.c

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

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=71499&r1=71498&r2=71499
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Jun 25 04:44:35 2007
@@ -5135,7 +5135,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: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_lib.c?view=diff&rev=71499&r1=71498&r2=71499
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Mon Jun 25 04:44:35 2007
@@ -3273,6 +3273,8 @@
 	case EVENT_ALERTING:
 	case EVENT_PROCEEDING:
 	case EVENT_SETUP_ACKNOWLEDGE:
+		if (!stack->nt) break;
+
 	case EVENT_CONNECT:
 	case EVENT_RETRIEVE_ACKNOWLEDGE: