diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-14 16:54:22 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-14 16:54:22 +0000 |
| commit | 3c086c54767ab07f6af81334331c625a6a1aa739 (patch) | |
| tree | 04e28b232a629a06ead8e61f4b88c20a1b543b8e /channels | |
| parent | 0c708da364ce9bf578c28f3fd2f618fac687c644 (diff) | |
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.0@137849 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 31ca09ca2..26b3d8e8d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5841,7 +5841,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 ((index != x) && i->subs[x].owner && !strcasecmp(chan_name->str, i->subs[x].owner->name)) + if ((index != x) && i->subs[x].owner && !strcasecmp(chan_name->str, i->subs[x].owner->name + 6)) break; } y++; |