diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-06 00:38:16 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-06 00:38:16 +0000 |
| commit | c81dc7e032c5757ec2a54877a2bd94e9df156fb4 (patch) | |
| tree | de4f91b32e5fb0be3c971b912bbcdc6927b875a1 /channels | |
| parent | be0b2231437c0ffce05a9a6504250a5ee3a9ebe2 (diff) | |
Merged revisions 268495 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r268495 | tilghman | 2010-06-05 19:37:30 -0500 (Sat, 05 Jun 2010) | 2 lines
Finally track down and eliminate the "FRACK! warnings from chan_iax2".
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@268496 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index ff86aa5a2..3cf2596fb 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3227,7 +3227,16 @@ static void iax2_destroy(int callno) retry: if ((pvt = iaxs[callno])) { +#if 0 + /* iax2_destroy_helper gets called from this function later on. When + * called twice, we get the (previously) familiar FRACK! errors in + * devmode, from the scheduler. An alternative to this approach is to + * reset the scheduler entries to -1 when they're deleted in + * iax2_destroy_helper(). That approach was previously decided to be + * "wrong" because "the memory is going to be deallocated anyway. Why + * should we be resetting those values?" */ iax2_destroy_helper(pvt); +#endif } owner = pvt ? pvt->owner : NULL; |