diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-10-18 21:15:45 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-10-18 21:15:45 +0000 |
| commit | 10de040b6e89e7c973c23353d477c5dd465a14df (patch) | |
| tree | 25a7d164a2b8276213348bc5f63fe7c6ed9af4cf /channels/chan_dahdi.c | |
| parent | d19ddf87410ce65071cf92c298bf048f3ab0f9bb (diff) | |
More parking issues.
* Fix potential deadlocks in SIP and IAX blind transfer to parking.
* Fix SIP, IAX, DAHDI analog, and MGCP channel drivers to respect the
parkext_exclusive option with transfers (Park(,,,,,exclusive_lot)
parameter). Created ast_park_call_exten() and ast_masq_park_call_exten()
to maintian API compatibility.
* Made masq_park_call() handle a failed ast_channel_masquerade() setup.
* Reduced excessive struct parkeduser.peername[] size.
........
Merged revisions 341254 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 341255 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 05b992402..aa3c71fd8 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -10324,7 +10324,8 @@ static void *analog_ss_thread(void *data) ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { /* This is a three way call, the main call being a real channel, and we're parking the first call. */ - ast_masq_park_call(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), chan, 0, NULL); + ast_masq_park_call_exten(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), + chan, exten, chan->context, 0, NULL); ast_verb(3, "Parking call to '%s'\n", chan->name); break; } else if (p->hidecallerid && !strcmp(exten, "*82")) { |