[asterisk-commits] mnicholson: branch 1.6.2 r218238 - in /branches/1.6.2: ./ apps/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Sep 14 10:20:40 2009
New Revision: 218238

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218238
Log:
Merged revisions 218224 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines
  
  Merged revisions 218223 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines
    
    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.6.2/   (props changed)
    branches/1.6.2/apps/app_directed_pickup.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/apps/app_directed_pickup.c?view=diff&rev=218238&r1=218237&r2=218238
==============================================================================
--- branches/1.6.2/apps/app_directed_pickup.c (original)
+++ branches/1.6.2/apps/app_directed_pickup.c Mon Sep 14 10:20:40 2009
@@ -172,6 +172,7 @@
 struct pickup_criteria {
 	const char *exten;
 	const char *context;
+	struct ast_channel *chan;
 };
 
 static int find_by_exten(struct ast_channel *c, void *data)
@@ -180,7 +181,7 @@
 
 	return (!strcasecmp(c->macroexten, info->exten) || !strcasecmp(c->exten, info->exten)) &&
 		!strcasecmp(c->dialcontext, info->context) &&
-		can_pickup(c);
+		(info->chan != c) && can_pickup(c);
 }
 
 /* Attempt to pick up specified extension with context */
@@ -190,6 +191,7 @@
 	struct pickup_criteria search = {
 		.exten = exten,
 		.context = context,
+		.chan = chan,
 	};
 
 	target = ast_channel_search_locked(find_by_exten, &search);