[svn-commits] murf: trunk r89277 - /trunk/main/pbx.c

[SVN commits to the Digium repositories]

Author: murf
Date: Wed Nov 14 19:42:12 2007
New Revision: 89277

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89277
Log:
Had trouble playing with parking; spent a long time trying to reason out MATCHMORE mode. made these updates and xfers on zaptel lines seem to work ok now

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=89277&r1=89276&r2=89277
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Nov 14 19:42:12 2007
@@ -1586,10 +1586,13 @@
 		return NULL;
 	}
 
-	if (!eroot && action == E_CANMATCH && score.canmatch_exten) {
+	if (!eroot && (action == E_CANMATCH || action == E_MATCHMORE) && score.canmatch_exten) {
 		q->status = STATUS_SUCCESS;
 		return score.canmatch_exten;
 	}
+
+	if (action == E_MATCHMORE && eroot)
+		return NULL;  /* according to the code, complete matches are null matches in MATCHMORE mode */
 
 	if (eroot) {
 		/* found entry, now look for the right priority */