From nobody Mon Feb 17 23:31:04 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 4Yxf6c5hXHz5nbhD; Mon, 17 Feb 2025 23:31:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yxf6c3GW0z420t; Mon, 17 Feb 2025 23:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739835064; 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=grVQukQ1FsGQelV/N+HFSM/OXV1i2taNwK3LhBo+RQ8=; b=ln8KX9ZFhyDnZyFnd8qWCJc9zDjHfMQdbd9oTQz2G/6mKd/wK66dr4SnckZp73fnmdMrSA EY9jMUgqoPAeHn3N11WQkkJukIh0rNI/7O6/lJrYeqdD3oLJ+ZPZrlPKndttXKldP+vZ+S vTVOnXdtugAhbTxZy12+g0xExvIl7P2sKisMVVnlWG5rEV6mnBt9US61zp5DGF1oCfFOX4 3DuftYxabgig5XDyWRoLAjebNl2Weh0RB6iBkM0NgjDDNvp0mO5xp0TZ07RyR8GKNgu4oS MKsHHJxrjfNXYXfyhoVz8HKlMjhK46er+8+SGmNicR2n/TndJugz6d8FjowKbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739835064; a=rsa-sha256; cv=none; b=IqkfDYof1ggYHZcN1b9/Vio+JSlsMINk7OwWOpLWinBiqDKH7vMRg0F5P05TqvB1UG/HrP G7lsLEbjE7eIMKTW/bdjCNrocvXT6rM/cT+IqkIaiRdkDpKxhPLJhh7PqHtYPE5X8UxXMN P6arhCs2F8t1jR3FhTmM2jpuywA/iWK+LuMCNxeGEUN8MdzeW8D9xPtETlApgoDYgd4ATo NUDzwSvSsSsZX/X0wXb60oCAIqK4iUY3VszKnjs/1/sz+3C8IwU9qP9OMn5e8jKDzVTW5R YMdhauqypR/+yLWX5wXnoWHBccX+p8KI5sGqGiCXL2Gf9gQ/2H4hRRmSS2l8Jw== 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=1739835064; 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=grVQukQ1FsGQelV/N+HFSM/OXV1i2taNwK3LhBo+RQ8=; b=J7pUhAfNYwXhJZHSecQbAv0F3EROwH59ZYook+CrVr7nr3ALrUwYPyjg+jbgD4v68JMqHz DqDoBqk4SqxekkKhsjflUZRZgrkmn27c1BR7Hy6Br7pvCxNYEOLVkUHrfBfhgep4jODYtV usRXfOlYwHDbJNt6t4L3Oljd14TgtQe7WoJCb3opLQsMP7VFSUQ2saZ5LvYwQ7g4bhfqMQ I9KlGCI/jE+E90vLoiuJCEZPPp1OeH4l0etcCmBSQKJYWsmbxaJttHPJCJoXML5CPRZ2O4 BuZX3oTulIogAnaGkzA6Vyv/x9Hy1rjkn5UN+J8pwGwLS2qgYbnq/t4wyof6Jg== 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 4Yxf6c21K8zvDF; Mon, 17 Feb 2025 23:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51HNV4Pe067208; Mon, 17 Feb 2025 23:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51HNV45E067205; Mon, 17 Feb 2025 23:31:04 GMT (envelope-from git) Date: Mon, 17 Feb 2025 23:31:04 GMT Message-Id: <202502172331.51HNV45E067205@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: bafe022b1f31 - main - inpcb: add const qualifiers on functions that select address/port 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: bafe022b1f31c6b61aedc1a36a416270038bd971 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bafe022b1f31c6b61aedc1a36a416270038bd971 commit bafe022b1f31c6b61aedc1a36a416270038bd971 Author: Gleb Smirnoff AuthorDate: 2025-02-17 23:28:52 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-17 23:28:52 +0000 inpcb: add const qualifiers on functions that select address/port There are several functions that keep database locked and do address and port selection before a caller commits the changes to the inpcb. Mark the inpcb argument with a good documenting const. --- sys/netinet/in_pcb.c | 11 ++++++----- sys/netinet/in_pcb.h | 6 +++--- sys/netinet/in_pcb_var.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index c34b4594c9b9..9d174dce9024 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -754,8 +754,9 @@ in_pcbbind(struct inpcb *inp, struct sockaddr_in *sin, int flags, * lsa can be NULL for IPv6. */ int -in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, u_short *lportp, - struct sockaddr *fsa, u_short fport, struct ucred *cred, int lookupflags) +in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa, + u_short *lportp, struct sockaddr *fsa, u_short fport, struct ucred *cred, + int lookupflags) { struct inpcbinfo *pcbinfo; struct inpcb *tmpinp; @@ -1143,8 +1144,8 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) * of connect. Take jails into account as well. */ int -in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, - struct ucred *cred) +in_pcbladdr(const struct inpcb *inp, struct in_addr *faddr, + struct in_addr *laddr, struct ucred *cred) { struct ifaddr *ifa; struct sockaddr *sa; @@ -1360,7 +1361,7 @@ done: * and port. These are not updated in the error case. */ int -in_pcbconnect_setup(struct inpcb *inp, struct sockaddr_in *sin, +in_pcbconnect_setup(const struct inpcb *inp, struct sockaddr_in *sin, in_addr_t *laddrp, u_short *lportp, in_addr_t *faddrp, u_short *fportp, struct ucred *cred) { diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index dae34e94d6f9..b0c64cfbd7ea 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -645,13 +645,13 @@ int in_pcbbind(struct inpcb *, struct sockaddr_in *, int, struct ucred *); int in_pcbbind_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *, u_short *, int, struct ucred *); int in_pcbconnect(struct inpcb *, struct sockaddr_in *, struct ucred *); -int in_pcbconnect_setup(struct inpcb *, struct sockaddr_in *, in_addr_t *, - u_short *, in_addr_t *, u_short *, struct ucred *); +int in_pcbconnect_setup(const struct inpcb *, struct sockaddr_in *, + in_addr_t *, u_short *, in_addr_t *, u_short *, struct ucred *); void in_pcbdisconnect(struct inpcb *); void in_pcbdrop(struct inpcb *); void in_pcbfree(struct inpcb *); int in_pcbinshash(struct inpcb *); -int in_pcbladdr(struct inpcb *, struct in_addr *, struct in_addr *, +int in_pcbladdr(const struct inpcb *, struct in_addr *, struct in_addr *, struct ucred *); int in_pcblbgroup_numa(struct inpcb *, int arg); void in_pcblisten(struct inpcb *); diff --git a/sys/netinet/in_pcb_var.h b/sys/netinet/in_pcb_var.h index 1101199f6b64..e2b0ca386e7f 100644 --- a/sys/netinet/in_pcb_var.h +++ b/sys/netinet/in_pcb_var.h @@ -50,7 +50,7 @@ int inp_trylock(struct inpcb *inp, const inp_lookup_t lock); bool inp_smr_lock(struct inpcb *, const inp_lookup_t); int in_pcb_lport(struct inpcb *, struct in_addr *, u_short *, struct ucred *, int); -int in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, +int in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa, u_short *lportp, struct sockaddr *fsa, u_short fport, struct ucred *cred, int lookupflags); struct inpcb *in_pcblookup_local(struct inpcbinfo *, struct in_addr, u_short,