The branch main has been updated by glebius:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2cca4c0ee03dde51ec64db6684933fcb0a2de290
commit 2cca4c0ee03dde51ec64db6684933fcb0a2de290
Author: Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2021-03-22 18:45:29 +0000
Commit: Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2021-04-08 17:58:44 +0000
Remove tcp_hostcache.h. Everything is private.
Reviewed by: rscheff
---
ObsoleteFiles.inc | 3 ++
sys/netinet/tcp_hostcache.c | 43 ++++++++++++++++++++++-
sys/netinet/tcp_hostcache.h | 84 ---------------------------------------------
3 files changed, 45 insertions(+), 85 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3b251eee1457..f50b9befdd66 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20210408: remove tcp_hostcache.h
+OLD_FILES+=usr/include/netinet/tcp_hostcache.h
+
# 20210403: remove kgmon(8)
OLD_FILES+=usr/sbin/kgmon
OLD_FILES+=usr/share/man/man8/kgmon.8.gz
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index a873558621d1..5c8a6570425f 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -99,13 +99,54 @@ __FBSDID("$FreeBSD$");
#endif
#include <netinet/tcp.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcp_hostcache.h>
#ifdef INET6
#include <netinet6/tcp6_var.h>
#endif
#include <vm/uma.h>
+TAILQ_HEAD(hc_qhead, hc_metrics);
+
+struct hc_head {
+ struct hc_qhead hch_bucket;
+ u_int hch_length;
+ struct mtx hch_mtx;
+};
+
+struct hc_metrics {
+ /* housekeeping */
+ TAILQ_ENTRY(hc_metrics) rmx_q;
+ struct hc_head *rmx_head; /* head of bucket tail queue */
+ struct in_addr ip4; /* IP address */
+ struct in6_addr ip6; /* IP6 address */
+ uint32_t ip6_zoneid; /* IPv6 scope zone id */
+ /* endpoint specific values for tcp */
+ uint32_t rmx_mtu; /* MTU for this path */
+ uint32_t rmx_ssthresh; /* outbound gateway buffer limit */
+ uint32_t rmx_rtt; /* estimated round trip time */
+ uint32_t rmx_rttvar; /* estimated rtt variance */
+ uint32_t rmx_cwnd; /* congestion window */
+ uint32_t rmx_sendpipe; /* outbound delay-bandwidth product */
+ uint32_t rmx_recvpipe; /* inbound delay-bandwidth product */
+ /* TCP hostcache internal data */
+ int rmx_expire; /* lifetime for object */
+ u_long rmx_hits; /* number of hits */
+ u_long rmx_updates; /* number of updates */
+};
+
+struct tcp_hostcache {
+ struct hc_head *hashbase;
+ uma_zone_t zone;
+ u_int hashsize;
+ u_int hashmask;
+ u_int bucket_limit;
+ u_int cache_count;
+ u_int cache_limit;
+ int expire;
+ int prune;
+ int purgeall;
+};
+
/* Arbitrary values */
#define TCP_HOSTCACHE_HASHSIZE 512
#define TCP_HOSTCACHE_BUCKETLIMIT 30
diff --git a/sys/netinet/tcp_hostcache.h b/sys/netinet/tcp_hostcache.h
deleted file mode 100644
index 2f7035c0c6af..000000000000
--- a/sys/netinet/tcp_hostcache.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * Many thanks to jlemon for basic structure of tcp_syncache which is being
- * followed here.
- */
-
-#ifndef _NETINET_TCP_HOSTCACHE_H_
-#define _NETINET_TCP_HOSTCACHE_H_
-
-TAILQ_HEAD(hc_qhead, hc_metrics);
-
-struct hc_head {
- struct hc_qhead hch_bucket;
- u_int hch_length;
- struct mtx hch_mtx;
-};
-
-struct hc_metrics {
- /* housekeeping */
- TAILQ_ENTRY(hc_metrics) rmx_q;
- struct hc_head *rmx_head; /* head of bucket tail queue */
- struct in_addr ip4; /* IP address */
- struct in6_addr ip6; /* IP6 address */
- uint32_t ip6_zoneid; /* IPv6 scope zone id */
- /* endpoint specific values for tcp */
- uint32_t rmx_mtu; /* MTU for this path */
- uint32_t rmx_ssthresh; /* outbound gateway buffer limit */
- uint32_t rmx_rtt; /* estimated round trip time */
- uint32_t rmx_rttvar; /* estimated rtt variance */
- uint32_t rmx_cwnd; /* congestion window */
- uint32_t rmx_sendpipe; /* outbound delay-bandwidth product */
- uint32_t rmx_recvpipe; /* inbound delay-bandwidth product */
- /* TCP hostcache internal data */
- int rmx_expire; /* lifetime for object */
- u_long rmx_hits; /* number of hits */
- u_long rmx_updates; /* number of updates */
-};
-
-struct tcp_hostcache {
- struct hc_head *hashbase;
- uma_zone_t zone;
- u_int hashsize;
- u_int hashmask;
- u_int bucket_limit;
- u_int cache_count;
- u_int cache_limit;
- int expire;
- int prune;
- int purgeall;
-};
-
-#endif /* !_NETINET_TCP_HOSTCACHE_H_*/
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
