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

................

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index ba15b93a6809c1c8ea6c72da03037ebf9ea3442d..89cbf67f73c0f7cfe4c8df345a1ec8e5e2476ed8 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -5135,7 +5135,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 f1de82b7fc58596820a831dcb922e5dc84315cb6..078c6b79e54e027595abe741386f74ddef282ba2 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -3273,6 +3273,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: