From nobody Thu Oct 30 04:23:48 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 4cxrb85NCyz6DjvT; Thu, 30 Oct 2025 04:23:48 +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 4cxrb82GpCz3GD2; Thu, 30 Oct 2025 04:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798228; 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=T4vcGDevA7QVp+9nhEW74uCAkV0dGyfelkwQJcdv/QI=; b=ivnGveT55ZcH5e96hDSn4A07I4dDUDrUXsQfMlqbjrqrw6IO1myWVz2XSUlP3YrvO8XN0R stfxbOEJQ9vvMvfKosHT/mTHDJAG+1d8B+0UkzOq06bb9Hu3iqVDg9mUNZ2YYpV0w5Of5X 6+CeYNxuWys0t3/jpKjKFFddoF9ksO7zQOuE6FA50PvxdSFOrrUebxtasC/8r0RSqcIo0K DhWm4TbG/uJpIf78BfgWAyZNcXmBpCRn7t/+WkOsbfgt9uvo9OFwmJ6wUECqn9uFGMvdCj SbQ2iu9t5dy3O07BRoCYA5K/e08xPDmo6ynn1TqZY5/ioMuaext/Vf2IgjIBKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798228; 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=T4vcGDevA7QVp+9nhEW74uCAkV0dGyfelkwQJcdv/QI=; b=IJDaO5TFwKdL0+W2FW79HOoxDr7ICt1onkUNKv3RYaBasAMOPQ29bHKN12QkX1yzpGYJaU 6xPtIMJaEEFEC3YsO1GV1ohCLjOK8IKmO1gS/bjnShg/ZuLyrqFOyMxhq7UxZ8O/y062C/ nohQOx5wJVLOBzhs2lFlm0Zup3NxmoNFBSpijpRGJDTY7NCpsZTy/Cvj2+htHmK6ceF5R6 ZfDLotQDPga9gwqtEMAb91Z+h3GKifS0krRiA96AVecuZ1eutYaD8MkmvppnmEuun0PSqG +cimEH4tiVltPTrUqW5BaO59CJBvb9uR9w0ONAjAYhzcWj8VHtON8j26KiKf7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798228; a=rsa-sha256; cv=none; b=yUK941BgqLpPiVRr2KFkLXucyb7PliGuuuCyifrzqEo2ofI3VISUklFZWg4FkD07wJy64W gLw9+jFYIfdafOskZ3on7dRYEak1JXy3PZfgULwkafbkHu79pCsnOJSmAMbHXdh3CfMOrd Kzc7tDvAxSoDUQzdW5xJGXtrXyrbm99BJghDdY3SSEmmDOYbNUBJlHd/d9DdE7hI+rq/0C 65r8orsEJGn2ZVa4oOSSQ5sz1pd7KMUOJDsvfhfPZUUc8sTMWDbGeyWd8sM5S5UQiIUbTI zBnP0ZTU8ynENxhc26INfqxbf17tamNidxVxXqGpMis30W02oOGUUkRFRgQTZA== 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 4cxrb81hd4z16J7; Thu, 30 Oct 2025 04:23:48 +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 59U4NmbD084575; Thu, 30 Oct 2025 04:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NmHR084572; Thu, 30 Oct 2025 04:23:48 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:48 GMT Message-Id: <202510300423.59U4NmHR084572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 883230a190b9 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 883230a190b9e2e44ba27c7683be4159a7fad66d Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=883230a190b9e2e44ba27c7683be4159a7fad66d commit 883230a190b9e2e44ba27c7683be4159a7fad66d Author: Ed Maste AuthorDate: 2025-10-24 20:05:30 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:23:04 +0000 ipfw: Update warning/error setsockopt references Dummynet v3 switched to IP_DUMMYNET3 but did not update these warnings/errors. Approved by: re (cperciva) 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 6714b2af3124..a0cefcffd183 100644 --- a/sbin/ipfw/dummynet.c +++ b/sbin/ipfw/dummynet.c @@ -680,7 +680,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; } @@ -1863,7 +1863,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