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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@71123 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index a742299774ae7534947bebc4af08dac296c32ee0..85afca84e3f73bb73d8dafa91b5b253398c8db93 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -5297,7 +5297,6 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data)
                                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;

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 1eb10801241c049dcc85854ffbbbe46ab75c3fed..92c594aec5aa6a96513ff3022046e35aeab76903 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -3276,6 +3276,8 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
        case EVENT_ALERTING:
        case EVENT_PROCEEDING:
        case EVENT_SETUP_ACKNOWLEDGE:
+               if (!stack->nt) break;
+
        case EVENT_CONNECT:
        case EVENT_RETRIEVE_ACKNOWLEDGE: