Deleted Added
full compact
in6_proto.c (120856) in6_proto.c (120913)
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 120856 2003-10-06 14:02:09Z ume $ */
1/* $FreeBSD: head/sys/netinet6/in6_proto.c 120913 2003-10-08 18:26:08Z ume $ */
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

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

182{ SOCK_RAW, &inet6domain, IPPROTO_ICMPV6, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
183 icmp6_input, rip6_output, rip6_ctlinput, rip6_ctloutput,
184 0,
185 icmp6_init, icmp6_fasttimo, 0, 0,
186 &rip6_usrreqs
187},
188{ SOCK_RAW, &inet6domain, IPPROTO_DSTOPTS,PR_ATOMIC|PR_ADDR,
189 dest6_input, 0, 0, 0,
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

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

182{ SOCK_RAW, &inet6domain, IPPROTO_ICMPV6, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
183 icmp6_input, rip6_output, rip6_ctlinput, rip6_ctloutput,
184 0,
185 icmp6_init, icmp6_fasttimo, 0, 0,
186 &rip6_usrreqs
187},
188{ SOCK_RAW, &inet6domain, IPPROTO_DSTOPTS,PR_ATOMIC|PR_ADDR,
189 dest6_input, 0, 0, 0,
190 0,
190 0,
191 0, 0, 0, 0,
192 &nousrreqs
193},
194{ SOCK_RAW, &inet6domain, IPPROTO_ROUTING,PR_ATOMIC|PR_ADDR,
195 route6_input, 0, 0, 0,
191 0, 0, 0, 0,
192 &nousrreqs
193},
194{ SOCK_RAW, &inet6domain, IPPROTO_ROUTING,PR_ATOMIC|PR_ADDR,
195 route6_input, 0, 0, 0,
196 0,
196 0,
197 0, 0, 0, 0,
198 &nousrreqs
199},
200{ SOCK_RAW, &inet6domain, IPPROTO_FRAGMENT,PR_ATOMIC|PR_ADDR,
201 frag6_input, 0, 0, 0,
197 0, 0, 0, 0,
198 &nousrreqs
199},
200{ SOCK_RAW, &inet6domain, IPPROTO_FRAGMENT,PR_ATOMIC|PR_ADDR,
201 frag6_input, 0, 0, 0,
202 0,
202 0,
203 0, 0, 0, 0,
204 &nousrreqs
205},
206#ifdef IPSEC
207{ SOCK_RAW, &inet6domain, IPPROTO_AH, PR_ATOMIC|PR_ADDR,
208 ah6_input, 0, 0, 0,
203 0, 0, 0, 0,
204 &nousrreqs
205},
206#ifdef IPSEC
207{ SOCK_RAW, &inet6domain, IPPROTO_AH, PR_ATOMIC|PR_ADDR,
208 ah6_input, 0, 0, 0,
209 0,
209 0,
210 0, 0, 0, 0,
211 &nousrreqs,
212},
213#ifdef IPSEC_ESP
214{ SOCK_RAW, &inet6domain, IPPROTO_ESP, PR_ATOMIC|PR_ADDR,
215 esp6_input, 0,
216 esp6_ctlinput,
217 0,
218 0,
219 0, 0, 0, 0,
220 &nousrreqs,
221},
222#endif
223{ SOCK_RAW, &inet6domain, IPPROTO_IPCOMP, PR_ATOMIC|PR_ADDR,
224 ipcomp6_input, 0, 0, 0,
210 0, 0, 0, 0,
211 &nousrreqs,
212},
213#ifdef IPSEC_ESP
214{ SOCK_RAW, &inet6domain, IPPROTO_ESP, PR_ATOMIC|PR_ADDR,
215 esp6_input, 0,
216 esp6_ctlinput,
217 0,
218 0,
219 0, 0, 0, 0,
220 &nousrreqs,
221},
222#endif
223{ SOCK_RAW, &inet6domain, IPPROTO_IPCOMP, PR_ATOMIC|PR_ADDR,
224 ipcomp6_input, 0, 0, 0,
225 0,
225 0,
226 0, 0, 0, 0,
227 &nousrreqs,
228},
229#endif /* IPSEC */
230#ifdef INET
231{ SOCK_RAW, &inet6domain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
232 encap6_input, rip6_output, 0, rip6_ctloutput,
233 0,

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

294int ip6_dad_count = 1; /* DupAddrDetectionTransmits */
295#ifndef RANDOM_IP_ID
296u_int32_t ip6_flow_seq;
297#endif
298int ip6_auto_flowlabel = 1;
299int ip6_gif_hlim = 0;
300int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
301int ip6_rr_prune = 5; /* router renumbering prefix
226 0, 0, 0, 0,
227 &nousrreqs,
228},
229#endif /* IPSEC */
230#ifdef INET
231{ SOCK_RAW, &inet6domain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
232 encap6_input, rip6_output, 0, rip6_ctloutput,
233 0,

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

294int ip6_dad_count = 1; /* DupAddrDetectionTransmits */
295#ifndef RANDOM_IP_ID
296u_int32_t ip6_flow_seq;
297#endif
298int ip6_auto_flowlabel = 1;
299int ip6_gif_hlim = 0;
300int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
301int ip6_rr_prune = 5; /* router renumbering prefix
302 * walk list every 5 sec. */
302 * walk list every 5 sec. */
303int ip6_v6only = 1;
304
305#ifndef RANDOM_IP_ID
306u_int32_t ip6_id = 0UL;
307#endif
308int ip6_keepfaith = 0;
309time_t ip6_log_time = (time_t)0L;
310

--- 155 unchanged lines hidden ---
303int ip6_v6only = 1;
304
305#ifndef RANDOM_IP_ID
306u_int32_t ip6_id = 0UL;
307#endif
308int ip6_keepfaith = 0;
309time_t ip6_log_time = (time_t)0L;
310

--- 155 unchanged lines hidden ---