From 82ecd507b6816d3ef9a37cf3637c37d0cd78da1c Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 14 Aug 2008 16:47:30 +0000 Subject: 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.4@137847 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 361c040b5..0374925ba 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5270,7 +5270,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb else b2 = ast_safe_string_alloc("%d-%d", i->channel, y); for (x = 0; x < 3; x++) { - if ((index != x) && i->subs[x].owner && !strcasecmp(b2, i->subs[x].owner->name)) + if ((index != x) && i->subs[x].owner && !strcasecmp(b2, i->subs[x].owner->name + (strncmp(i->subs[x].owner->name, "Zap", 3) ? 4 : 6))) break; } y++; -- cgit v1.2.3