From owner-svn-src-head@freebsd.org Tue Aug 20 21:59:50 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05EF3E25A1; Tue, 20 Aug 2019 21:59:50 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Cl856Nsvz48PZ; Tue, 20 Aug 2019 21:59:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCEFB9B5F; Tue, 20 Aug 2019 21:59:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7KLxnv9019026; Tue, 20 Aug 2019 21:59:49 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7KLxmH4019020; Tue, 20 Aug 2019 21:59:48 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201908202159.x7KLxmH4019020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 20 Aug 2019 21:59:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351318 - in head: etc/mtree sbin/ping sbin/ping/tests X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head: etc/mtree sbin/ping sbin/ping/tests X-SVN-Commit-Revision: 351318 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2019 21:59:50 -0000 Author: asomers Date: Tue Aug 20 21:59:48 2019 New Revision: 351318 URL: https://svnweb.freebsd.org/changeset/base/351318 Log: ping: Add tests of the Internet checksum function Submitted by: Ján Sučan MFC after: 2 weeks Sponsored by: Google LLC (Google Summer of Code 2019) Differential Revision: https://reviews.freebsd.org/D21340 Added: head/sbin/ping/tests/ head/sbin/ping/tests/Makefile (contents, props changed) head/sbin/ping/tests/in_cksum_test.c (contents, props changed) Modified: head/etc/mtree/BSD.tests.dist head/sbin/ping/Makefile Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Tue Aug 20 21:43:13 2019 (r351317) +++ head/etc/mtree/BSD.tests.dist Tue Aug 20 21:59:48 2019 (r351318) @@ -440,6 +440,8 @@ files .. .. + ping + .. .. secure lib Modified: head/sbin/ping/Makefile ============================================================================== --- head/sbin/ping/Makefile Tue Aug 20 21:43:13 2019 (r351317) +++ head/sbin/ping/Makefile Tue Aug 20 21:59:48 2019 (r351318) @@ -23,4 +23,7 @@ CFLAGS+=-DWITH_CASPER CFLAGS+=-DIPSEC LIBADD+= ipsec +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Added: head/sbin/ping/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ping/tests/Makefile Tue Aug 20 21:59:48 2019 (r351318) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +WARNS?= 6 + +ATF_TESTS_C+= in_cksum_test +SRCS.in_cksum_test= in_cksum_test.c ../utils.c + +.include Added: head/sbin/ping/tests/in_cksum_test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ping/tests/in_cksum_test.c Tue Aug 20 21:59:48 2019 (r351318) @@ -0,0 +1,146 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2019 Jan Sucan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include + +#include "../utils.h" + +/* + * Test cases. + */ + +ATF_TC_WITHOUT_HEAD(aligned_even_length_big_endian); +ATF_TC_BODY(aligned_even_length_big_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x12, 0x34, 0x56, 0x78}; + u_short sum; + + sum = in_cksum(data, nitems(data)); + ATF_REQUIRE(sum == 0x5397); +} + +ATF_TC_WITHOUT_HEAD(aligned_odd_length_big_endian); +ATF_TC_BODY(aligned_odd_length_big_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x12, 0x34, 0x56, 0x78, 0x9a}; + u_short sum; + + sum = in_cksum(data, nitems(data)); + ATF_REQUIRE(sum == 0x52fd); +} + +ATF_TC_WITHOUT_HEAD(aligned_even_length_little_endian); +ATF_TC_BODY(aligned_even_length_little_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x34, 0x12, 0x78, 0x56}; + u_short sum; + + sum = in_cksum(data, nitems(data)); + ATF_REQUIRE_MSG(sum == 0x9753, "%d", sum); +} + +ATF_TC_WITHOUT_HEAD(aligned_odd_length_little_endian); +ATF_TC_BODY(aligned_odd_length_little_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x34, 0x12, 0x78, 0x56, 0x00, 0x9a}; + u_short sum; + + sum = in_cksum(data, nitems(data)); + ATF_REQUIRE(sum == 0xfd52); +} + +ATF_TC_WITHOUT_HEAD(unaligned_even_length_big_endian); +ATF_TC_BODY(unaligned_even_length_big_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x00, 0x12, 0x34, 0x56, 0x78}; + u_short sum; + + sum = in_cksum(data + 1, nitems(data) - 1); + ATF_REQUIRE(sum == 0x5397); +} + +ATF_TC_WITHOUT_HEAD(unaligned_odd_length_big_endian); +ATF_TC_BODY(unaligned_odd_length_big_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x00, 0x12, 0x34, 0x56, 0x78, 0x9a}; + u_short sum; + + sum = in_cksum(data + 1, nitems(data) - 1); + ATF_REQUIRE(sum == 0x52fd); +} + +ATF_TC_WITHOUT_HEAD(unaligned_even_length_little_endian); +ATF_TC_BODY(unaligned_even_length_little_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x00, 0x34, 0x12, 0x78, 0x56}; + u_short sum; + + sum = in_cksum(data + 1, nitems(data) - 1); + ATF_REQUIRE_MSG(sum == 0x9753, "%d", sum); +} + +ATF_TC_WITHOUT_HEAD(unaligned_odd_length_little_endian); +ATF_TC_BODY(unaligned_odd_length_little_endian, tc) +{ + u_char data[] __aligned(sizeof(u_short)) = + {0x00, 0x34, 0x12, 0x78, 0x56, 0x00, 0x9a}; + u_short sum; + + sum = in_cksum(data + 1, nitems(data) - 1); + ATF_REQUIRE(sum == 0xfd52); +} + +/* + * Main. + */ + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, aligned_even_length_big_endian); + ATF_TP_ADD_TC(tp, aligned_odd_length_big_endian); + ATF_TP_ADD_TC(tp, aligned_even_length_little_endian); + ATF_TP_ADD_TC(tp, aligned_odd_length_little_endian); + ATF_TP_ADD_TC(tp, unaligned_even_length_big_endian); + ATF_TP_ADD_TC(tp, unaligned_odd_length_big_endian); + ATF_TP_ADD_TC(tp, unaligned_even_length_little_endian); + ATF_TP_ADD_TC(tp, unaligned_odd_length_little_endian); + + return (atf_no_error()); +}