From nobody Thu Mar 12 16:40:54 2026 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 4fWtfG3jcDz6VcSq for ; Thu, 12 Mar 2026 16:40:54 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWtfG1F8rz3FQ4 for ; Thu, 12 Mar 2026 16:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333654; 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=iW1p/7d9MuTvFraRXdbhBLcS/+s7I/XwSjh4hu4SW5s=; b=yhk0903gqU4UqKDqQCdGjg8/vKxvPrKKPApEHBQ9mbqmFE+B2pgtbXYn6BxTGa3LSR6UjE P4yBzQtB9yhP+S7La1bod/FqvdjzCusyHyK+2qK/IlUCEJ50ucr3rV+tZ6PpBLZJF9qFId A00FJBRD3VrKHA6hzNn8Zl4aq1F/I5T6RX8k7RglwiVGZgjFYZbfBFWPWkkbigzAu4Au3c nUTGZ0M4bRvHY2UkMLUhqSAGyAwPeKC2SBMeSa0RJJ/kPnaH8L9j8PdPxFdsERvsD8b4Dw 7wVJqcxRQ3N9OptIzaCzpognlkt0uOEDRoFhQmvjBQWSmM13FzsopUuwfD1ETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773333654; a=rsa-sha256; cv=none; b=ujxEjdEeaw0na/gi6pWZmWG7RDbjot2J5PAcMYNHJXQVwaRLqL6cvYOqLOPXVkvSJFv2FA nJ9LlQw6LMse3Ub4EIDarSPmr06HNZ1wn93qSfL0KGmtDFao6d4favzirDrgL6fWYi45wP PLqpuiFwfVEZLrGPkbQgnJhlZK1ef+U3oKw7+fKL0FM1s7lmYWHrtgP5lb/2RUJoY+3TcM fxulB7rBGM38aoLFnok0/Ufejrv+7cEMQo2VMvcjmrzkS64TpXWe00BLK6UDs+PENmdiFe rzetmtAdzWM1W15jocjxihzRpgZy2Z6l7X7p9adUOfX68h1KvJUE7NGaLHtH3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773333654; 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=iW1p/7d9MuTvFraRXdbhBLcS/+s7I/XwSjh4hu4SW5s=; b=RCk7NRgSTZi123UoE3hkPuLH0U+fn7mI5ILdcgbbLhqj+rd/X4GpdGPO3634Q9ByHa9Jrg tN4H0eH2BJSfLWj1LugSNMnaTl44VaXgmDz2nesx5txoFq/jUWFx9CFMQJtVQUZyvRErmD LWfaP2TicucG9A3q+vmY2dpfWfakpe+MlPriJWvzwNxJCa4/QHDMYkNKAhimKiblefAhuI jmEYyV4kRVw0lIr52qQ13bT7kghcRIlmtUpcGt4imleIc7wfpHcdNX+9lTNr5Jp0AFfv8l sEN2pX5liMpdha3puUv8QoFLcca/Vg23CRygg3RUf3rTNTTwJvcbNoBD6lXmYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWtfG0dr9ztb4 for ; Thu, 12 Mar 2026 16:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45105 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 16:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c0462c2deafd - main - tcp: make sack_filter.c compilable without _WANT_TCPCB 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: c0462c2deafdcfe885e8d6f91b529d8cbddc6014 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 16:40:54 +0000 Message-Id: <69b2ec96.45105.2ab3de3c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c0462c2deafdcfe885e8d6f91b529d8cbddc6014 commit c0462c2deafdcfe885e8d6f91b529d8cbddc6014 Author: Gleb Smirnoff AuthorDate: 2026-03-12 04:44:25 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-12 16:37:53 +0000 tcp: make sack_filter.c compilable without _WANT_TCPCB This file can be compiled as a standalone program for debugging purposes. Achieve that without exposing hack from tcp_var.h that is destined for removal. --- sys/netinet/tcp_stacks/sack_filter.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/netinet/tcp_stacks/sack_filter.c b/sys/netinet/tcp_stacks/sack_filter.c index 2b70548f3cc6..71875c58989d 100644 --- a/sys/netinet/tcp_stacks/sack_filter.c +++ b/sys/netinet/tcp_stacks/sack_filter.c @@ -24,28 +24,19 @@ * */ #include -#ifndef _KERNEL -#define _WANT_TCPCB 1 -#endif #include #include #include +#include +#include +#include + #ifdef _KERNEL #include #include -#endif -#include -#ifdef _KERNEL #include -#else -struct inpcb { - uint32_t stuff; -}; -#endif -#include #include -#include -#ifndef _KERNEL +#else /* ! _KERNEL */ #include #include #include @@ -53,7 +44,17 @@ struct inpcb { #include #include #include +struct sackblk { + tcp_seq start; /* start seq no. of sack block */ + tcp_seq end; /* end seq no. */ +}; +struct tcpcb { + tcp_seq snd_una; + tcp_seq snd_max; + uint32_t t_maxseg; +}; #endif + #include "sack_filter.h" /*