[svn-commits] russell: trunk r94794 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Dec 26 11:26:04 2007
New Revision: 94794

URL: http://svn.digium.com/view/asterisk?view=rev&rev=94794
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=94794&r1=94793&r2=94794
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Wed Dec 26 11:26:04 2007
@@ -446,9 +446,8 @@
 	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 @@
 		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;
 }