From nobody Wed Oct 29 13:45:33 2025 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 4cxT5n6TFnz6Dk46; Wed, 29 Oct 2025 13:45:33 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxT5n5bkdz3Dq8; Wed, 29 Oct 2025 13:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745533; 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=dLtsMULO7e6XL9NHbgz6olz4SKJWTfaQ/jlVhIS3/dU=; b=MtbCC1H+FdfG1w0h7fdGxKFnr/Cd3lP/0HnwVxPo2EKKmZ5ae73visrp7o+gC6QpSTkVA0 HjnKQ0vAwh3s9EERTmCnHEF4vs9ya/8Brx2SRHlXK9oK1RAdLR9o5TKEbdEkYXT+DaQ2SM 853PXV2SEuh44jM/X/muxilgTnzG82sJ4BrqR/eCg2qk0EaygYIv+6bPBSmJ+uA+kvlh+3 VewcsmGY76pHW7D0713HOcCdhWdIYJaDQIHMHcprB7CWMa+3rxXqMlRY5hekdFN9BVwNPp oBVXi+ElY9PVKLXaMJsAYNhVv17CgMzFotcgpPQ6ppugMY52bqw0oAjWbAKXOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745533; 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=dLtsMULO7e6XL9NHbgz6olz4SKJWTfaQ/jlVhIS3/dU=; b=QfmkEhT1qprZ8pbrzWEE0KITtf9QDzQEcOzqHKSP2UcMJ9hYwmKnfKBUb9k1WSSl2FxmPG xjvzhyp7/gsWql6/bXHsd2/OuDrylmHPUZgQoNJzlztbBrgrjuVwlvQJLIMH4k9VzeBCCI ZWh1Lbm5glCSIYo85HqX2biYGURKtR2eCDsKyktfTLSovw/jBQsE+I9L+cLf8kmWPzPURT r4281c62WHzb5TbxXlbQ1rSXHalCO0unQ3mLjl4oYxmVrwdF2764WweQWG/93N0FMl1Tsr Vk3+aPGl3v+RonPURDlMGzfRZuv1fRMyStANufqlWtIJEJruxueo+RKXBsX7HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745533; a=rsa-sha256; cv=none; b=e2GJncm+IM7C6JNnXPY91hvh8AvLQ49xi0wwcYUFHu/V+m7bqW7GQ1J85pcmQPkcK8ceGz p5TmNSdMnUfqksmSO2G8XIzLQmc6k74tFQTsLCo1hp5MV1U3u0/YS0e6i22M499ttMU1VC viHtVnlA5MgyO7VNqJZLPnLOg5vqrnPev6ofV42t3nvfooOEqg6gZZpe8JCD2t8AlNckcE UrPyMMvOOuq8TdwdfKMgI+W36eMkn1eEbuz6arI8UHjtZR56WNGhmk/vdbrlRUKPkpnsbK CRsOFI8NvkAqjPAPZBjpIKiug49fO3XXcleugfhQr+M0qquYBCPimeCA2ZIhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxT5n4bmxzflK; Wed, 29 Oct 2025 13:45:33 +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 59TDjXBm024643; Wed, 29 Oct 2025 13:45:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDjXGk024640; Wed, 29 Oct 2025 13:45:33 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:45:33 GMT Message-Id: <202510291345.59TDjXGk024640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6b546a10d61c - stable/14 - ipfw: Update warning/error setsockopt references 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b546a10d61cf4051114b3c1e89c3ed1d79cbe3a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b546a10d61cf4051114b3c1e89c3ed1d79cbe3a commit 6b546a10d61cf4051114b3c1e89c3ed1d79cbe3a Author: Ed Maste AuthorDate: 2025-10-24 20:05:30 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:45:11 +0000 ipfw: Update warning/error setsockopt references Dummynet v3 switched to IP_DUMMYNET3 but did not update these warnings/errors. Fixes: cc4d3c30ea28 ("Bring in the most recent version of ipfw and dummynet, developed") Sponsored by: The FreeBSD Foundation Differential Revision: sbin/ipfw/ipfw2.c (cherry picked from commit 1f95a517880bae5fc0a9fe4463a8f2ec36ed734a) (cherry picked from commit a5dd21c7dd1f3c8103c2fc6a1caa5635d70671aa) --- sbin/ipfw/dummynet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c index 26d535428ec3..688fd6d4c5b0 100644 --- a/sbin/ipfw/dummynet.c +++ b/sbin/ipfw/dummynet.c @@ -672,7 +672,7 @@ ipfw_delete_pipe(int do_pipe, int i) i = do_cmd(IP_DUMMYNET3, &cmd, cmd.oid.len); if (i) { i = 1; - warn("rule %u: setsockopt(IP_DUMMYNET_DEL)", i); + warn("rule %u: setsockopt(IP_DUMMYNET3)", i); } return i; } @@ -1841,7 +1841,7 @@ end_mask: i = do_cmd(IP_DUMMYNET3, base, (char *)buf - (char *)base); if (i) - err(1, "setsockopt(%s)", "IP_DUMMYNET_CONFIGURE"); + err(1, "setsockopt(%s)", "IP_DUMMYNET3"); } void