Date: Mon, 5 Aug 2013 12:05:42 GMT From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r255533 - in soc2013/dpl/head/lib/libzcap: . zlibworker Message-ID: <201308051205.r75C5gSi068029@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dpl Date: Mon Aug 5 12:05:42 2013 New Revision: 255533 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255533 Log: Completed support for checksum functions. Modified: soc2013/dpl/head/lib/libzcap/commands.c soc2013/dpl/head/lib/libzcap/zlibworker/comands.c soc2013/dpl/head/lib/libzcap/zlibworker/zlibworker.c Modified: soc2013/dpl/head/lib/libzcap/commands.c ============================================================================== --- soc2013/dpl/head/lib/libzcap/commands.c Mon Aug 5 11:56:47 2013 (r255532) +++ soc2013/dpl/head/lib/libzcap/commands.c Mon Aug 5 12:05:42 2013 (r255533) @@ -56,7 +56,7 @@ perror("nvlist_create"); return (NULL); } - nvlist_add_number(nvl, "command", ZCAPCMD_ADLER32_COMBINE); + nvlist_add_number(nvl, "command", ZCAPCMD_COMPRESSBOUND); nvlist_add_number(args, "adler2", adler2); nvlist_add_number(args, "adler2", adler2); nvlist_add_number(args, "len2", len2); @@ -129,7 +129,7 @@ } uLong -zcapcmd_crcr32(crc, buf, len) +zcapcmd_crc32(crc, buf, len) uLong crc; const Bytef *buf; uInt len; @@ -144,7 +144,7 @@ perror("nvlist_create"); return (NULL); } - nvlist_add_number(nvl, "command", ZCAPCMD_ADLER32); + nvlist_add_number(nvl, "command", ZCAPCMD_CRC32); nvlist_add_number(args, "crc", crc); nvlist_add_binary(args, "buf", *buf, len); nvlist_add_number(args, "len", len); Modified: soc2013/dpl/head/lib/libzcap/zlibworker/comands.c ============================================================================== --- soc2013/dpl/head/lib/libzcap/zlibworker/comands.c Mon Aug 5 11:56:47 2013 (r255532) +++ soc2013/dpl/head/lib/libzcap/zlibworker/comands.c Mon Aug 5 12:05:42 2013 (r255533) @@ -19,6 +19,22 @@ } void +zcapcmd_adler32(nvlist_t * nvl, nvlist_t * result) +{ + uLong ret = 0; + if ((args = nvlist_take_nvlist(nvl, "args")) == NULL) + ret = -1; + + uLong adler1 = nvlist_take_number(args, "adler"); + size_t len = nvlist_take_number(args, "len"); + Bytef buf = nvlist_take_binary(args, "buf", &len); + + if (ret != -1) + ret = adler32_combine(adler, &buf, len2); + nvlist_add_number(result, "result", ret ); +} + +void zcapcmd_adler32_combine(nvlist_t * nvl, nvlist_t * result) { uLong ret = 0; @@ -35,6 +51,22 @@ } void +zcapcmd_crc32(nvlist_t * nvl, nvlist_t * result) +{ + uLong ret = 0; + if ((args = nvlist_take_nvlist(nvl, "args")) == NULL) + ret = -1; + + uLong adler1 = nvlist_take_number(args, "adler"); + size_t len = nvlist_take_number(args, "len"); + Bytef buf = nvlist_take_binary(args, "buf", &len); + + if (ret != -1) + ret = adler32_combine(adler, &buf, len2); + nvlist_add_number(result, "result", ret ); +} + +void zcapcmd_crc32_combine(nvlist_t * nvl, nvlist_t * result) { uLong ret = 0; Modified: soc2013/dpl/head/lib/libzcap/zlibworker/zlibworker.c ============================================================================== --- soc2013/dpl/head/lib/libzcap/zlibworker/zlibworker.c Mon Aug 5 11:56:47 2013 (r255532) +++ soc2013/dpl/head/lib/libzcap/zlibworker/zlibworker.c Mon Aug 5 12:05:42 2013 (r255533) @@ -31,9 +31,15 @@ case (ZCAPCMD_COMPRESSBOUND): zcapcmd_adler32_combine(nvl, result); break; + case (ZCAPCMD_ADLER32): + zcapcmd_adler32(nvl, result); + break; case (ZCAPCMD_ADLER32_COMBINE): zcapcmd_compressBound(nvl, result); break; + case (ZCAPCMD_CRC32): + zcapcmd_crc32(nvl, result); + break; case (ZCAPCMD_CRC32_COMBINE): zcapcmd_crc32_combine(nvl, result); break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308051205.r75C5gSi068029>