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 4XXFb25xZfz5Z0QF; 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 4XXFb25RMjz4NRm; 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=VIdJ8NWKT1/MzzEUxrfj7F+AH/K7HbdovFdaKeSFvl4=; b=COs8PeQUnZBhWiYheNJZRkkXDpK5iAdmMzNrYJNNPa1b9xIY/15iKjju3l6bjq+85mcnDl 8ltIyrGgAKoIoXnPj6BgXFGntC/MZNUVJtBSggf0FohKkhls9Kq9/jO7krVsOjrEJuDVIk mBzTiA/tZbte6V7ApKMrLWQDfhJvUF8OZVw40QOCgse3Pp/VD97QEAb9OFd3pWK0aYCPR8 3TWXocR50seOk14noEU9IPAP6WDVloT9Arfins2vXU2dcQ6TtBolnrxFnU9TueSsZBqupW vEmBivFrKynK0QIWtDneByV9NTgFi9cWpGy/emJ/0qIn8NpLSH4fYa6DWOoxJA== 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=VIdJ8NWKT1/MzzEUxrfj7F+AH/K7HbdovFdaKeSFvl4=; b=l3gI3HfsGzpuJvg2Jo4J8m/gIoLDffmJq5/HFVhBTcrrQpT5AcwhmFegaJpwkZztPYbvxQ moRMpJj+Sw86y6Qkt4JNZMmMbhKJGotvdNWsm5gK95nKe2WLyTjfR52F496dvH963ebOLk Johq8p6JMK8UYNIZLcUyr4Axi7tdocNxRM81Ox6TEF0FjsRKqvT5ZZoJfg4kegMAsG9IyG yYtuGuIgV7v0GfDjFHSpqD5w9DyYHG1JJUUxZrppS6xrgbd6exhf6LCP7OMDKgDPMWb5UM D+Lv6j3fOeCxT+s8dX0lThQ0mpFTrio9uwQyXiS8bD+WXGoNwZA19DGdtmcx7w== 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=Wpd0Qny/mlQ/CYA4850x1KPWMebynUcCRCcJbI/LaBg3WAoSnhJqA1ifVw389HjZAVPQQi XHIASA7hivEYOqN9STk8eOeN7ZrxAdke9NbNrAg6+vPD96YZdzznKTcFBbzVWidnA/TM+1 6QdYhCXbA+V9QTsel0nq1RL5hW5XOEPdQCwQQWXHk9gt6vu+BWocdkKlw2VxSuahIDLcNJ nqsCWT8kf9t6cyfxjINJAB5yikci6to4h/xMwm0HBifQhMK/tXwO7Yk99iSYg1bY07/pr3 lKwNcJ60ZAmD57row+bIRAo5eghppAzDg7pAgArgwVZbAPkTCdXkJAMVcx3YQQ== 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 4XXFb251yBzWxp; 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 49LCqkIK003710; 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 49LCqklg003707; Mon, 21 Oct 2024 12:52:46 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:52:46 GMT Message-Id: <202410211252.49LCqklg003707@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: d261971e7d58 - stable/14 - ping tests: fix for scapy-2.6.0 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/14 X-Git-Reftype: branch X-Git-Commit: d261971e7d58dcdd28bb18fd768ff028d90a6b9a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d261971e7d58dcdd28bb18fd768ff028d90a6b9a commit d261971e7d58dcdd28bb18fd768ff028d90a6b9a Author: Kristof Provost AuthorDate: 2024-10-16 07:57:06 +0000 Commit: Kristof Provost CommitDate: 2024-10-21 12:51:36 +0000 ping tests: fix for scapy-2.6.0 Scapy 2.6.0 now appears to parse the IPOption during construction, and it then gets confused at a single-byte option. IP Options typically contain at least a 1 byte type and 1 byte length. Avoid this by just returning the raw bytes, rather than an IPOption object. MFC after: 1 week Reviewed by: Jose Luis Duran Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D47151 (cherry picked from commit 2926c2594249f64fecbbdcb0b0b9a3591931ab04) --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 3c66e6c54c4d..8ec0f3dc74dc 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -113,7 +113,7 @@ def generate_ip_options(opts): options = sc.IPOption_SSRR(length=3, routers=routers_zero) elif opts == "unk": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) - options = sc.IPOption(b"\x9f") + options = b"\x9f" elif opts == "unk-40": ToolsHelper.set_sysctl("net.inet.ip.process_options", 0) options = sc.IPOption(b"\x9f" * 40)