From nobody Thu Nov 14 03:25:05 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 4Xplrx5lbZz5d13x; Thu, 14 Nov 2024 03:25:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xplrx4cYXz4Gcq; Thu, 14 Nov 2024 03:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731554705; 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=j8z3z3BpdxOf2wynPOBZAHitYqpxAIkcVIyBWa/jOzY=; b=Dm5Eh4sytuG534wyILRxW8J9ddkMOAPOxGWp9j3LW9biXpJ0DG956n0NYAGKKRdWGYRQnU TZcFAc9mFUWD0LF0cysUbesnkrQf3D0Fz1R6+m7iZYOnykJ7WDgVRhrWJ02t/RewpaO0PZ 6JcIbBe9L8UJUwSxTRTo01JQWzDoTbnCQY8IDgNmNl3sg/a8GEY1eqZUu498NLZBtqj9TT bSarLCNrEo6DeC3qoUdT4rY7Wqh1LSw+k6qzLxE2ff/MfgNEUQA+fqbRtqr9B4cbQ4iAwj totbf16uNFi2+Omlh0gE6ZAUj5/yHzb1M8nMxPqMRyDz3YifcjHph5DwsOQnoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731554705; 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=j8z3z3BpdxOf2wynPOBZAHitYqpxAIkcVIyBWa/jOzY=; b=adfPWsMqv4TBGXAsOcR6esRa24AG005Lli3X6AVN5Xy+FZTo/154flXNUEOtZnzXoEnyJu p7FgUvTyS4Ih/NtPpjk6w9L6e1Zng4DDyBO/+UZMr1hguA2fZZLnCBuCy9ZJ3XsNpskXE8 tofYkv+y08w1uIcKIFymRjXRc2cBJVtk1mdrNXItpd5FZkloQk7VWCnf9H6q1Jmox0+C4o cyuUQc7W65bLhpmhtpCxiAzGHlNMmFkRe2uagPrqOht5siQUkWX96Y27km2x10JbfiZkFM YTrxC6duwcmML3Zdzqk9GJtVUuKavfq2yFVKNMJGjLqbGWkQzFSotLQ0yj35kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731554705; a=rsa-sha256; cv=none; b=oC37H7d0z+Svb1SVXhpIYk2yuVoggWjNYkQZVkbonDgW1VWDKFjDpbZs4aGdlvj3n+SJl2 ERkF7W+XfR67Uzs+aBEjJZlF8wQM8OWnaKM5amEiaqC2zQS8xpSE8jKWVOHQzXED4f+yt2 WpTWgDzfhcVbCjZLe9sbDeIxWBDHD1gOrsDsHEhXHEf5Pn9VskMdTRZos1esYN60sIUdAR cPRNLHQAMflJdswo9MpghnL4v0D5dwj9e8J1rlzUe4oeXb8HQZQtQiQDV7UII9pdOXb+1w J4IxzQOG3g3qXZNmAI5JWQzpd/0IFbsJK+YAi5sV0bV8ZYUBPZlT5HKfrqxKfw== 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 4Xplrx4DvNzMYK; Thu, 14 Nov 2024 03:25:05 +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 4AE3P5Li024852; Thu, 14 Nov 2024 03:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AE3P5BS024849; Thu, 14 Nov 2024 03:25:05 GMT (envelope-from git) Date: Thu, 14 Nov 2024 03:25:05 GMT Message-Id: <202411140325.4AE3P5BS024849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 797884a5d990 - stable/14 - ping: tests: Cleanup IPOption()s 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 797884a5d9900ae66d31112274bc1fdb3f4d9e9e Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=797884a5d9900ae66d31112274bc1fdb3f4d9e9e commit 797884a5d9900ae66d31112274bc1fdb3f4d9e9e Author: Jose Luis Duran AuthorDate: 2024-11-05 02:46:45 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-14 03:22:40 +0000 ping: tests: Cleanup IPOption()s Scapy now only accepts known options with IPOption(), so our unknown option must be passed raw. While here, prefer the named options for EOL and NOP. Reviewed by: emaste, kp Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D47160 (cherry picked from commit 2e29bf7a2ae66acb6e65ffc1c923cfb373af67bd) --- sbin/ping/tests/test_ping.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 8ec0f3dc74dc..90df07d0e5b9 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -85,11 +85,11 @@ def generate_ip_options(opts): ] routers_zero = [0, 0, 0, 0, 0, 0, 0, 0, 0] if opts == "EOL": - options = sc.IPOption(b"\x00") + options = sc.IPOption_EOL() elif opts == "NOP": - options = sc.IPOption(b"\x01") + options = sc.IPOption_NOP() elif opts == "NOP-40": - options = sc.IPOption(b"\x01" * 40) + options = sc.IPOption_NOP() * 40 elif opts == "RR": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) options = sc.IPOption_RR(pointer=40, routers=routers) @@ -116,7 +116,7 @@ def generate_ip_options(opts): options = b"\x9f" elif opts == "unk-40": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) - options = sc.IPOption(b"\x9f" * 40) + options = b"\x9f" * 40 else: options = "" return options