[svn-commits] tilghman: branch 1.6.1 r137904 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Aug 14 13:15:35 2008
New Revision: 137904

URL: http://svn.digium.com/view/asterisk?view=rev&rev=137904
Log:
Merged revisions 137848 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r137848 | tilghman | 2008-08-14 11:52:43 -0500 (Thu, 14 Aug 2008) | 17 lines

Merged revisions 137847 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines

When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027)
 Reported by: dferrer
 Patches: 
       chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
       (Slightly modified by me, to compensate for both names)

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Thu Aug 14 13:15:35 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812
+/trunk:1-137647,137680,137732,137780,137812,137848

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=137904&r1=137903&r2=137904
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Thu Aug 14 13:15:35 2008
@@ -5840,7 +5840,7 @@
 		else	
 			ast_str_set(&chan_name, 0, "%d-%d", i->channel, y);
 		for (x = 0; x < 3; x++) {
-			if ((idx != x) && i->subs[x].owner && !strcasecmp(chan_name->str, i->subs[x].owner->name))
+			if ((idx != x) && i->subs[x].owner && !strcasecmp(chan_name->str, i->subs[x].owner->name + 6))
 				break;
 		}
 		y++;