Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2025 16:46:14 GMT
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 9880ce076584 - releng/13.5 - icmp6: make icmp6_ratelimit() responsible to update the stats counter
Message-ID:  <202502131646.51DGkELN041609@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help

The branch releng/13.5 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=9880ce076584d4ca3a14fb87222cbb387be0d108

commit 9880ce076584d4ca3a14fb87222cbb387be0d108
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2024-03-24 16:13:23 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2025-02-13 14:00:23 +0000

    icmp6: make icmp6_ratelimit() responsible to update the stats counter
    
    Reviewed by:            tuexen
    Differential Revision:  https://reviews.freebsd.org/D44479
    Approved by:            re (cperciva)
    
    (cherry picked from commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7)
    (cherry picked from commit dc167e64dce3ffc212e4f7a2268587abcc22c036)
---
 sys/netinet6/icmp6.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index d49c3856be1a..258f4bed794e 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -346,10 +346,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param)
 	}
 
 	/* Finally, do rate limitation check. */
-	if (icmp6_ratelimit(&oip6->ip6_src, type, code)) {
-		ICMP6STAT_INC(icp6s_toofreq);
+	if (icmp6_ratelimit(&oip6->ip6_src, type, code))
 		goto freeit;
-	}
 
 	/*
 	 * OK, ICMP6 can be generated.
@@ -2799,6 +2797,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type,
 	    V_icmp6errppslim)) {
 		/* The packet is subject to rate limit */
 		ret++;
+		ICMP6STAT_INC(icp6s_toofreq);
 	}
 
 	return ret;



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