[asterisk-commits] mnicholson: branch 1.4 r218223 - /branches/1.4/apps/app_directed_pickup.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Sep 14 09:54:02 CDT 2009


Author: mnicholson
Date: Mon Sep 14 09:53:57 2009
New Revision: 218223

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218223
Log:
Ensure we don't pickup ourselves when doing pickup by exten.

(closes issue #15100)
Reported by: lmsteffan
Patches:
      (modified) pickup.patch uploaded by lmsteffan (license 779)


Modified:
    branches/1.4/apps/app_directed_pickup.c

Modified: branches/1.4/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/apps/app_directed_pickup.c?view=diff&rev=218223&r1=218222&r2=218223
==============================================================================
--- branches/1.4/apps/app_directed_pickup.c (original)
+++ branches/1.4/apps/app_directed_pickup.c Mon Sep 14 09:53:57 2009
@@ -98,7 +98,7 @@
 	while ((target = ast_channel_walk_locked(target))) {
 		if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) &&
 		    !strcasecmp(target->dialcontext, context) &&
-		    can_pickup(target)) {
+		    (chan != target) && can_pickup(target)) {
 			res = pickup_do(chan, target);
 			ast_channel_unlock(target);
 			break;




More information about the asterisk-commits mailing list