From nobody Tue Feb 20 18:33:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TfShh6r7Cz55NNc; Tue, 20 Feb 2024 18:33:24 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfShh5MPYz4QbS; Tue, 20 Feb 2024 18:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZkptD7moyXiSnNU2Ox9xPmSMuWKM2VmQRqf/UhtdZg=; b=npLPk+PCu4kYY1g4A8Iv7LJPZceK87W9C4RgqlNObe/GYXTPmmn+XW3Gm987qDBdCDWmkB GD5UbOG8Y6gNiE3CTqfyEWq/pKnfEWnQerdjEE3BudOK5wc77xipFjyuj4cmKWBKnOASFj 5PweOP9RxNyVFZ3i9+P4Iw2BaKN2zQ8jgBDK+wC/yT80GFckiV7Go6HlPlODZi1m8xXrCb rdU4HRmFQHg0JsXMd/MdLEHooc/sssvxxzcLStl/JlgKRMzkAV8kKsmX7Ei6v3tM21PAS2 Y4BlAcz9EeD2rf4QDkA21FTdXdVUWNjSadldcsWph26uGn/WN2D7tZLa5ox+2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZkptD7moyXiSnNU2Ox9xPmSMuWKM2VmQRqf/UhtdZg=; b=wPSUKqZ83uK1FlksHR2hymc9qiBH7WKTxXTTuZulWxV0AuCxLfa3rfak1o+No16VO1jZj8 yVpfO9+nhhkPcQrJ18E1uYdI+JU0lExouTFOD65gOcJdYQUBmweH/3SCl5L8m6AjxgJTz0 Ja7COI8Bhn5UKn2PmsV0TvLTb4dysqqaMUy0c4cBDz3qffimpvStOIEqERb7jAmP1nh7Od wJGvMsAjBgdCSDQ+/+py9v+W8RxCxWEz2GJMixFAsI9UZCWfWiySYPd00rONCk4QIiMtFK 5wTdl2zp8EKXv12FgAZPAT3auKpke1vpIcgUiVbRIM6z981VENyrADjUEHJfXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708454004; a=rsa-sha256; cv=none; b=AO4ZXjXLh8lExwem3Elob7qHL9hRZuhzk+Jwdk/Aksd5+SbVMJalj/YZkb3Ez7N/6wsP+z HUlgaYXUKJ5f0FOIM2vogApNa6aNKTRUi6jKDDCatSotGhP4mwmADGwW1YzB2N2kW7mKWI nSth7mOW5sZyLxwpAfhzym+jgc1qu9V61nhr6OG+o2IY9INbpKdHd/avnPx4m3h5NzlfsS ad20sQ2XFEDDM9IWNnXo8JkzpGo3p1oogXceyzQwKRRszXwAmsA5j5/4QN+ddjUL2v8SCC dvtlMCan0jXnGQ377ieKygqpe0N2Km3RcjFzCHH3n78TwBsqqP8uzA14AeQPgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TfShh4L7XzVWH; Tue, 20 Feb 2024 18:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KIXOnY008822; Tue, 20 Feb 2024 18:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KIXOLh008819; Tue, 20 Feb 2024 18:33:24 GMT (envelope-from git) Date: Tue, 20 Feb 2024 18:33:24 GMT Message-Id: <202402201833.41KIXOLh008819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1968d71647ba - main - tests/arp: test arp -s/-S work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1968d71647ba0189c1102e54959b7074160ad437 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1968d71647ba0189c1102e54959b7074160ad437 commit 1968d71647ba0189c1102e54959b7074160ad437 Author: Gleb Smirnoff AuthorDate: 2024-02-20 18:32:03 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 18:32:03 +0000 tests/arp: test arp -s/-S work Install permanent entry, try to modify it, check that net.link.ether.inet.log_arp_permanent_modify works. --- tests/sys/netinet/arp.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/sys/netinet/arp.sh b/tests/sys/netinet/arp.sh index f13ba467a2d9..34946d42f250 100755 --- a/tests/sys/netinet/arp.sh +++ b/tests/sys/netinet/arp.sh @@ -169,6 +169,67 @@ arp_lookup_host_cleanup() { } +atf_test_case "static" "cleanup" +static_head() { + atf_set descr 'Test arp -s/-S works' + atf_set require.user root +} + +static_body() { + + vnet_init + + jname="v4t-arp_static_host" + + epair0=$(vnet_mkepair) + + vnet_mkjail ${jname}a ${epair0}a + vnet_mkjail ${jname}b ${epair0}b + + ipa=198.51.100.1 + ipb=198.51.100.2 + max_age=$(sysctl -n net.link.ether.inet.max_age) + + atf_check ifconfig -j ${jname}a ${epair0}a inet ${ipa}/24 + eth="$(ifconfig -j ${jname}b ${epair0}b | + sed -nE "s/^\tether ([0-9a-f:]*)$/\1/p")" + + # Expected outputs + permanent=\ +"? (${ipb}) at 00:00:00:00:00:00 on ${epair0}a permanent [ethernet]\n" + temporary=\ +"? (${ipb}) at ${eth} on ${epair0}a expires in ${max_age} seconds [ethernet]\n" + deleted=\ +"${ipb} (${ipb}) deleted\n" + + # first check -s + atf_check jexec ${jname}a arp -s ${ipb} 0:0:0:0:0:0 + # the jail B ifconfig will send gratuitous ARP that will trigger A + atf_check ifconfig -j ${jname}b ${epair0}b inet ${ipb}/24 + atf_check -o "inline:${permanent}" jexec ${jname}a arp -n ${ipb} + if [ $(sysctl -n net.link.ether.inet.log_arp_permanent_modify) -ne 0 ]; + then + msg=$(dmesg | tail -n 1) + atf_check_equal "${msg}" \ +"arp: ${eth} attempts to modify permanent entry for ${ipb} on ${epair0}a" + fi + + # then check -S + atf_check -o "inline:${deleted}" jexec ${jname}a arp -nd ${ipb} + atf_check -o ignore jexec ${jname}b ping -c1 ${ipa} + atf_check -o "inline:${temporary}" jexec ${jname}a arp -n ${ipb} + # Note: this doesn't fail, tracked all the way down to FreeBSD 8 + # atf_check -s not-exit:0 jexec ${jname}a arp -s ${ipb} 0:0:0:0:0:0 + atf_check -o "inline:${deleted}" \ + jexec ${jname}a arp -S ${ipb} 0:0:0:0:0:0 + atf_check -o "inline:${permanent}" jexec ${jname}a arp -n ${ipb} +} + +static_cleanup() { + vnet_cleanup +} + + atf_init_test_cases() { @@ -176,6 +237,7 @@ atf_init_test_cases() atf_add_test_case "arp_del_success" atf_add_test_case "pending_delete_if" atf_add_test_case "arp_lookup_host" + atf_add_test_case "static" } # end