callerid: Logic error in checksum processing
authorRuss Meyerriecks <rmeyerreicks@digium.com>
Mon, 17 Mar 2014 22:24:03 +0000 (22:24 +0000)
committerRuss Meyerriecks <rmeyerreicks@digium.com>
Mon, 17 Mar 2014 22:24:03 +0000 (22:24 +0000)
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.

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

main/callerid.c

index db5e795..849579e 100644 (file)
@@ -621,7 +621,7 @@ int callerid_feed(struct callerid_state *cid, unsigned char *ubuf, int len, stru
                                }
                                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;