From nobody Mon Nov 20 22:38:44 2023 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 4SZ2VF15mXz51CKG; Mon, 20 Nov 2023 22:38: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 4SZ2VF0KP7z4NRC; Mon, 20 Nov 2023 22:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700519925; 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=hzraNAlo2w/BLcQq/T3F0UuBhb+Vn/qXTJtQQVtzNSA=; b=cRQfzTuZKGxXjNS4HIkBIZ7Bcdxm71kTKNF/EwB2m/2wGQoiAoio9PU90K34pqBhD0bZEf r36VuggBdON5DBaKnpjXwdpBOEs4OkUM7iTc6xVgwfIv+sio8dGWHd6Iiz37n4dzoBUyWj lXW2w+u/RmNuCfw7AQQKZLp5Ex5z3M84qyIjjfFqvzEfay1Vt4R46yzo0eCur9bm0xJ+Wl JjB525DS75nX+RiB/KcBI4G/rlxWq7eipMlm7848GvXEz3zxFxo1C5GmP1OtN34OOFdQfo qnJxMccrp1dz/azhf9/mJ7jEmy9yhNyskOQaeU7MiUXxIOvduHeXOb1dhAfzNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700519925; 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=hzraNAlo2w/BLcQq/T3F0UuBhb+Vn/qXTJtQQVtzNSA=; b=EBzCUTm8MTC6/G37N9O8EkwOB0w3by1j+RopHw8I7g8KFTmuprtmy+eUhwBSQY7cNwMwVp nSIKzhZOI8MIE53vBzKsLx6YY+qiMDRONEbUvA7+kxAfLmn2/sMEx1O400EGPxMwdpIytD NfU5m+hKpbUxP1fN99/jxL48oyNe2GqIy0TXj29y2yZlHEPIYKyAIfULM7ilhKTa+lIsvr a1eTNWYJXJd3742u+Ch5eyl2jI/5Q/KN/lulqRmCGVpW73eG7kS24wSL9MEM6tBpyjfjLO NxZEz6JdNscZNZCnzJXjdQ6VSrUBjmwENTQZqhKScdFieV7kBBl1qcGTb4VX4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700519925; a=rsa-sha256; cv=none; b=sIXdHVmsADLd0qbliHBlpX6Cxek4MikUlXqTQET+UG4toDuseJyqT81Yqu1n4jy60ZH6c8 RhCgclA3G755TvCb4XThs4KOtBQS/z+2OrqEwk3yo8vJ6gg+V9SpO4gIXf6e5ptaDcdVCJ PgVTIHgHQ2ysgy7dQKrGGD5kz9naD3zJQctaQzmF9WFVS4HoKrSEQIPuVDT9piuklo38Mf scj4dQI8xJtcdstdflqXEFubvFvdK+jYAxAZrZ3/qsmQXaKOpq/pEbdT+RIGXsFZXU6gjR qR9MYjWqwzLfjq6LrIdy+UlONS7E2q0rsauDeNjFCUMAqrMRC1MbjAaKx497MQ== 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 4SZ2VD6WPTz18f7; Mon, 20 Nov 2023 22:38:44 +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 3AKMciq5041707; Mon, 20 Nov 2023 22:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKMciB6041704; Mon, 20 Nov 2023 22:38:44 GMT (envelope-from git) Date: Mon, 20 Nov 2023 22:38:44 GMT Message-Id: <202311202238.3AKMciB6041704@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: bbbd7aab1bed - main - inpcb: garbage collect in_pcbnotifyall() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbbd7aab1bed9122e7137ee0957d50c9ef22b315 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bbbd7aab1bed9122e7137ee0957d50c9ef22b315 commit bbbd7aab1bed9122e7137ee0957d50c9ef22b315 Author: Gleb Smirnoff AuthorDate: 2023-11-20 22:38:31 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-20 22:38:31 +0000 inpcb: garbage collect in_pcbnotifyall() --- sys/netinet/in_pcb.c | 28 +--------------------------- sys/netinet/in_pcb.h | 2 -- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 2586c107ceaf..dbae52103c61 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1805,7 +1805,7 @@ inpcb_fini(void *mem, int size) * in_pcbdetach(). * * XXXRW: Possibly in_pcbdrop() should also prevent future notifications by - * in_pcbnotifyall() and in_pcbpurgeif0()? + * in_pcbpurgeif0()? */ void in_pcbdrop(struct inpcb *inp) @@ -1879,32 +1879,6 @@ in_getpeeraddr(struct socket *so, struct sockaddr **nam) return 0; } -void -in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr faddr, int errno, - struct inpcb *(*notify)(struct inpcb *, int)) -{ - struct inpcb *inp, *inp_temp; - - INP_INFO_WLOCK(pcbinfo); - CK_LIST_FOREACH_SAFE(inp, &pcbinfo->ipi_listhead, inp_list, inp_temp) { - INP_WLOCK(inp); -#ifdef INET6 - if ((inp->inp_vflag & INP_IPV4) == 0) { - INP_WUNLOCK(inp); - continue; - } -#endif - if (inp->inp_faddr.s_addr != faddr.s_addr || - inp->inp_socket == NULL) { - INP_WUNLOCK(inp); - continue; - } - if ((*notify)(inp, errno)) - INP_WUNLOCK(inp); - } - INP_INFO_WUNLOCK(pcbinfo); -} - static bool inp_v4_multi_match(const struct inpcb *inp, void *v __unused) { diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 19d281937b52..aa9bcade4b32 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -686,8 +686,6 @@ struct inpcb * struct inpcb * in_pcblookup_mbuf(struct inpcbinfo *, struct in_addr, u_int, struct in_addr, u_int, int, struct ifnet *, struct mbuf *); -void in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr, - int, struct inpcb *(*)(struct inpcb *, int)); void in_pcbref(struct inpcb *); void in_pcbrehash(struct inpcb *); void in_pcbremhash_locked(struct inpcb *);