diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 17:48:14 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 17:48:14 +0000 |
| commit | cd6e2538f2b4beaa8bbc1a63a9b15bcfec9205f5 (patch) | |
| tree | ed55299ece90811b543578536f3a264c7da179f9 /main/features.c | |
| parent | f3bfece4c3b0ecd77cdde1184f438ceb21572116 (diff) | |
Change several bridge functions to return error status.
The bridge frame queue functions need to return an error status if the
frame failed to be queued because of an error condition. The main calls
that needed to return the status are:
ast_bridge_channel_queue_action_data() and
ast_bridge_channel_write_action_data(). The other return changes are
ripple effects.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index ff68b06e5..c26e2deee 100644 --- a/main/features.c +++ b/main/features.c @@ -3308,10 +3308,11 @@ static void dynamic_dtmf_hook_callback(struct ast_bridge_channel *bridge_channel run_data->moh_offset ? &run_data->app_name[run_data->moh_offset] : NULL); } -static void dynamic_dtmf_hook_run_callback(struct ast_bridge_channel *bridge_channel, +static int dynamic_dtmf_hook_run_callback(struct ast_bridge_channel *bridge_channel, ast_bridge_custom_callback_fn callback, const void *payload, size_t payload_size) { callback(bridge_channel, payload, payload_size); + return 0; } struct dynamic_dtmf_hook_data { @@ -3342,7 +3343,7 @@ struct dynamic_dtmf_hook_data { static int dynamic_dtmf_hook_trip(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt) { struct dynamic_dtmf_hook_data *pvt = hook_pvt; - void (*run_it)(struct ast_bridge_channel *bridge_channel, ast_bridge_custom_callback_fn callback, const void *payload, size_t payload_size); + int (*run_it)(struct ast_bridge_channel *bridge_channel, ast_bridge_custom_callback_fn callback, const void *payload, size_t payload_size); struct dynamic_dtmf_hook_run *run_data; const char *activated_name; size_t len_name; |