From nobody Mon Oct 21 12:52:46 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 4XXFb23LzKz5Z0jg; Mon, 21 Oct 2024 12:52:46 +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 4XXFb22qdVz4N2k; Mon, 21 Oct 2024 12:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; 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=QP5niHvf6yFZXFw2B7RQK5W3BXC5iLY8H2czNBbgQ0o=; b=wSQZAizvw+tZ/L6dNihu9lKoJcncWy2R+L2WrBT1lZ14xuc2zc+cPlhE68QW1NwsTGv8ec c626NEV+Xgy/EXfg2id1BufTWjRXXoEhM67HErQCP4bTkdzuJVrS/NATlfu5G2czw0kDzo ZU0W2qpKLQlBVAuE64X2T3CkHnWXSDH9ZTOatUWYEKq7LSRnyGKbR5z3vkrUDadRpP5+ew QVeBcsCgqgZGtDmUA5YrMVu7TvcFkStv+m9OY6QMcHPhYd559S5/Z0qw0RJgM9A53C/ma1 HnXOrt9FsP32/qw+zaxzW8dkwJ51lyZ5ohap/3uYugqxP8fSaKnfqQnOhN8V6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729515166; 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=QP5niHvf6yFZXFw2B7RQK5W3BXC5iLY8H2czNBbgQ0o=; b=Hd4fOuWqZn2302q0U98VEBYRoNTww76NhPPPh96g/iF8kdo6wQB/ZYSS+og7RGvLJVoog3 0yFfqN3tFfA0srIrY9WB5EVVaGcy8fhecfEtK0unrj00d1IU7+VsqeZ7oD6aDDjckrk3kH /DE+FzBYocqf1BMEirJAqIcQ1MF7Qjtd3pXro+nTcePRtXPkDgVbi8bCCKVkcFCwx+e2gf mKCpU278O491K2R0qanqwWP+E2u6C7Ghr7RjWZ5ehs5PotskZIYYuoi7yqe2jFCLT8fjF8 qchcOdCXBMicXSE3KoUS2ClK7oPHnzvrZMIvluiOzkqS0G8vJz5/qRSN1RXAPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729515166; a=rsa-sha256; cv=none; b=FY1YXyYBLchtXWX+0VU9YlJTn624K4AGKhYMMRvBDII6/EpL+2LTRs/bg/B2CS/LZBb6A0 uMJIghcBoZQcdBMUXlyHsRbijiKea945/KXj0w9rczwQpeRfdUpET3B3P7HzLaJG1QG3EV EBO3AEixBzFRXEAc7YwWN79XS9wv0t2BCUISgbfKPoLHzTYznEO3pkJTuz/4G+2Umw4R2b ZUSbEe5+PDGCAQRFgNCf89SlJ0fGuunY55Yq/O6YAg/mKYulm8pwm5XbTx+mkdLfBw8C3U ulIOktXTlVTLRL/SrzTyStOKdTojTHNlcEgeIKHdf5B/I1p7Y2HV8Xjl3E26TA== 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 4XXFb22R7MzX0b; Mon, 21 Oct 2024 12:52:46 +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 49LCqkvB003668; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCqkAU003665; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:46 GMT Message-Id: <202410211252.49LCqkAU003665@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: 48a202f5b219 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 48a202f5b2190f89c4a755c36155a054b721a19e Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=48a202f5b2190f89c4a755c36155a054b721a19e commit 48a202f5b2190f89c4a755c36155a054b721a19e Author: Kristof Provost AuthorDate: 2024-10-14 12:57:49 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 07:34:13 +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 380b92a662c7..9f5aae08888e 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -137,12 +137,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