aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-21 13:12:43 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-21 13:12:43 +0000
commitf66c60c86c6405b523555d01a636e17046d2f005 (patch)
tree3bd323dced9fe30240b0538308a495531ed52f66
parentcfea20cbc39b07254cb04e2673bfab766053a784 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@70675 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_misdn.c1
-rw-r--r--channels/misdn/isdn_lib.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 58802776d..a9d0b64f1 100644
--- 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 73072254a..441367ade 100644
--- 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: