Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since
authorRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 18:41:23 +0000 (18:41 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 18:41:23 +0000 (18:41 +0000)
res_features doesn't exist in trunk.  Thanks to qwell for pointing it out!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100631 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 0fd1a56..93a3fe4 100644 (file)
@@ -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;
 }