diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-28 18:41:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-28 18:41:23 +0000 |
| commit | 7a7308449b5146348e96bdb45e48b08ea69a97ad (patch) | |
| tree | d1352a5fb4fabf2bc7e7826e43bea9085b93e5f9 | |
| parent | 9014a61313c750913e417105a05ea4ac41eb5ab1 (diff) | |
Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since
res_features doesn't exist in trunk. Thanks to qwell for pointing it out!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@100631 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 0fd1a567c..93a3fe41b 100644 --- a/main/features.c +++ b/main/features.c @@ -525,6 +525,7 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int { struct ast_channel *chan; struct ast_frame *f; + char *orig_chan_name = NULL; /* Make a new, fake channel that we'll use to masquerade in the real one */ if (!(chan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, rchan->accountcode, rchan->exten, rchan->context, rchan->amaflags, "Parked/%s",rchan->name))) { @@ -544,7 +545,10 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int if ((f = ast_read(chan))) ast_frfree(f); - ast_park_call(chan, peer, timeout, extout); + orig_chan_name = ast_strdupa(chan->name); + + park_call_full(chan, peer, timeout, extout, orig_chan_name); + return 0; } |