Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Oct 2025 13:45:33 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 6b546a10d61c - stable/14 - ipfw: Update warning/error setsockopt references
Message-ID:  <202510291345.59TDjXGk024640@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/14 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=6b546a10d61cf4051114b3c1e89c3ed1d79cbe3a

commit 6b546a10d61cf4051114b3c1e89c3ed1d79cbe3a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-10-24 20:05:30 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510291345.59TDjXGk024640>