Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netipsec Remove in_pcb_hdr.h
details: https://anonhg.NetBSD.org/src/rev/2cd7e680f4f7
branches: trunk
changeset: 372130:2cd7e680f4f7
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Oct 28 05:23:09 2022 +0000
description:
Remove in_pcb_hdr.h
diffstat:
distrib/sets/lists/comp/mi | 4 +-
sys/netinet/Makefile | 4 +-
sys/netinet/in_pcb.h | 3 +-
sys/netinet/in_pcb_hdr.h | 145 ---------------------------------------------
sys/netipsec/ipsec.h | 3 +-
5 files changed, 6 insertions(+), 153 deletions(-)
diffs (216 lines):
diff -r 28d4ef95e444 -r 2cd7e680f4f7 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Fri Oct 28 05:20:08 2022 +0000
+++ b/distrib/sets/lists/comp/mi Fri Oct 28 05:23:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2424 2022/09/20 07:19:14 ozaki-r Exp $
+# $NetBSD: mi,v 1.2425 2022/10/28 05:23:09 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2706,7 +2706,7 @@
./usr/include/netinet/in_l2tp.h comp-c-include
./usr/include/netinet/in_offload.h comp-c-include
./usr/include/netinet/in_pcb.h comp-c-include
-./usr/include/netinet/in_pcb_hdr.h comp-c-include
+./usr/include/netinet/in_pcb_hdr.h comp-obsolete obsolete
./usr/include/netinet/in_route.h comp-obsolete obsolete
./usr/include/netinet/in_selsrc.h comp-c-include
./usr/include/netinet/in_systm.h comp-c-include
diff -r 28d4ef95e444 -r 2cd7e680f4f7 sys/netinet/Makefile
--- a/sys/netinet/Makefile Fri Oct 28 05:20:08 2022 +0000
+++ b/sys/netinet/Makefile Fri Oct 28 05:23:09 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2022/09/20 07:19:14 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.32 2022/10/28 05:23:09 ozaki-r Exp $
INCSDIR= /usr/include/netinet
INCS= dccp.h icmp6.h icmp_var.h if_ether.h if_inarp.h igmp.h \
- igmp_var.h in.h in_gif.h in_l2tp.h in_pcb.h in_pcb_hdr.h \
+ igmp_var.h in.h in_gif.h in_l2tp.h in_pcb.h \
in_offload.h in_selsrc.h in_systm.h \
in_var.h ip.h ip_carp.h ip6.h ip_ecn.h ip_encap.h \
ip_icmp.h ip_mroute.h ip_var.h pim.h pim_var.h portalgo.h \
diff -r 28d4ef95e444 -r 2cd7e680f4f7 sys/netinet/in_pcb.h
--- a/sys/netinet/in_pcb.h Fri Oct 28 05:20:08 2022 +0000
+++ b/sys/netinet/in_pcb.h Fri Oct 28 05:23:09 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.h,v 1.71 2022/10/28 05:18:39 ozaki-r Exp $ */
+/* $NetBSD: in_pcb.h,v 1.72 2022/10/28 05:23:09 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -68,7 +68,6 @@
#include <net/route.h>
#include <netinet/in.h>
-#include <netinet/in_pcb_hdr.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>
diff -r 28d4ef95e444 -r 2cd7e680f4f7 sys/netinet/in_pcb_hdr.h
--- a/sys/netinet/in_pcb_hdr.h Fri Oct 28 05:20:08 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/* $NetBSD: in_pcb_hdr.h,v 1.15 2020/08/28 07:01:57 riastradh Exp $ */
-
-/*
- * Copyright (C) 2003 WIDE Project.
- * All rights reserved.
- *
- * 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 project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * 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
- */
-
-#ifndef _NETINET_IN_PCB_HDR_H_
-#define _NETINET_IN_PCB_HDR_H_
-
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-
-struct inpcbpolicy;
-struct inpcbtable;
-struct mbuf;
-struct sockaddr;
-struct socket;
-
-/*
- * align it with inpcb and in6pcb!
- */
-struct inpcb_hdr {
- LIST_ENTRY(inpcb_hdr) inph_hash;
- LIST_ENTRY(inpcb_hdr) inph_lhash;
- TAILQ_ENTRY(inpcb_hdr) inph_queue;
- int inph_af; /* address family - AF_INET */
- void * inph_ppcb; /* pointer to per-protocol pcb */
- int inph_state; /* bind/connect state */
- int inph_portalgo;
- struct socket *inph_socket; /* back pointer to socket */
- struct inpcbtable *inph_table;
- struct inpcbpolicy *inph_sp; /* security policy */
-};
-
-#define sotoinpcb_hdr(so) ((struct inpcb_hdr *)(so)->so_pcb)
-#define inph_locked(inph) (solocked((inph)->inph_socket))
-
-LIST_HEAD(inpcbhead, inpcb_hdr);
-
-struct vestigial_inpcb;
-struct in6_addr;
-
-/* Hooks for vestigial pcb entries.
- * If vestigial entries exist for a table (TCP only)
- * the vestigial pointer is set.
- */
-typedef struct vestigial_hooks {
- /* IPv4 hooks */
- void *(*init_ports4)(struct in_addr, u_int, int);
- int (*next_port4)(void *, struct vestigial_inpcb *);
- int (*lookup4)(struct in_addr, uint16_t,
- struct in_addr, uint16_t,
- struct vestigial_inpcb *);
- /* IPv6 hooks */
- void *(*init_ports6)(const struct in6_addr*, u_int, int);
- int (*next_port6)(void *, struct vestigial_inpcb *);
- int (*lookup6)(const struct in6_addr *, uint16_t,
- const struct in6_addr *, uint16_t,
- struct vestigial_inpcb *);
-} vestigial_hooks_t;
-
-TAILQ_HEAD(inpcbqueue, inpcb_hdr);
-
-struct inpcbtable {
- struct inpcbqueue inpt_queue;
- struct inpcbhead *inpt_porthashtbl;
- struct inpcbhead *inpt_bindhashtbl;
- struct inpcbhead *inpt_connecthashtbl;
- u_long inpt_porthash;
- u_long inpt_bindhash;
- u_long inpt_connecthash;
- u_int16_t inpt_lastport;
- u_int16_t inpt_lastlow;
-
- vestigial_hooks_t *vestige;
-};
-#define inpt_lasthi inpt_lastport
-
-/* states in inp_state: */
-#define INP_ATTACHED 0
-#define INP_BOUND 1
-#define INP_CONNECTED 2
-
-typedef int (*pcb_overudp_cb_t)(struct mbuf **, int, struct socket *,
- struct sockaddr *, void *);
-
-#endif /* !_NETINET_IN_PCB_HDR_H_ */
diff -r 28d4ef95e444 -r 2cd7e680f4f7 sys/netipsec/ipsec.h
--- a/sys/netipsec/ipsec.h Fri Oct 28 05:20:08 2022 +0000
+++ b/sys/netipsec/ipsec.h Fri Oct 28 05:23:09 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.92 2022/10/28 05:18:39 ozaki-r Exp $ */
+/* $NetBSD: ipsec.h,v 1.93 2022/10/28 05:23:09 ozaki-r Exp $ */
/* $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -45,7 +45,6 @@
#include <sys/socketvar.h>
#include <sys/localcount.h>
-#include <netinet/in_pcb_hdr.h>
#include <netinet/in_pcb.h>
#include <netipsec/keydb.h>
Home |
Main Index |
Thread Index |
Old Index