From nobody Fri Oct 24 20:46:35 2025 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 4ctZgv2gvhz6FLbr; Fri, 24 Oct 2025 20:46:35 +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 4ctZgv1yxYz48tw; Fri, 24 Oct 2025 20:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761338795; 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=jf4GdDhzZdpQrw9b6vWs5UzmlEIGO/iv2lV5luHGUqM=; b=iZS/EJbbohxxW/Fclk8WwmOiqiG5CbcuWmQtZKLvDz+XOKdqU5114yolTsYHiojvnvqpaf hHe7AQrRarTJMrJQWR6g47jQFTqr3k4LlBzU1kdrgeMG6s5zpiVJ1zCPxCsWabsdVo64ir jGiZAdorco/0OEISqf6T7e6dHxu/lHMMZeX6A1wN0QYL751Cgqnv438Oi0C1EG39F7r2R/ 4xPI7QgCx5unjZLXU2VGKiksVLNDIrHzcgjAnskk7ImOWTE2YRe1d6Zt4pKbSqO2oawGad IMNbWzyotlOReaJGfymqHlzNCGN86UTPbeidxlZrmOohEojEDWG5NxyG7Mbjpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761338795; 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=jf4GdDhzZdpQrw9b6vWs5UzmlEIGO/iv2lV5luHGUqM=; b=kQ5JDuU1xc32c6gNtk5UAKtxWpyR+zokIK+ciI5JcS/CF/4zHmBXL/xnlTAy0fA0s2/gW3 3AHq0Wip2z5aVcrsMO2mJbJ/sJuPf8OIrktJbBHHuVHtHK6ejNu3v+iL++c6H90ngGsqdm HsrcJZE8sBA46DKgbGyyUCPqBrotgIyLQpDtl0OxYBPDTv9Nb0v2fUEft8vjJklhXjA5Qv Zg2szpYPpiAUJWZgYr7i0D73kEnZhmRgkLuYnI8yZcaNNilJMZhD2m+zauvsrrhXBiXPAS ogF0/0EhR5mHPwg/cWCsdDpb0YZ3vcd7M+LNedDIPCipRhhnc9utsoknqJzjpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761338795; a=rsa-sha256; cv=none; b=PSyZ2LjxU5gJLfjO9XGvHulbMm2Oe3p4Js2uAOFoixKC7/TXYrbnVe8wuiOd8cwLp4bs7T jyaQmGYY9hmysJfjZsvzhRmv1ykT4eXxTNrCcXqHqqYQgtT78DjBa7Fhm2pDfXieG2Cinf HJSVCuCAzTas9l07+h+wCQOlFGWJgHYrZprSyeFT8ozjYWxyZOPaW7+bHcOqilUeBilqjw FnHkdwyIBZePLl1/YeAu/x87SMPeqdjAO8Kqva6PT2nwrxF6gLO/P/BJb0vm5fID+QIF51 YSwe9Q9napOqBUilVNiuFdB2dCpAa+nRLZ+WHETq6Rc3Ace0v181qDZR//XEyQ== 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 4ctZgv1QLvz1G2; Fri, 24 Oct 2025 20:46:35 +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 59OKkZHg022605; Fri, 24 Oct 2025 20:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OKkZfI022602; Fri, 24 Oct 2025 20:46:35 GMT (envelope-from git) Date: Fri, 24 Oct 2025 20:46:35 GMT Message-Id: <202510242046.59OKkZfI022602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1f95a517880b - main - ipfw: Update warning/error setsockopt references List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f95a517880bae5fc0a9fe4463a8f2ec36ed734a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f95a517880bae5fc0a9fe4463a8f2ec36ed734a commit 1f95a517880bae5fc0a9fe4463a8f2ec36ed734a Author: Ed Maste AuthorDate: 2025-10-24 20:05:30 +0000 Commit: Ed Maste CommitDate: 2025-10-24 20:46:12 +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 --- 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