diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-21 19:02:40 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-21 19:02:40 +0000 |
| commit | 53ebf7f64c5aa4eee40a9ced5eaa4193628b530b (patch) | |
| tree | 84f29c544ee2d9f09f55eda38ff5f0931b23552a | |
| parent | 647db17e2a26daaf3c7bb6d726f972451afab2f4 (diff) | |
Revert change in favor of a more targeted fix
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287931 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 96f648344..b332dce1e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -8229,8 +8229,7 @@ int ast_connected_line_parse_data(const unsigned char *data, size_t datalen, str void ast_channel_update_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected, const struct ast_set_party_connected_line *update) { - unsigned char data[1024] = { 0, }; /* This should be large enough */ - unsigned char data2[sizeof(data)] = { 0, }; + unsigned char data[1024]; /* This should be large enough */ size_t datalen; datalen = ast_connected_line_build_data(data, sizeof(data), connected, update); @@ -8238,10 +8237,7 @@ void ast_channel_update_connected_line(struct ast_channel *chan, const struct as return; } - /* Only send an update if the connected line info is different or the channels info is suspect */ - if (ast_connected_line_build_data(data2, sizeof(data2), &chan->connected, update) == -1 || memcmp(data, data2, sizeof(data))) { - ast_indicate_data(chan, AST_CONTROL_CONNECTED_LINE, data, datalen); - } + ast_indicate_data(chan, AST_CONTROL_CONNECTED_LINE, data, datalen); } void ast_channel_queue_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected, const struct ast_set_party_connected_line *update) |