From nobody Wed Oct 29 13:40: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 4cxT0J4D6xz6Dk0M; Wed, 29 Oct 2025 13:40: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 4cxT0J31jqz3Btq; Wed, 29 Oct 2025 13:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745248; 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=dRcXob12fyVdfvK2A3OwUg5T1Fmn4vTfzbaOdsV7n+I=; b=acBsXkSH4DkkUpHYfmR8ctuIxTJwSLpH6OdbFe0xcq+dQnoae8K8m9wySuC7h4QndeU3s3 hFpmlaOPIQI9zX15POQSlSey4xtNrLkCAH4b45EgZjcI4mksAqU0wT5UXhZaPcXE/Ggn5k V3sm9gh9jSJkQOkJ2QZt+4QcJ9Y19/mkgyXvzTH1ZOl5mKeTRu/Gbc0Aaez3ysroZc+pCg 36cDXUdx5n2Y9/a0fBdrv1jfKXuGulsmSLwQ7mTcrWqpEYl89B6mr9keIzWxIGUTJPZ1hN TszAxwnu2sDZC4w6PDiNg7LD/7m0271xKF5mdly0XQdomDXgMkhTs6K3QzFFKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761745248; 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=dRcXob12fyVdfvK2A3OwUg5T1Fmn4vTfzbaOdsV7n+I=; b=GxOFccc9B2dBXHF9XVZTVn7jg20EWfS7iLLs1VzPzzc+qGFNinep4S4xqdzkKjLjiLAXjm to4MUve4YIjZXx4IJ35PnIqXI7/pQf7Q7F1J5LJWNN3GHtJxkjLeIgL1ZcYi3Ax50aMY7/ JBWrHKIZEhCeTVUJZhgsJFBDvt4m+h8yj4Hvi5KehSba0Dphxx2XU/+DWiZJDy7K1YW2QY vux9n/nOYsKAaRqs5dKdc2bVbZBLgcWatRuVt+cyEBh/DswHoiLYxPMLhTY8wc366GTeD5 rD/fijpnSeToWpMKHWVhXa7wibSRVbt5+IhtjjdBbDPShma8LPnvzBJb0kz6vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761745248; a=rsa-sha256; cv=none; b=Zt1FX8qpYtSVTwZ8Nq2LNN5UJxqilTdU06A4S4Psr9oTxAoRBIX2nmM3q1Ez7mB3IhnqiI Egctxx4h+9YMlXO4kGuof9WWsn+aSBvxlEmNmYdME5cU6ZmxvzJDfjEMPieRG4bxaBHdPr 4DpyWaZ0vlkyBwH7ssy3bPssCySe5kRvfSXlsycEhNA31AxU2pYm1t9S3D1fiKLL7t2OnK 8NIo3XdnUvoJRoxvrVZ30sF7/Aw3toMFdGorAGDnV2kMuXsoOWu8Qwc1HnaaAagzqorbT3 Um0SpMIKbOf88YFX+NLDYxqb9LKLp1wJB/bumje/fqtJHrQXsOP6XItr5GDNhA== 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 4cxT0J2byrzfYJ; Wed, 29 Oct 2025 13:40: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 59TDem2L015637; Wed, 29 Oct 2025 13:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TDembG015634; Wed, 29 Oct 2025 13:40:48 GMT (envelope-from git) Date: Wed, 29 Oct 2025 13:40:48 GMT Message-Id: <202510291340.59TDembG015634@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: a5dd21c7dd1f - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a5dd21c7dd1f3c8103c2fc6a1caa5635d70671aa Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a5dd21c7dd1f3c8103c2fc6a1caa5635d70671aa commit a5dd21c7dd1f3c8103c2fc6a1caa5635d70671aa Author: Ed Maste AuthorDate: 2025-10-24 20:05:30 +0000 Commit: Ed Maste CommitDate: 2025-10-29 13:40:29 +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) --- 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