diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-06 19:29:41 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-06 19:29:41 +0000 |
commit | 5a962f66ffa282170ebf6f38644a60cb279b8a4f (patch) | |
tree | c66547256c5c328c5e0958e249f023bcddefb46d | |
parent | 8984ba1d6451fd79f398b04f9f75453a93ed6103 (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.0@174042 f38db490-d61c-443f-a65b-d21fe96a405b
-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 7f9cdd26f..58de082b7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8923,7 +8923,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, "@"); |