From nobody Tue Oct 04 04:11:45 2022 X-Original-To: dev-commits-src-main@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 4MhPR56sZ8z4dmgb; Tue, 4 Oct 2022 04:11:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhPR56RDkz3xFS; Tue, 4 Oct 2022 04:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664856705; 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=PLPbMdw1IUe9qRNIf5hMYXQo30+b3ibvmMHLxQiDkUU=; b=aGKSSIJvvg6nYc0Qpb2ETtDt3M9posHRbvuNz2iwNzLR3FTzxi1SaQmBLgRCNUyj/U64fn wJxW2TWDlAmwq+cGd50NT05+z7jfGJ5OxQ0HlOZvMrtfhI84wJeLKIKvOpLXF3OF/562Bv 6qZ8BTR5hf3v++nKnr5o6xMCF76tpJTfgLoR5Tr/BzYBdy+LdUWo28OgLerULIrPk4+5bS UKcLpm0lOxpXHhVlHqj3qE24uExzCwTvq+Gn7JDkbNO/miA1gma6S6qHXw2N+9y2bKVmcW Ei6XfpevE1EpOjgDP5I0eEAaaeZy7AKbN5Orwt772t//z7pXvPiOQOhVlvGtvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MhPR55VSJzR8j; Tue, 4 Oct 2022 04:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2944Bjc7038992; Tue, 4 Oct 2022 04:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2944Bj4O038991; Tue, 4 Oct 2022 04:11:45 GMT (envelope-from git) Date: Tue, 4 Oct 2022 04:11:45 GMT Message-Id: <202210040411.2944Bj4O038991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 775e20c159f5 - main - tcp: make tcp_drop_syn_sent() static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 775e20c159f51d01368bb82f95ba33695d7fa443 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664856705; 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=PLPbMdw1IUe9qRNIf5hMYXQo30+b3ibvmMHLxQiDkUU=; b=ejUj+cpdFztcp/Ks5NZQ/wbyIL4LxuOVN8Tu0V1z/Z5Hd1D0FqhKJGMT5DesxXY3pxg6KP GZVWba3uZ4rkT7f6DTgH4dRCH0+nBIwMFVCcJas+V3l6vJ1DdqK0RA0txD0pA8QaBwaUlF 7KXF2SdDvCAnUIKT7DhjSo/p1j1Kokd69w33yr9GiEvuyCt0/egJRcliv4ETvjFs3WWvYi GSzw8QcdbQIuW9WAWzvI3KjjzyZtQ/+OwOZZgwu25W4XTU1HdMqps2a/co20yhm7AJqFef svKVmqz8X0f8ydnAjdBVGHJr2fZI1tYwjY+iOq597fYYsrhc4Ncqgyl1qEqj1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664856705; a=rsa-sha256; cv=none; b=CtlPZpa6/b5LDG2jh6QQych0J0mFBAZVXzDhQPKF2rZTcac4ydI0Q94aEGEv5eF0DMgjtY S+LU0ZBGMGi+89FkEd1U0mPuow6b7mthRW1ae2xAtMtvtqMuhtHD7zAYh6vYQ3JOxWprWF wLvKPP5BHZIiEVRn/OFyfS6EoneT6lWtdmwwLHRDwqxXOh6gguOvMSGJ0fyMhqKGOrAYXQ tJTz8mYj6/tWVXB5ObMZJA+QgPIqG+IrP+XEo7cnHOXGmeJSepggArxFNjNbLvoKso4Owx o7io9jNotRvVMYbJCY8cgX5AYWbSSH6oimgGvpxSEBTjj2v24gbCU8Vmm6wHyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=775e20c159f51d01368bb82f95ba33695d7fa443 commit 775e20c159f51d01368bb82f95ba33695d7fa443 Author: Gleb Smirnoff AuthorDate: 2022-10-04 04:11:17 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-04 04:11:17 +0000 tcp: make tcp_drop_syn_sent() static --- sys/netinet/tcp_subr.c | 3 ++- sys/netinet/tcp_var.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 5bbea0176303..1e47b7896e6e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -373,6 +373,7 @@ static int tcp_default_handoff_ok(struct tcpcb *tp); static struct inpcb *tcp_notify(struct inpcb *, int); static struct inpcb *tcp_mtudisc_notify(struct inpcb *, int); static struct inpcb *tcp_mtudisc(struct inpcb *, int); +static struct inpcb *tcp_drop_syn_sent(struct inpcb *, int); static char * tcp_log_addr(struct in_conninfo *inc, struct tcphdr *th, const void *ip4hdr, const void *ip6hdr); static ipproto_ctlinput_t tcp_ctlinput; @@ -3331,7 +3332,7 @@ tcp_new_isn(struct in_conninfo *inc) * connection state is SYN-SENT, drop the connection. This behavior * is controlled by the icmp_may_rst sysctl. */ -struct inpcb * +static struct inpcb * tcp_drop_syn_sent(struct inpcb *inp, int errno) { struct tcpcb *tp; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index ec6818648746..3eebbefd9b7f 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1170,8 +1170,6 @@ void tcp_mss_update(struct tcpcb *, int, int, struct hc_metrics_lite *, struct tcp_ifcap *); void tcp_mss(struct tcpcb *, int); int tcp_mssopt(struct in_conninfo *); -struct inpcb * - tcp_drop_syn_sent(struct inpcb *, int); struct tcpcb * tcp_newtcpcb(struct inpcb *); int tcp_default_output(struct tcpcb *);