From nobody Mon Oct 21 12:52:45 2024 X-Original-To: dev-commits-src-branches@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 4XXFb14yT2z5Z0fv; Mon, 21 Oct 2024 12:52:45 +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 4XXFb14RgLz4NM5; Mon, 21 Oct 2024 12:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515165; 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=U+oMUC4NQeH0nb7/3XVQ9uVCH4TYvoFL+umCCC2/42I=; b=ccePvzhEzFHguKBflBVq67PBj8fgbR4FDqWc72rYrr/UjBrw7PN+5aJMyTiXdFFJfG6d3d cLytEBd79CtzZFU3h7M4FHVboaV+HM32fcgMclK1QrHCAY+2/dVtzygcDMDyIqkh+eO0+o vT8KFdHzuUsJyy6leyvTM05i0m+oo64rQ4kgHDLS8ASR1GH4X2feI6E8hmS0wQIYrdaGJ0 RYS+8qtEmnj+cHojcfKAEMPjkrSUqloVqqr6ThMwXMzrbX5EzmYIopT+WdcY9RP3yyWYzT 1vhvPQ/EnebuqMKrNhMrLFN/gAPsBwRhKhyem8j2T++SENdmp01gJo0KcmEJ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515165; 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=U+oMUC4NQeH0nb7/3XVQ9uVCH4TYvoFL+umCCC2/42I=; b=MSH+3kaGK53C9L2YtqUGlTqZ47UEDwLgG7FFNBXO+1GcTU0hQVXyWejo7YbXC+XFKHEBnd wWk1jqdnB1FNeWYZBGKAVvI7/v55xla2cPy1g8oFjoUH7FTtu/L0PnHjCOgrY+GUPgPcO7 0eyqCIAf+BHbEMoPnGEBfOw1mxETZVAuK7YlirYsi9B/IUGQiTVl/EE8GFcm2ldOMFwz5N vdA5DMH841ZYC5kLu5FCtW4iZZv7vog+4E3bUjA+JQyt55THGC7K/AXdRmtExRXLSsGb0n v6N6H/yboNgfWS+YxI/go24voPdlOXQd/VZHje2cktq9FTPJtLxMLAtbXMMrYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515165; a=rsa-sha256; cv=none; b=A2RT66URH8XVQHsog2W65F5YKYA85Trqu8QgoYUsRS+u4kDQvK8G8P/mLY0PWa9jPp0pYa 8Ishb5pKrJD9cMuJfvEAFTu0YBdRvM9wYXGfs8RiJSTQJygdhdOIlOBugSGjVZIV4JDmK6 r6XLKJ0EMr1/ipGmsw/Uidp6FeEuqhub7QJeQI9KlwDlsrPjB9J5Ps5OHevpCMskcpkqKM 2tIFEN1k7ayYnDoH4sO6qPBzXKnr2GK2l8bevpJR3uvPnGqj4lS+9FMUfSlopSlm4LXckd gAOHxbpaBLSQre2kxqzQXefrF8ii1gF2Z0kvJplIqSroRJVK/fJ3Q1VLwMjcxA== 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 4XXFb1439LzXB9; Mon, 21 Oct 2024 12:52:45 +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 49LCqjac003560; Mon, 21 Oct 2024 12:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqjpQ003557; Mon, 21 Oct 2024 12:52:45 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:45 GMT Message-Id: <202410211252.49LCqjpQ003557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f3586d26936c - stable/14 - netpfil tests: skip checksum verification in pft_ping.py List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f3586d26936cbcc5bc13c2c74c9224532e896d13 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f3586d26936cbcc5bc13c2c74c9224532e896d13 commit f3586d26936cbcc5bc13c2c74c9224532e896d13 Author: Kristof Provost AuthorDate: 2024-10-14 12:57:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 12:51:36 +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") (cherry picked from commit 6b8096fa5f6f81e2959cbb2ca857c4e134273da2) --- 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 1abf4f609832..216db4ea6bfd 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -149,12 +149,6 @@ def check_ipv4(expect_params, packet): if dst_address and ip.dst != dst_address: LOGGER.debug('Destination IPv4 address does not match!') return False - chksum = ip.chksum - ip.chksum = None - new_chksum = sp.IP(sp.raw(ip)).chksum - if chksum != new_chksum: - LOGGER.debug(f'Expected IP checksum {new_chksum} but found {chksum}') - return False if flags and ip.flags != flags: LOGGER.debug(f'Wrong IP flags value {ip.flags}, expected {flags}') return False