From 4e1347837b44cf4291287d62b07f3def556fe314 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 14 Aug 2008 18:15:35 +0000 Subject: 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) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@137904 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 7018e4e11..7ca68ff24 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++; -- cgit v1.2.3