Page MenuHomeFreeBSD

D46141.id.diff
No OneTemporary

D46141.id.diff

diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 28, 2024
+.Dd August 3, 2024
.Dt TCP 4
.Os
.Sh NAME
@@ -622,11 +622,6 @@
List of available TCP function blocks (TCP stacks).
.It Va functions_default
The default TCP function block (TCP stack).
-.It Va functions_inherit_listen_socket_stack
-Determines whether to inherit listen socket's TCP stack or use the current
-system default TCP stack, as defined by
-.Va functions_default .
-Default is true.
.It Va hostcache
The TCP host cache is used to cache connection details and metrics to
improve future performance of connections between the same hosts.
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -114,14 +114,6 @@
&VNET_NAME(tcp_syncookiesonly), 0,
"Use only TCP SYN cookies");
-VNET_DEFINE_STATIC(int, functions_inherit_listen_socket_stack) = 1;
-#define V_functions_inherit_listen_socket_stack \
- VNET(functions_inherit_listen_socket_stack)
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, functions_inherit_listen_socket_stack,
- CTLFLAG_VNET | CTLFLAG_RW,
- &VNET_NAME(functions_inherit_listen_socket_stack), 0,
- "Inherit listen socket's stack");
-
#ifdef TCP_OFFLOAD
#define ADDED_BY_TOE(sc) ((sc)->sc_tod != NULL)
#endif
@@ -777,7 +769,6 @@
static struct socket *
syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m)
{
- struct tcpcb *listening_tcb;
struct inpcb *inp = NULL;
struct socket *so;
struct tcpcb *tp;
@@ -802,11 +793,7 @@
goto allocfail;
}
inp = sotoinpcb(so);
- if (V_functions_inherit_listen_socket_stack)
- listening_tcb = sototcpcb(lso);
- else
- listening_tcb = NULL;
- if ((tp = tcp_newtcpcb(inp, listening_tcb)) == NULL) {
+ if ((tp = tcp_newtcpcb(inp, sototcpcb(lso))) == NULL) {
in_pcbfree(inp);
sodealloc(so);
goto allocfail;

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 23, 5:32 PM (5 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26022822
Default Alt Text
D46141.id.diff (2 KB)

Event Timeline