Deleted Added
full compact
in6_pcb.c (54952) in6_pcb.c (55009)
1/*
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*
2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/sys/netinet6/in6_pcb.c 54952 1999-12-21 11:14:12Z eivind $
29 * $FreeBSD: head/sys/netinet6/in6_pcb.c 55009 1999-12-22 19:13:38Z shin $
30 */
31
32/*
33 * Copyright (c) 1982, 1986, 1991, 1993
34 * The Regents of the University of California. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions

--- 19 unchanged lines hidden (view full) ---

57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 * SUCH DAMAGE.
63 *
64 * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94
30 */
31
32/*
33 * Copyright (c) 1982, 1986, 1991, 1993
34 * The Regents of the University of California. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions

--- 19 unchanged lines hidden (view full) ---

57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 * SUCH DAMAGE.
63 *
64 * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94
65 * $FreeBSD: head/sys/netinet6/in6_pcb.c 54952 1999-12-21 11:14:12Z eivind $
65 * $FreeBSD: head/sys/netinet6/in6_pcb.c 55009 1999-12-22 19:13:38Z shin $
66 */
67
66 */
67
68#include "opt_key.h"
68#include "opt_ipsec.h"
69
70#include <sys/param.h>
71#include <sys/systm.h>
72#include <sys/malloc.h>
73#include <sys/mbuf.h>
74#include <sys/protosw.h>
75#include <sys/socket.h>
76#include <sys/socketvar.h>

--- 17 unchanged lines hidden (view full) ---

94#include <netinet6/nd6.h>
95#include <netinet/in_pcb.h>
96#include <netinet6/in6_pcb.h>
97
98#include "faith.h"
99
100#ifdef IPSEC
101#include <netinet6/ipsec.h>
69
70#include <sys/param.h>
71#include <sys/systm.h>
72#include <sys/malloc.h>
73#include <sys/mbuf.h>
74#include <sys/protosw.h>
75#include <sys/socket.h>
76#include <sys/socketvar.h>

--- 17 unchanged lines hidden (view full) ---

94#include <netinet6/nd6.h>
95#include <netinet/in_pcb.h>
96#include <netinet6/in6_pcb.h>
97
98#include "faith.h"
99
100#ifdef IPSEC
101#include <netinet6/ipsec.h>
102#include <netinet6/ah.h>
102#include <netinet6/ipsec6.h>
103#include <netinet6/ipsec6.h>
104#include <netinet6/ah6.h>
103#include <netkey/key.h>
105#include <netkey/key.h>
104#ifdef KEY_DEBUG
106#ifdef IPSEC_DEBUG
105#include <netkey/key_debug.h>
106#else
107#include <netkey/key_debug.h>
108#else
107#define DPRINTF(lev,arg)
108#define DDO(lev, stmt)
109#define DP(x, y, z)
110#endif /* KEY_DEBUG */
109#define KEYDEBUG(lev,arg)
110#endif /* IPSEC_DEBUG */
111#endif /* IPSEC */
112
113struct in6_addr zeroin6_addr;
114
115int
116in6_pcbbind(inp, nam, p)
117 register struct inpcb *inp;
118 struct sockaddr *nam;

--- 1005 unchanged lines hidden ---
111#endif /* IPSEC */
112
113struct in6_addr zeroin6_addr;
114
115int
116in6_pcbbind(inp, nam, p)
117 register struct inpcb *inp;
118 struct sockaddr *nam;

--- 1005 unchanged lines hidden ---