aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 18:03:10 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 18:03:10 +0000
commit64f666bdcb2403922ba264a93b7c95bde6095e25 (patch)
treecd47eae00c48491fb42d2939e30228712210b07b /include/asterisk/channel.h
parent427f02f34813cc8d3f51e0dc42f7532099aca7f1 (diff)
The channel needs to stay locked while running timer callbacks, as they access
and modify channel data that may change elsewhere. I went through every timer callback in the source tree to make sure that none of them did any additional locking that could introduce deadlocks, and all is well. (closes issue #10765) Reported by: Ivan Patches: ast_1_4_11_svn_patch_channel_rc.diff uploaded by Ivan (license 229) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@86330 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 8f23fea11..5a704199e 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -141,6 +141,7 @@ typedef unsigned long long ast_group_t;
struct ast_generator {
void *(*alloc)(struct ast_channel *chan, void *params);
void (*release)(struct ast_channel *chan, void *data);
+ /*! This function gets called with the channel locked */
int (*generate)(struct ast_channel *chan, void *data, int len, int samples);
};