diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-17 17:04:00 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-17 17:04:00 +0000 |
commit | 35ae35e5cbd47b00d9d90eaf248a001cbae529fa (patch) | |
tree | 1242209ce10629a1e398322e87d5e4d5bc790439 | |
parent | 7a427641dd166e497848a69bc58f53c89c8c30d6 (diff) |
Blocked revisions 206998 via svnmerge
........
r206998 | jpeeler | 2009-07-17 12:02:44 -0500 (Fri, 17 Jul 2009) | 14 lines
Fix segfault in sig_analog when using callwaiting, respect callwaiting options
Sig_analog handles allocating the sub channel for callwaiting, so no longer try
to do it in chan_dahdi. Modified analog_alloc_sub to only mark the sub as
allocated upon success of the alloc_sub callback, which was responsible for the
segfault. Also, the callwaiting and callwaitingcallerid options were being
unconditionally set to true. Now, the options are properly set from
chan_dahdi.conf.
(closes issue #15508)
Reported by: elguero
Tested by: elguero
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207000 f38db490-d61c-443f-a65b-d21fe96a405b
0 files changed, 0 insertions, 0 deletions