From nobody Fri Dec 12 17:23:36 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 4dSbs51V5hz6JyTN for ; Fri, 12 Dec 2025 17:23:37 +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 4dSbs46GFTz442g for ; Fri, 12 Dec 2025 17:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765560216; 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=MyrFE+8HZ7I0D8HC2UCDioMDtU7QR4LHSsvLLYdhRkM=; b=ErBrngYv9U5QLLcTrRjtJgkDIXT/KEUVg5yNJ31YTTdM80vilEjKX1uCHcxWNC96DPp4RG r+OmJHc+wzL8hiK+vUwX0jI+gtQQtSCySC218eDD2KkoFhO9eXqouVb2PzUDFL5LB2+l+V clVH8sLY2ZMBtCugMm+MkrUXCkGPZePxgcECWcB0YIAMIuiNirN9SFhthj8tF5vbTwmM51 e/Oe5Hpn3In2lE5td6Lt/tizRCujLgLwhtmb9JsaQRkCDR+J3825UtHJQSnwAy7nGVKkKK UmDnvD56D4Z8Z/nLLOjOZFguL5+2sHMXGgldmDJPY9vHdCgFrt+JNJb2y0EBBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765560216; 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=MyrFE+8HZ7I0D8HC2UCDioMDtU7QR4LHSsvLLYdhRkM=; b=sFtNzsIJnqHjbZA8k4tAXX2X9nYRcuH1pmNA7HPWMG3fTOOZ7ONDJ7ZQW4NE/b4QpRSclR k7d5oXLHVdcMCWsargrXwLzOt92zPNEXfsU3YRszakrYoCtsvF29qztZ4vOMahLdZTlu8j q2BFUwg2KdUyqwy5yfvxQ9c8DtJOfUL4vN0kebjzv090sxgAP20tidt6hk0Nyxfda9Y3n1 OOHqEc6IBqU1U4Jxx16/MoHDBCZFoVuXrFqPhIM2dhVcQRyN4DgitOzFpSb5wHZFVydW1V kAHYFinyOrx4xUeNQdyBZBojC+6b7bKD9tsx4it5JtB4zWFCyRtgJOEI0x9PFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765560216; a=rsa-sha256; cv=none; b=YqLlkK6IZf0HrNEeO5r/uDX8jTDCisXLX7tpP3hskmjPXFj+lO494endIImEJTFMdKV+Xe VZNzhGkDC7Qt9WFvNRPAgojUJXgdLggdt7ujxvwxR7RseNsvWIIvfrWWmrwsTZOkv9g1MS 9lZkBgG27dDIYJrE9vuJDiiMhIoWn4lGP57ytZmNek3LnIpOFtQh0BGMIRMfDe0ebbqM38 jfTKTaNEWlHqiDVjWNFtYWTsSHV0XXeGy+AjP2V0I+QaJEndJaNN9gs2fMEA7LfHlRTB1F Rn8Drzk59SRi4v/Dr3mjHvVUzA47uydQZ+2QXDb8NKnlwRd9uTAGzjyPJBTqTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dSbs45JhYz9vM for ; Fri, 12 Dec 2025 17:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dc51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 12 Dec 2025 17:23:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 929338d1e92a - main - tpc: retire net.inet.tcp.nolocaltimewait 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 929338d1e92ada4ff4ee2061c625fa45a1a34caf Auto-Submitted: auto-generated Date: Fri, 12 Dec 2025 17:23:36 +0000 Message-Id: <693c4f98.3dc51.1b0fc74e@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=929338d1e92ada4ff4ee2061c625fa45a1a34caf commit 929338d1e92ada4ff4ee2061c625fa45a1a34caf Author: Gleb Smirnoff AuthorDate: 2025-12-12 17:22:56 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-12 17:22:56 +0000 tpc: retire net.inet.tcp.nolocaltimewait See c3fc0db3bc50df18a724e6e6b12ea4e060fd9255 for details. --- sys/netinet/tcp_timewait.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 3afa3c0ac1c1..259ec7dc50dc 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -86,30 +86,6 @@ #include -VNET_DEFINE_STATIC(bool, nolocaltimewait) = false; -#define V_nolocaltimewait VNET(nolocaltimewait) - -static int -sysctl_net_inet_tcp_nolocaltimewait(SYSCTL_HANDLER_ARGS) -{ - int error; - bool new; - - new = V_nolocaltimewait; - error = sysctl_handle_bool(oidp, &new, 0, req); - if (error == 0 && req->newptr) { - V_nolocaltimewait = new; - gone_in(16, "net.inet.tcp.nolocaltimewait is obsolete." - " Use net.inet.tcp.msl_local instead.\n"); - } - return (error); -} - -SYSCTL_PROC(_net_inet_tcp, OID_AUTO, nolocaltimewait, - CTLFLAG_VNET | CTLFLAG_RW | CTLTYPE_U8, - &VNET_NAME(nolocaltimewait), 0, sysctl_net_inet_tcp_nolocaltimewait, "CU", - "Do not create TCP TIME_WAIT state for local connections"); - static u_int tcp_eff_msl(struct tcpcb *tp) { @@ -146,9 +122,6 @@ void tcp_twstart(struct tcpcb *tp) { struct inpcb *inp = tptoinpcb(tp); -#ifdef INET6 - bool isipv6 = inp->inp_inc.inc_flags & INC_ISIPV6; -#endif NET_EPOCH_ASSERT(); INP_WLOCK_ASSERT(inp); @@ -164,21 +137,6 @@ tcp_twstart(struct tcpcb *tp) if (tp->t_flags & TF_ACKNOW) (void) tcp_output(tp); - if (V_nolocaltimewait && ( -#ifdef INET6 - isipv6 ? in6_localip(&inp->in6p_faddr) : -#endif -#ifdef INET - in_localip(inp->inp_faddr) -#else - false -#endif - )) { - if ((tp = tcp_close(tp)) != NULL) - INP_WUNLOCK(inp); - return; - } - tcp_timer_activate(tp, TT_2MSL, 2 * tcp_eff_msl(tp)); INP_WUNLOCK(inp); }