aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-26 17:26:04 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-26 17:26:04 +0000
commita73c661b0309d2ab15752982d319f9fdf7cc26a0 (patch)
tree1abc2703c6ae5227cd21a92a13d514efc7cad2aa /res
parent3377f3a6cdfa2600e1be91de0948baf1f3133234 (diff)
Merged revisions 94793 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@94794 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 8c843c173..8de1c1fea 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -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;
}