[svn-commits] rmeyerriecks: trunk r410775 - in /trunk: ./ main/callerid.c

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Mar 17 17:24:03 2014
New Revision: 410775

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410775
Log:
callerid: Logic error in checksum processing

Callerid checksum-ing was being handled incorrectly here. When the checksum is
calculated to be 0x00, it will perform 0x100-0x00 which results in 0x100. This
value will then fail the otherwise correct callerid message.

This patch changes the logic to simply add the calculated checksum to the
transmitted 2's compliment checksum.  

Review: https://reviewboard.asterisk.org/r/3356/
(closes issue ASTERISK-23488)

........
This is a merge of merged revisions 410750 410747 from http://svn.asterisk.org/svn/asterisk/branches/12
I didn't want a broken patch to be comitted to trunk so I pre-merge merged them.

Modified:
    trunk/   (props changed)
    trunk/main/callerid.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/callerid.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/callerid.c?view=diff&rev=410775&r1=410774&r2=410775
==============================================================================
--- trunk/main/callerid.c (original)
+++ trunk/main/callerid.c Mon Mar 17 17:24:03 2014
@@ -621,7 +621,7 @@
 				}
 				break;
 			case 5: /* Check checksum */
-				if (b != (256 - (cid->cksum & 0xff))) {
+				if ((b + cid->cksum) & 0xff) {
 					ast_log(LOG_NOTICE, "Caller*ID failed checksum\n");
 					/* Try again */
 					cid->sawflag = 0;