Merged revisions 94793 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 26 Dec 2007 17:26:04 +0000 (17:26 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 26 Dec 2007 17:26:04 +0000 (17:26 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94793 | russell | 2007-12-26 11:24:17 -0600 (Wed, 26 Dec 2007) | 3 lines

Don't try to send a parked call back to itself.
(closes issue #11622, reported by djrodman, patched by me)

........

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

res/res_features.c

index 8c843c1..8de1c1f 100644 (file)
@@ -446,9 +446,8 @@ static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, in
        pu->parkingtime = (timeout > 0) ? timeout : parkingtime;
        if (extout)
                *extout = x;
-       if (!ast_strlen_zero(orig_chan_name))
-               ast_copy_string(pu->peername, orig_chan_name, sizeof(pu->peername));
-       else if (peer) 
+
+       if (peer) 
                ast_copy_string(pu->peername, peer->name, sizeof(pu->peername));
 
        /* Remember what had been dialed, so that if the parking
@@ -2369,7 +2368,7 @@ static int park_call_exec(struct ast_channel *chan, void *data)
                res = ast_safe_sleep(chan, 1000);
        /* Park the call */
        if (!res)
-               res = park_call_full(chan, chan, 0, NULL, orig_chan_name);
+               res = park_call_full(chan, NULL, 0, NULL, orig_chan_name);
 
        return !res ? AST_PBX_KEEPALIVE : res;
 }