From nobody Mon Oct 14 15:55:09 2024 X-Original-To: dev-commits-src-all@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 4XS1yj2wHKz5YlMw; Mon, 14 Oct 2024 15:55:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XS1yj2Cqzz4TQy; Mon, 14 Oct 2024 15:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728921309; 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=3kKNpSnar2INFtgM/t/khDCxRXEv4Rx5M8L8g7xus60=; b=LRDGL+taydus+0DcyULmfYSbDmh0UeTSQ//r6y89pwAwTbimeqeN5UueVOkF41BZNEjVWO 4khiPQKo6v77wL79bM6yhCtdxXShzhUEE7+a3/9n9CPharlQMlMVbpfDZ2MZsZIgqADBiW uFZlRNzNZhrqgfuQOK693cQ1x3ap9+tIEQ/19ylVaQBD9Don7Yo9z6HPf947qizpCB0zGF jzaX79aYsyhRhX1/o+3w5+q5Gf5fLYWKVkR8vNeb9vi0KsmAkpmSxobs2cjv91Fzz9A8Su qSySLcbWH333fBI6i8rurZqew5oxp5ntagkDsB4IGAueEtO7vHnyM+HBQ7V7Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728921309; 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=3kKNpSnar2INFtgM/t/khDCxRXEv4Rx5M8L8g7xus60=; b=G+Jg8ed6efXgfnBo7mMNGXzK/M1QXDEEwSZmRPYiqC/1KXnkK8MGRpdVHZxj7kLPt0BnLl dFTgJAX6JKuKEFuZW8P7BOVzcyboG4wsTexgsqMyQS3KPnozv5lfiqzZdzXKt+QDBD1HS5 +dZTnYQacXGimi8JBSqvrLuj8R3RqrAbfaLv/W58hOXYlrmJXW9th7emAh9wBSGaxJJ6Yn WOtkXVYXfRPYblUAkYey4KJ/QPDxpQsdZhds3Ap/SqrU8x8tcbPxywTJcM7WlC3hPw+sqO q56WDti2c7NoGXXwOZVdKZy7xsEslPnv5lBK9YEB1L1m0Cb3YPS2AByZxU2c4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728921309; a=rsa-sha256; cv=none; b=wNaW76TcSqF2iICfq8iblkzwf5wS1Un4P5ovNlXUmMA/J45lBrN7VqiZKFOCd3/T/tywNJ PGoLj6GNVsgFXV0pP/XiWntiH6ZdGzI943tvI1UF3LUgTwz2c561L3UNjjmuJaOWLgZ25d 36EgMMkEx5HwtWs0I1K3fXq/QNuLC/deOQH9vBDRjA5o1eu64wkFY+5x8jO4gxQcgmBJhp ZuhN/HAcNaUbsNX2p7NnQEI0t+3GkKUsQJe4cecBSIIDRQh2DVwVejkORM5clyF+clX2aE r/2cATYthDPuInZR6q/20SOkoC+Mpw6X11chFQLecXxcJovAKZZkBpzR81IhCQ== 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 4XS1yj1q8Lzks4; Mon, 14 Oct 2024 15:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49EFt9ZV028826; Mon, 14 Oct 2024 15:55:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EFt9tB028823; Mon, 14 Oct 2024 15:55:09 GMT (envelope-from git) Date: Mon, 14 Oct 2024 15:55:09 GMT Message-Id: <202410141555.49EFt9tB028823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6b8096fa5f6f - main - netpfil tests: skip checksum verification in pft_ping.py List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b8096fa5f6f81e2959cbb2ca857c4e134273da2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8096fa5f6f81e2959cbb2ca857c4e134273da2 commit 6b8096fa5f6f81e2959cbb2ca857c4e134273da2 Author: Kristof Provost AuthorDate: 2024-10-14 12:57:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-14 15:54:49 +0000 netpfil tests: skip checksum verification in pft_ping.py From scapy 2.6.0 it now removes (sets to None) the IP checksum in its defrag code. We typically ask for IPv4 or IPv6 defragmentation, which causes check function failures. Just skip the checksum verificiation here, because we're going to notice incorrect checksums even if the tests don't directly verify it. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/pft_ping.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index 1caa26abe5f6..0d1134a22dda 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -205,12 +205,6 @@ def check_ipv4(expect_params, packet): if dst_address and ip.dst != dst_address: LOGGER.debug(f'Wrong IPv4 destination {ip.dst}, expected {dst_address}') return False - chksum = ip.chksum - ip.chksum = None - new_chksum = sp.IP(sp.raw(ip)).chksum - if chksum != new_chksum: - LOGGER.debug(f'Wrong IPv4 checksum {chksum}, expected {new_chksum}') - return False if flags and ip.flags != flags: LOGGER.debug(f'Wrong IP flags value {ip.flags}, expected {flags}') return False