Merged revisions 287931 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Tue, 21 Sep 2010 19:04:57 +0000 (19:04 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 21 Sep 2010 19:04:57 +0000 (19:04 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287931 | twilson | 2010-09-21 14:02:40 -0500 (Tue, 21 Sep 2010) | 2 lines

  Revert change in favor of a more targeted fix
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287932 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 96f6483..b332dce 100644 (file)
@@ -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)