[svn-commits] rmudgett: trunk r301135 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Jan  7 19:13:58 2011
New Revision: 301135

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301135
Log:
Merged revisions 301134 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301134 | rmudgett | 2011-01-07 19:11:31 -0600 (Fri, 07 Jan 2011) | 7 lines
  
  The DTMF attended transfer feature cannot callback a chan_dahdi BRI phone.
  
  The DAHDI ISDN channel name is not dialable.
  
  Make a channel name like DAHDI/i3/400-12 dialable when the sequence number
  is stripped off of the name.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=301135&r1=301134&r2=301135
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jan  7 19:13:58 2011
@@ -12826,6 +12826,11 @@
 		if (!p->pri || p->pri->span != span) {
 			return 0;
 		}
+		if (!groupmatch && channelmatch == -1) {
+			/* Match any group since it only needs to be on the PRI span. */
+			*groupmatched = 1;
+			return 1;
+		}
 	}
 #endif	/* defined(HAVE_PRI) */
 	/* check group matching */
@@ -13136,11 +13141,14 @@
 	 * data is ---v
 	 * Dial(DAHDI/pseudo[/extension[/options]])
 	 * Dial(DAHDI/<channel#>[c|r<cadance#>|d][/extension[/options]])
+	 * Dial(DAHDI/<subdir>!<channel#>[c|r<cadance#>|d][/extension[/options]])
+	 * Dial(DAHDI/i<span>[/extension[/options]])
 	 * Dial(DAHDI/[i<span>-](g|G|r|R)<group#(0-63)>[c|r<cadance#>|d][/extension[/options]])
-	 * Dial(DAHDI/<subdir>!<channel#>[c|r<cadance#>|d][/extension[/options]])
 	 *
 	 * i - ISDN span channel restriction.
 	 *     Used by CC to ensure that the CC recall goes out the same span.
+	 *     Also to make ISDN channel names dialable when the sequence number
+	 *     is stripped off.  (Used by DTMF attended transfer feature.)
 	 *
 	 * g - channel group allocation search forward
 	 * G - channel group allocation search backward
@@ -13189,8 +13197,8 @@
 		/* Remove the ISDN span channel restriction specifier. */
 		s = strchr(args.group, '-');
 		if (!s) {
-			ast_log(LOG_WARNING, "Bad ISDN span format for data %s\n", data);
-			return NULL;
+			/* Search all groups since we are ISDN span restricted. */
+			return iflist;
 		}
 		args.group = s + 1;
 		res = 0;