diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-30 08:31:59 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-30 08:31:59 +0000 |
| commit | 65b67c080ac659c9b93c7fd25bce084d0227b301 (patch) | |
| tree | 2b5bd7cc72239c9181e674560edc59e6f6ef9637 /channels/misdn | |
| parent | 6f7990be465684b088595b887aa2469911421980 (diff) | |
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/branches/1.4@81367 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 e8fff355e..e02d8a075 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -1566,9 +1566,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) @@ -1580,6 +1577,8 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ return -1; } } + + setup_bc(bc); break; case EVENT_RELEASE_COMPLETE: |