[asterisk-commits] twilson: branch 1.8 r287931 - /branches/1.8/main/channel.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Sep 21 14:02:40 2010
New Revision: 287931

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287931
Log:
Revert change in favor of a more targeted fix

Modified:
    branches/1.8/main/channel.c

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=287931&r1=287930&r2=287931
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Tue Sep 21 14:02:40 2010
@@ -8229,8 +8229,7 @@
 
 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 @@
 		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)