diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-06 19:30:29 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-06 19:30:29 +0000 |
| commit | 641b4af33b4d5b9bab0855b9d28e18444234de3f (patch) | |
| tree | dc0120b57f398e3c4eb83db68dcdb43c22053b8a /channels | |
| parent | 9c6948c072d37f0ee11e1bbdeb93764940c22f39 (diff) | |
Merged revisions 174041 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r174041 | file | 2009-02-06 15:28:53 -0400 (Fri, 06 Feb 2009) | 4 lines
Don't subscribe to a mailbox on pseudo channels. It is futile. This solves an issue where duplicated pseudo channels would cause a crash because the first one would unsubscribe and the next one would also try to unsubscribe the same subscription.
(closes issue #14322)
Reported by: amessina
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174043 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 804e8235e..76d79c026 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -9120,7 +9120,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->cid_ton = 0; ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name)); ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox)); - if (!ast_strlen_zero(tmp->mailbox)) { + if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) { char *mailbox, *context; mailbox = context = ast_strdupa(tmp->mailbox); strsep(&context, "@"); |