mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
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
This commit is contained in:
@@ -2261,7 +2261,9 @@ static void *__analog_ss_thread(void *data)
|
||||
ast_bridged_channel(p->subs[ANALOG_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[ANALOG_SUB_THREEWAY].owner), chan, 0, NULL);
|
||||
ast_masq_park_call_exten(
|
||||
ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner), chan, exten,
|
||||
chan->context, 0, NULL);
|
||||
ast_verb(3, "Parking call to '%s'\n", chan->name);
|
||||
break;
|
||||
} else if (!ast_strlen_zero(p->lastcid_num) && !strcmp(exten, "*60")) {
|
||||
|
Reference in New Issue
Block a user