diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-30 08:50:44 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-30 08:50:44 +0000 |
| commit | 1f969f6ba9198bf309b8095180f845d3f8a4eb9e (patch) | |
| tree | efa272da1379adac0c1d378cbca75a3ff7ed46ae /channels/misdn | |
| parent | 193a26515f88e6a85e8d895185ad3b855d52a15f (diff) | |
Merged revisions 81367 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81367 | crichter | 2007-08-30 10:31:59 +0200 (Do, 30 Aug 2007) | 11 lines
Fixed a severe issue where a misdn_read would lock the channel, but read would
not return because it blocks. later chan_misdn would try to queue a frame like
a AST_CONTROL_ANSWER which could result in a deadlock situation. misdn_read
will now not block forever anymore, and we don't queue the ANSWER frame at all
when we already was called with misdn_answer -> answer would be called twice.
Also we don't explicitly send a RELEASE_COMPLETE on receiption of a RELEASE
anymore, because mISDN does that for us, this resulted in a problem on some
switches, which would block our port after some calls for a short while.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81368 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/isdn_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index af8015992..9f4f57fa0 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -1557,9 +1557,6 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ case EVENT_PROGRESS: case EVENT_PROCEEDING: case EVENT_SETUP_ACKNOWLEDGE: - - setup_bc(bc); - case EVENT_SETUP: { if (bc->channel == 0xff || bc->channel<=0) @@ -1571,6 +1568,8 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ return -1; } } + + setup_bc(bc); break; case EVENT_RELEASE_COMPLETE: |