diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-10 20:35:25 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-10 20:35:25 +0000 |
| commit | b77e092994c1416a570dac1975f9a1282da2ee44 (patch) | |
| tree | 476c406379683d1018a036d970ed92eedac55b88 /funcs/func_channel.c | |
| parent | 2cf5ce1b3ea30ea29cfdaa59d65099a8f496f753 (diff) | |
Merged revisions 286059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r286059 | twilson | 2010-09-10 14:25:08 -0500 (Fri, 10 Sep 2010) | 16 lines
Inherit CHANNEL() writes to both sides of a Local channel
Having Local (/n) channels as queue members and setting the language in the
extension with Set(CHANNEL(language)=fr) sets the language on the Local/...,2
channel. Hold time report playbacks happen on the Local/...,1 channel and
therefor do not play in the specified language.
This patch modifies func_channel_write to call the setoption callback and pass
the CHANNEL() write info to the callback. chan_local uses this information to
look up the other side of the channel and apply the same changes to it.
(closes issue #17673)
Reported by: Guggemand
Review: https://reviewboard.asterisk.org/r/903/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@286115 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_channel.c')
| -rw-r--r-- | funcs/func_channel.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/funcs/func_channel.c b/funcs/func_channel.c index ecda99616..57bd21c61 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -278,7 +278,7 @@ static int func_channel_read(struct ast_channel *chan, const char *function, return ret; } -static int func_channel_write(struct ast_channel *chan, const char *function, +static int func_channel_write_real(struct ast_channel *chan, const char *function, char *data, const char *value) { int ret = 0; @@ -344,6 +344,24 @@ static int func_channel_write(struct ast_channel *chan, const char *function, return ret; } +static int func_channel_write(struct ast_channel *chan, const char *function, char *data, const char *value) +{ + int res; + ast_chan_write_info_t write_info = { + .version = AST_CHAN_WRITE_INFO_T_VERSION, + .write_fn = func_channel_write_real, + .chan = chan, + .function = function, + .data = data, + .value = value, + }; + + res = func_channel_write_real(chan, function, data, value); + ast_channel_setoption(chan, AST_OPTION_CHANNEL_WRITE, &write_info, sizeof(write_info), 0); + + return res; +} + static struct ast_custom_function channel_function = { .name = "CHANNEL", .read = func_channel_read, |