automerge commit

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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 58802776da8ec58a6ed77adb3f4f492813e96c63..a9d0b64f1c9c6108ba1ce1db8e9e64238e3eef91 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -4997,7 +4997,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 73072254a591da69140490f18a9fd07d0ceec5bb..441367aded643be748a3b7d5d7373d88a409744c 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -3266,6 +3266,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: