From nobody Thu Jan 11 12:30:59 2024 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 4T9kY018HBz55cJv; Thu, 11 Jan 2024 12:31:00 +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 4T9kXz73g3z442P; Thu, 11 Jan 2024 12:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976260; 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=Vo8dq6UK3hfMUMSm9jQSTIYHcDcTQ3ZSj+Lv1kMKd1w=; b=CCh9DDTTPgCyNtlT7nHWf3j99GERw/7dTFp33nCyciqkpvouTDGXBBt4Y0evEoxWzMata+ hWkW7OMmgSLFJdjsGWiJdFywxd27tqqoZ+ImpaxowIMNtZLphdoEsv7T1nk7BKbY1bmblF qloIH+xhUhRHOW2Lv0LD9istc5nNN78Mj3ADo6Fc2/gO+D5IVuntOSXICeVbUR3XZRflog B4byRXN5+4REYOkvft8iDo9okfTZFqBisL4sfU4PDluSl52dolWO7yajeyReKETWo2NuA6 PhkW4yTgysRdw7CLKT6jmS0dtYbx1gBYXU6gbkkEKd4P3/wPo6TJ2zZgYF1vVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976260; 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=Vo8dq6UK3hfMUMSm9jQSTIYHcDcTQ3ZSj+Lv1kMKd1w=; b=e6bzx3tWB/z4hsb/g1RqrXIg1N7bnh+XapQX1rE07obcbvmCHgX0zjXWR/2Fzocdz4Z8rv mw5YvXPxhibc5ZlIJF1+IxaaKrOAY+yKsrMxrfJ4/acJcjhlmaKmFLsbVdxXvtEOI6WR98 tyDCqhF3LsZ7juMnS83hzqzAxf+Ic83LfCiPM07JNtROL3PX8oI/w7BcfPpLkDDEGAu6C+ Dlc0r8lyBM/0a2Tzn0qCcSvdtw72s+h+rdVhLX/grLLN269Foy5wXvoHKgPh9WgfCn3lfe Hyiwb9I+6yT64ib2l7mRkejpqjfl3QFuT+kuBc7XJ+piEjGYDkWzOkUkbLnSFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704976260; a=rsa-sha256; cv=none; b=nwGTUizXRIQc8R/dbgWtmdkGyNUNTHIBOEsE62BlSMCshG/aAdDAOb++S8qVgZ/osjdS4A XVbNh20yQbRGRwh3XJbMI+uD+T1uCcDdDPoCtZlw46xguO6NcF8K9haYjN3qnrzHwjdTlH 5mzd25vWjzshQ8ugXLekCMB+NTm+JgBpyZcglvYvew/UDaot08y00ZsCscnr2mJ4t3tCQj BnZjDnKGqGl5CzvzBEocC0CyoSMRwgdrs4SCKRs6vxbflzB8Y/ZGz2Ee2D/lAoU08fSM7I XMDGWpUqo09g9jJQhWp9iK3fHghsZ5cOh2EYje1zEnGBErj1s8u7YpDYeB8sww== 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 4T9kXz5MG9zJXr; Thu, 11 Jan 2024 12:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BCUxA9011291; Thu, 11 Jan 2024 12:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCUxWd011288; Thu, 11 Jan 2024 12:30:59 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:30:59 GMT Message-Id: <202401111230.40BCUxWd011288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 31acdb17668e - stable/13 - sctp: remove duplicate code 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 31acdb17668ec28798fdace1f1f192d18ec50765 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=31acdb17668ec28798fdace1f1f192d18ec50765 commit 31acdb17668ec28798fdace1f1f192d18ec50765 Author: Michael Tuexen AuthorDate: 2023-08-08 11:05:39 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:30:20 +0000 sctp: remove duplicate code No functional change intended. (cherry picked from commit 9ade2745db8be213e9da2225795cafb8e7575e29) --- sys/netinet/sctp_usrreq.c | 4 ++-- sys/netinet/sctp_var.h | 1 + sys/netinet6/sctp6_usrreq.c | 48 +-------------------------------------------- 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 10af0c669f04..4e43c8c72f40 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -424,8 +424,7 @@ SYSCTL_PROC(_net_inet_sctp, OID_AUTO, getcred, 0, 0, sctp_getcred, "S,ucred", "Get the ucred of a SCTP connection"); -#ifdef INET -static void +void sctp_abort(struct socket *so) { struct epoch_tracker et; @@ -463,6 +462,7 @@ sctp_abort(struct socket *so) NET_EPOCH_EXIT(et); } +#ifdef INET static int sctp_attach(struct socket *so, int proto SCTP_UNUSED, struct thread *p SCTP_UNUSED) { diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h index 144ab77c5dec..0177dd5ac227 100644 --- a/sys/netinet/sctp_var.h +++ b/sys/netinet/sctp_var.h @@ -319,6 +319,7 @@ struct sctp_tcb; struct sctphdr; void sctp_close(struct socket *so); +void sctp_abort(struct socket *so); int sctp_disconnect(struct socket *so); void sctp_ctlinput(int, struct sockaddr *, void *); int sctp_ctloutput(struct socket *, struct sockopt *); diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index aeebe712b1ce..dca38401c02b 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -460,52 +460,6 @@ SYSCTL_PROC(_net_inet6_sctp6, OID_AUTO, getcred, 0, 0, sctp6_getcred, "S,ucred", "Get the ucred of a SCTP6 connection"); -/* This is the same as the sctp_abort() could be made common */ -static void -sctp6_abort(struct socket *so) -{ - struct epoch_tracker et; - struct sctp_inpcb *inp; - uint32_t flags; - - inp = (struct sctp_inpcb *)so->so_pcb; - if (inp == NULL) { - SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, EINVAL); - return; - } - NET_EPOCH_ENTER(et); -sctp_must_try_again: - flags = inp->sctp_flags; -#ifdef SCTP_LOG_CLOSING - sctp_log_closing(inp, NULL, 17); -#endif - if (((flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) && - (atomic_cmpset_int(&inp->sctp_flags, flags, (flags | SCTP_PCB_FLAGS_SOCKET_GONE | SCTP_PCB_FLAGS_CLOSE_IP)))) { -#ifdef SCTP_LOG_CLOSING - sctp_log_closing(inp, NULL, 16); -#endif - sctp_inpcb_free(inp, SCTP_FREE_SHOULD_USE_ABORT, - SCTP_CALLED_AFTER_CMPSET_OFCLOSE); - SOCK_LOCK(so); - SCTP_SB_CLEAR(so->so_snd); - /* - * same for the rcv ones, they are only here for the - * accounting/select. - */ - SCTP_SB_CLEAR(so->so_rcv); - /* Now null out the reference, we are completely detached. */ - so->so_pcb = NULL; - SOCK_UNLOCK(so); - } else { - flags = inp->sctp_flags; - if ((flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) { - goto sctp_must_try_again; - } - } - NET_EPOCH_EXIT(et); - return; -} - static int sctp6_attach(struct socket *so, int proto SCTP_UNUSED, struct thread *p SCTP_UNUSED) { @@ -1191,7 +1145,7 @@ sctp6_getpeeraddr(struct socket *so, struct sockaddr **nam) } struct pr_usrreqs sctp6_usrreqs = { - .pru_abort = sctp6_abort, + .pru_abort = sctp_abort, .pru_accept = sctp_accept, .pru_attach = sctp6_attach, .pru_bind = sctp6_bind,