diff --git a/README.md b/README.md index bb4b44987..deabc0b74 100755 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2018-07-21, Replace crc32 IEEE by golang to match MIT license. 3.0.30 * v3.0, 2018-02-16, Fix [#464][bug #464], support RTMP origin cluster. 3.0.29 * v3.0, 2018-02-13, Fix [#1057][bug #1057], switch to simple handshake. 3.0.28 * v3.0, 2018-02-13, Fix [#1059][bug #1059], merge from 2.0, supports url with vhost in stream. 3.0.27 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 4346114c9..2db884d2b 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // current release version #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 29 +#define VERSION_REVISION 30 // generated by configure, only macros. #include diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 80bb062ca..7c901eb2d 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -745,87 +745,70 @@ unsigned int __mpegts_crc32(const uint8_t *data, int len) return crc; } -// @see https://github.com/ETrun/crc32/blob/master/crc32.c - uint32_t __crc32_ieee(uint32_t init, const uint8_t* buf, size_t nb_buf) -{ - /*----------------------------------------------------------------------------*\ - * CRC-32 version 2.0.0 by Craig Bruce, 2006-04-29. - * - * This program generates the CRC-32 values for the files named in the - * command-line arguments. These are the same CRC-32 values used by GZIP, - * PKZIP, and ZMODEM. The Crc32_ComputeBuf() can also be detached and - * used independently. - * - * THIS PROGRAM IS PUBLIC-DOMAIN SOFTWARE. - * - * Based on the byte-oriented implementation "File Verification Using CRC" - * by Mark R. Nelson in Dr. Dobb's Journal, May 1992, pp. 64-67. - * - * v1.0.0: original release. - * v1.0.1: fixed printf formats. - * v1.0.2: fixed something else. - * v1.0.3: replaced CRC constant table by generator function. - * v1.0.4: reformatted code, made ANSI C. 1994-12-05. - * v2.0.0: rewrote to use memory buffer & static table, 2006-04-29. - * v2.1.0: modified by Nico, 2013-04-20 - \*----------------------------------------------------------------------------*/ - static const uint32_t table[256] = { - 0x00000000,0x77073096,0xEE0E612C,0x990951BA,0x076DC419,0x706AF48F,0xE963A535, - 0x9E6495A3,0x0EDB8832,0x79DCB8A4,0xE0D5E91E,0x97D2D988,0x09B64C2B,0x7EB17CBD, - 0xE7B82D07,0x90BF1D91,0x1DB71064,0x6AB020F2,0xF3B97148,0x84BE41DE,0x1ADAD47D, - 0x6DDDE4EB,0xF4D4B551,0x83D385C7,0x136C9856,0x646BA8C0,0xFD62F97A,0x8A65C9EC, - 0x14015C4F,0x63066CD9,0xFA0F3D63,0x8D080DF5,0x3B6E20C8,0x4C69105E,0xD56041E4, - 0xA2677172,0x3C03E4D1,0x4B04D447,0xD20D85FD,0xA50AB56B,0x35B5A8FA,0x42B2986C, - 0xDBBBC9D6,0xACBCF940,0x32D86CE3,0x45DF5C75,0xDCD60DCF,0xABD13D59,0x26D930AC, - 0x51DE003A,0xC8D75180,0xBFD06116,0x21B4F4B5,0x56B3C423,0xCFBA9599,0xB8BDA50F, - 0x2802B89E,0x5F058808,0xC60CD9B2,0xB10BE924,0x2F6F7C87,0x58684C11,0xC1611DAB, - 0xB6662D3D,0x76DC4190,0x01DB7106,0x98D220BC,0xEFD5102A,0x71B18589,0x06B6B51F, - 0x9FBFE4A5,0xE8B8D433,0x7807C9A2,0x0F00F934,0x9609A88E,0xE10E9818,0x7F6A0DBB, - 0x086D3D2D,0x91646C97,0xE6635C01,0x6B6B51F4,0x1C6C6162,0x856530D8,0xF262004E, - 0x6C0695ED,0x1B01A57B,0x8208F4C1,0xF50FC457,0x65B0D9C6,0x12B7E950,0x8BBEB8EA, - 0xFCB9887C,0x62DD1DDF,0x15DA2D49,0x8CD37CF3,0xFBD44C65,0x4DB26158,0x3AB551CE, - 0xA3BC0074,0xD4BB30E2,0x4ADFA541,0x3DD895D7,0xA4D1C46D,0xD3D6F4FB,0x4369E96A, - 0x346ED9FC,0xAD678846,0xDA60B8D0,0x44042D73,0x33031DE5,0xAA0A4C5F,0xDD0D7CC9, - 0x5005713C,0x270241AA,0xBE0B1010,0xC90C2086,0x5768B525,0x206F85B3,0xB966D409, - 0xCE61E49F,0x5EDEF90E,0x29D9C998,0xB0D09822,0xC7D7A8B4,0x59B33D17,0x2EB40D81, - 0xB7BD5C3B,0xC0BA6CAD,0xEDB88320,0x9ABFB3B6,0x03B6E20C,0x74B1D29A,0xEAD54739, - 0x9DD277AF,0x04DB2615,0x73DC1683,0xE3630B12,0x94643B84,0x0D6D6A3E,0x7A6A5AA8, - 0xE40ECF0B,0x9309FF9D,0x0A00AE27,0x7D079EB1,0xF00F9344,0x8708A3D2,0x1E01F268, - 0x6906C2FE,0xF762575D,0x806567CB,0x196C3671,0x6E6B06E7,0xFED41B76,0x89D32BE0, - 0x10DA7A5A,0x67DD4ACC,0xF9B9DF6F,0x8EBEEFF9,0x17B7BE43,0x60B08ED5,0xD6D6A3E8, - 0xA1D1937E,0x38D8C2C4,0x4FDFF252,0xD1BB67F1,0xA6BC5767,0x3FB506DD,0x48B2364B, - 0xD80D2BDA,0xAF0A1B4C,0x36034AF6,0x41047A60,0xDF60EFC3,0xA867DF55,0x316E8EEF, - 0x4669BE79,0xCB61B38C,0xBC66831A,0x256FD2A0,0x5268E236,0xCC0C7795,0xBB0B4703, - 0x220216B9,0x5505262F,0xC5BA3BBE,0xB2BD0B28,0x2BB45A92,0x5CB36A04,0xC2D7FFA7, - 0xB5D0CF31,0x2CD99E8B,0x5BDEAE1D,0x9B64C2B0,0xEC63F226,0x756AA39C,0x026D930A, - 0x9C0906A9,0xEB0E363F,0x72076785,0x05005713,0x95BF4A82,0xE2B87A14,0x7BB12BAE, - 0x0CB61B38,0x92D28E9B,0xE5D5BE0D,0x7CDCEFB7,0x0BDBDF21,0x86D3D2D4,0xF1D4E242, - 0x68DDB3F8,0x1FDA836E,0x81BE16CD,0xF6B9265B,0x6FB077E1,0x18B74777,0x88085AE6, - 0xFF0F6A70,0x66063BCA,0x11010B5C,0x8F659EFF,0xF862AE69,0x616BFFD3,0x166CCF45, - 0xA00AE278,0xD70DD2EE,0x4E048354,0x3903B3C2,0xA7672661,0xD06016F7,0x4969474D, - 0x3E6E77DB,0xAED16A4A,0xD9D65ADC,0x40DF0B66,0x37D83BF0,0xA9BCAE53,0xDEBB9EC5, - 0x47B2CF7F,0x30B5FFE9,0xBDBDF21C,0xCABAC28A,0x53B39330,0x24B4A3A6,0xBAD03605, - 0xCDD70693,0x54DE5729,0x23D967BF,0xB3667A2E,0xC4614AB8,0x5D681B02,0x2A6F2B94, - 0xB40BBE37,0xC30C8EA1,0x5A05DF1B,0x2D02EF8D - }; - - uint32_t crc = init ^ 0xFFFFFFFF; - - for (size_t i = 0; i < nb_buf; i++) { - crc = table[(crc ^ buf[i]) & 0xff] ^ (crc >> 8); - } - - return crc^0xFFFFFFFF; -} - uint32_t srs_crc32_mpegts(const void* buf, int size) { return __mpegts_crc32((const uint8_t*)buf, size); } +// @see golang IEEE of hash/crc32/crc32.go +// IEEE is by far and away the most common CRC-32 polynomial. +// Used by ethernet (IEEE 802.3), v.42, fddi, gzip, zip, png, ... +static uint32_t __crc32_IEEE = 0xedb88320; + +// @see golang IEEE of hash/crc32/crc32.go +// Castagnoli's polynomial, used in iSCSI. +// Has better error detection characteristics than IEEE. +// http://dx.doi.org/10.1109/26.231911 +//static uint32_t __crc32_Castagnoli = 0x82f63b78; + +// @see golang IEEE of hash/crc32/crc32.go +// Koopman's polynomial. +// Also has better error detection characteristics than IEEE. +// http://dx.doi.org/10.1109/DSN.2002.1028931 +//static uint32_t __crc32_Koopman = 0xeb31d82e; + +// @see golang makeTable of hash/crc32/crc32.go +void __crc32_make_table(uint32_t t[256], uint32_t poly) +{ + for (int i = 0; i < 256; i++) { + uint32_t crc = uint32_t(i); + + for (int j = 0; j < 8; j++) { + if ((crc&1) == 1) { + crc = (crc >> 1) ^ poly; + } else { + crc = crc >> 1; + } + } + + t[i] = crc; + } +} + +// @see golang update of hash/crc32/crc32.go +uint32_t __crc32_update(uint32_t crc, uint32_t t[256], const uint8_t* buf, int size) { + crc = crc ^ 0xffffffff; + + for (int i = 0; i < size; i++) { + uint8_t v = (uint8_t)buf[i]; + crc = t[uint8_t(crc) ^ v] ^ (crc >> 8); + } + + return crc ^ 0xffffffff; +} + +// @see golang IEEE of hash/crc32/crc32.go +// IEEETable is the table for the IEEE polynomial. +static uint32_t __crc32_IEEE_table[256]; +static bool __crc32_IEEE_table_initialized = false; + uint32_t srs_crc32_ieee(const void* buf, int size, uint32_t previous) { - return __crc32_ieee(previous, (const uint8_t*)buf, size); + if (!__crc32_IEEE_table_initialized) { + __crc32_make_table(__crc32_IEEE_table, __crc32_IEEE); + __crc32_IEEE_table_initialized = true; + } + return __crc32_update(previous, __crc32_IEEE_table, (uint8_t*)buf, size); } /* diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 194ff4ccb..6fd379695 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -1540,6 +1540,13 @@ VOID TEST(KernelUtility, CRC32IEEE) uint32_t checksum = checksums[i]; EXPECT_EQ(checksum, srs_crc32_ieee(data.data(), data.length(), 0)); } + + uint32_t previous = 0; + for (int i = 0; i < (int)(sizeof(datas)/sizeof(string)); i++) { + string data = datas[i]; + previous = srs_crc32_ieee(data.data(), data.length(), previous); + } + EXPECT_EQ((uint32_t)0x431b8785, previous); } #endif