From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 14 Aug 2008 16:52:43 +0000 (+0000)
Subject: Merged revisions 137847 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~1431
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a99c9e158e8550b057e4df25805243bd4e88143;p=thirdparty%2Fasterisk.git

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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 7018e4e110..7ca68ff246 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5840,7 +5840,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
 		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++;