From nobody Wed Oct 16 15:31:34 2024
X-Original-To: dev-commits-src-main@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 4XTFLZ3j4pz5Yf8y;
Wed, 16 Oct 2024 15:31:34 +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 4XTFLZ1jvpz4bGv;
Wed, 16 Oct 2024 15:31:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1729092694;
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=DMimX+Z8V5GGA8gPDKInoJ6y4Psc8iqCBSgSveRX92k=;
b=vKBVJdU5JehAiNja9Q8wex4BKRstV8YJe16miLctHi4Ke6FXazy8K0LMArEWxiL50m+lE1
a7+ErHY6IsmydayHG5+imCz5Bsdb4ibsoP2Afw01je7w1FIt20pVUOfhq9FmOOfwQjSxP2
gpJB39KghX6ufCVQGGVElvKMMj78VpUbsGU00JIWVzBnxc4zyDgmU1+MpLX4Wvn+J+w543
4GHzozc519HlhZEhQchaq2M8EgUGdnTz7CRzrHb6Rsy2PlibV1g0CCfDs/hsjDWSAZBI2d
NL/gSVXKUmKNNSkL3IoApRgH1iIORPgF8pFeM3nhWkR+iCzHUFQdXHbhRqlcIA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1729092694;
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=DMimX+Z8V5GGA8gPDKInoJ6y4Psc8iqCBSgSveRX92k=;
b=wlEUzZHnn+iB0liEN/OWtKHBfuW0V7Vf8GnuFlELweCFezIGzkRkhprHL2khAEpO1Ec3Qp
TXi5OgjDu7qPQ+5enyVbSMzCOzGQ5/c1caygWVAwjmvgqc5ipYXEOcncaWQTJr22IteSeK
T8cI9ukpPwDTQQoSm8u+dhVnjB7adXaneOGbYkXpCCcYFup4kWelMi/H8HxbbnavPucuaG
SoiaRnHXyXMvbAwqvMMQWCzWEzCF3834dJN/J0vbSBWNKwUJt0+sz/lb1w8cnPksbHZ7oL
xbfEMl6TxB84EKdsvXfFZm1mmfAp/LHyeEbn8mmwU96Qw7c7hb8QSJXyInepfw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729092694; a=rsa-sha256; cv=none;
b=G99YrO3rwXP6DzdjS6K/fO757wHrjpJ0cMuWCNaX65uhbNqjzo/+JEpOlM5hymXFsMs3dO
kHGerTW1OQJRJG6Zr6IWloM0YUjvbnEBBX1l0QVx7cej6VEN+nLo4HcyGXVpF6KwmPJPtq
lP0DQiv4Aykdn3qJ2Fi6/g3hvCT1a0X9sb4ImskzlVux5+FmErbOcjFJS3J8d9sSeVqPoS
34ahLbrKtn7lCMyjKss2TwIEG+oDwu8fFN6jRc82s+hgWENogTwCeTIv0TrgqntaMsDLlk
01Vi3WCf6HaV0/vQ3QdEGlQQaclVbBFpii7Atihl8QkJL3ZlOvheUk3pHZFm6w==
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 4XTFLZ1Jysz19tC;
Wed, 16 Oct 2024 15:31:34 +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 49GFVYVk086860;
Wed, 16 Oct 2024 15:31:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49GFVYEO086857;
Wed, 16 Oct 2024 15:31:34 GMT
(envelope-from git)
Date: Wed, 16 Oct 2024 15:31:34 GMT
Message-Id: <202410161531.49GFVYEO086857@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 2926c2594249 - main - ping tests: fix for scapy-2.6.0
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@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: 2926c2594249f64fecbbdcb0b0b9a3591931ab04
Auto-Submitted: auto-generated
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=2926c2594249f64fecbbdcb0b0b9a3591931ab04
commit 2926c2594249f64fecbbdcb0b0b9a3591931ab04
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-10-16 07:57:06 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2024-10-16 15:25:57 +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 <jlduran@gmail.com>
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D47151
---
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)