Deleted Added
full compact
in6_proto.c (139826) in6_proto.c (142215)
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 139826 2005-01-07 02:30:35Z imp $ */
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 142215 2005-02-22 13:04:05Z glebius $ */
2/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

59 * SUCH DAMAGE.
60 *
61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
62 */
63
64#include "opt_inet.h"
65#include "opt_inet6.h"
66#include "opt_ipsec.h"
2/* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */
3
4/*-
5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

59 * SUCH DAMAGE.
60 *
61 * @(#)in_proto.c 8.1 (Berkeley) 6/10/93
62 */
63
64#include "opt_inet.h"
65#include "opt_inet6.h"
66#include "opt_ipsec.h"
67#include "opt_carp.h"
67
68#include <sys/param.h>
69#include <sys/socket.h>
70#include <sys/socketvar.h>
71#include <sys/protosw.h>
72#include <sys/kernel.h>
73#include <sys/domain.h>
74#include <sys/mbuf.h>

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

116#endif
117#endif
118#include <netinet6/ipcomp.h>
119#ifdef INET6
120#include <netinet6/ipcomp6.h>
121#endif
122#endif /* IPSEC */
123
68
69#include <sys/param.h>
70#include <sys/socket.h>
71#include <sys/socketvar.h>
72#include <sys/protosw.h>
73#include <sys/kernel.h>
74#include <sys/domain.h>
75#include <sys/mbuf.h>

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

117#endif
118#endif
119#include <netinet6/ipcomp.h>
120#ifdef INET6
121#include <netinet6/ipcomp6.h>
122#endif
123#endif /* IPSEC */
124
125#ifdef DEV_CARP
126#include <netinet/ip_carp.h>
127#endif
128
124#ifdef FAST_IPSEC
125#include <netipsec/ipsec6.h>
126#define IPSEC
127#define IPSEC_ESP
128#define ah6_input ipsec6_common_input
129#define esp6_input ipsec6_common_input
130#define ipcomp6_input ipsec6_common_input
131#endif /* FAST_IPSEC */

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

236 &rip6_usrreqs
237},
238{ SOCK_RAW, &inet6domain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
239 pim6_input, rip6_output, 0, rip6_ctloutput,
240 0,
241 0, 0, 0, 0,
242 &rip6_usrreqs
243},
129#ifdef FAST_IPSEC
130#include <netipsec/ipsec6.h>
131#define IPSEC
132#define IPSEC_ESP
133#define ah6_input ipsec6_common_input
134#define esp6_input ipsec6_common_input
135#define ipcomp6_input ipsec6_common_input
136#endif /* FAST_IPSEC */

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

241 &rip6_usrreqs
242},
243{ SOCK_RAW, &inet6domain, IPPROTO_PIM, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
244 pim6_input, rip6_output, 0, rip6_ctloutput,
245 0,
246 0, 0, 0, 0,
247 &rip6_usrreqs
248},
249#ifdef DEV_CARP
250{ SOCK_RAW, &inet6domain, IPPROTO_CARP, PR_ATOMIC|PR_ADDR,
251 carp6_input, rip6_output, 0, rip6_ctloutput,
252 0,
253 0, 0, 0, 0,
254 &rip6_usrreqs
255},
256#endif /* DEV_CARP */
244/* raw wildcard */
245{ SOCK_RAW, &inet6domain, 0, PR_ATOMIC|PR_ADDR,
246 rip6_input, rip6_output, 0, rip6_ctloutput,
247 0,
248 0, 0, 0, 0,
249 &rip6_usrreqs
250},
251};

--- 208 unchanged lines hidden ---
257/* raw wildcard */
258{ SOCK_RAW, &inet6domain, 0, PR_ATOMIC|PR_ADDR,
259 rip6_input, rip6_output, 0, rip6_ctloutput,
260 0,
261 0, 0, 0, 0,
262 &rip6_usrreqs
263},
264};

--- 208 unchanged lines hidden ---