kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert change in favor of a more targeted fix

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@287931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2010-09-21 19:02:40 +00:00
parent 35d4d7fb48
commit 1fd16be0b1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/channel.c
View 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)