git: 0f617ae48a91 - main - Add in_pcb_var.h for KPIs that are private to in_pcb.c and in6_pcb.c.

The branch main has been updated by glebius:

URL: https://cgit.FreeBSD.org/src/commit/?id=0f617ae48a911caab3130d0e80cfb425bc3b653b

commit 0f617ae48a911caab3130d0e80cfb425bc3b653b
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2021-10-18 17:14:03 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2021-10-18 17:19:57 +0000

    Add in_pcb_var.h for KPIs that are private to in_pcb.c and in6_pcb.c.
---
 sys/netinet/in_pcb.c     |  1 +
 sys/netinet/in_pcb.h     |  8 -------
 sys/netinet/in_pcb_var.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 sys/netinet6/in6_pcb.c   |  1 +
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index e267d25c4f69..1a7639c0137b 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_pcb_var.h>
 #ifdef INET
 #include <netinet/in_var.h>
 #include <netinet/in_fib.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 861c0ba5f0aa..d6a335236599 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -826,11 +826,6 @@ void	in_pcbgroup_update_mbuf(struct inpcb *, struct mbuf *);
 void	in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);
 int	in_pcballoc(struct socket *, struct inpcbinfo *);
 int	in_pcbbind(struct inpcb *, struct sockaddr *, struct ucred *);
-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);
-int	in_pcb_lport(struct inpcb *, struct in_addr *, u_short *,
-	    struct ucred *, int);
 int	in_pcbbind_setup(struct inpcb *, struct sockaddr *, in_addr_t *,
 	    u_short *, struct ucred *);
 int	in_pcbconnect(struct inpcb *, struct sockaddr *, struct ucred *);
@@ -848,9 +843,6 @@ int	in_pcbinshash_mbuf(struct inpcb *, struct mbuf *);
 int	in_pcbladdr(struct inpcb *, struct in_addr *, struct in_addr *,
 	    struct ucred *);
 int	in_pcblbgroup_numa(struct inpcb *, int arg);
-struct inpcb *
-	in_pcblookup_local(struct inpcbinfo *,
-	    struct in_addr, u_short, int, struct ucred *);
 struct inpcb *
 	in_pcblookup(struct inpcbinfo *, struct in_addr, u_int,
 	    struct in_addr, u_int, int, struct ifnet *);
diff --git a/sys/netinet/in_pcb_var.h b/sys/netinet/in_pcb_var.h
new file mode 100644
index 000000000000..5038ab404871
--- /dev/null
+++ b/sys/netinet/in_pcb_var.h
@@ -0,0 +1,55 @@
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1982, 1986, 1990, 1993
+ *	The Regents of the University of California.
+ * Copyright (c) 2010-2011 Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Robert N. M. Watson under
+ * contract to Juniper Networks, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
+ */
+
+#ifndef _NETINET_IN_PCB_VAR_H_
+#define _NETINET_IN_PCB_VAR_H_
+
+/*
+ * Definitions shared between netinet/in_pcb.c and netinet6/in6_pcb.c
+ */
+
+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,
+            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,
+	    int, struct ucred *);
+
+#endif /* !_NETINET_IN_PCB_VAR_H_ */
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 10a29f339773..9a5d69e16a1c 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -110,6 +110,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_pcb_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/in6_fib.h>
 #include <netinet6/scope6_var.h>