aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-14 16:47:30 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-14 16:47:30 +0000
commit82ecd507b6816d3ef9a37cf3637c37d0cd78da1c (patch)
treeb90f1fef87ad3891659d25637c33c3750d05cba0
parentca8d539b7008a98b6804dac7e3c279d83e3b0e87 (diff)
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
-rw-r--r--channels/chan_dahdi.c2
1 files changed, 1 insertions, 1 deletions
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++;