diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-13 19:52:08 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-13 19:52:08 +0000 |
| commit | d318ae2fa2ed32d6856599c9d32097da1b2975f6 (patch) | |
| tree | 6004b92c2a57d0623d7f7d8926b2223297508d3f /main/features.c | |
| parent | 1a7520752c82258750e5dc75232e34d5454cd9b0 (diff) | |
Merged revisions 239839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines
Merged revisions 239838 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines
Fix regression for timed out parked call returning to caller
This issue seems to have been exposed by the fix in 160390 whereby using a
masquerade prevented a crash. The new channel used in the masquerade was
not copying the macro information from the old channel.
(closes issue #15459)
Reported by: djrodman
Patches:
patch_15459.txt uploaded by mnick (license )
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@239841 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 1fdce077f..d013b78f4 100644 --- a/main/features.c +++ b/main/features.c @@ -791,6 +791,11 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i /* Setup the extensions and such */ set_c_e_p(chan, rchan->context, rchan->exten, rchan->priority); + /* Setup the macro extension and such */ + ast_copy_string(chan->macrocontext,rchan->macrocontext,sizeof(chan->macrocontext)); + ast_copy_string(chan->macroexten,rchan->macroexten,sizeof(chan->macroexten)); + chan->macropriority = rchan->macropriority; + /* Make the masq execute */ if ((f = ast_read(chan))) ast_frfree(f); |