Deleted Added
full compact
ip6_input.c (121806) ip6_input.c (122320)
1/* $FreeBSD: head/sys/netinet6/ip6_input.c 121806 2003-10-31 15:57:02Z ume $ */
1/* $FreeBSD: head/sys/netinet6/ip6_input.c 122320 2003-11-08 22:28:40Z sam $ */
2/* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei 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

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

191 inet6_pfil_hook.ph_type = PFIL_TYPE_AF;
192 inet6_pfil_hook.ph_af = AF_INET6;
193 if ((i = pfil_head_register(&inet6_pfil_hook)) != 0)
194 printf("%s: WARNING: unable to register pfil hook, "
195 "error %d\n", __func__, i);
196#endif /* PFIL_HOOKS */
197 ip6intrq.ifq_maxlen = ip6qmaxlen;
198 mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF);
2/* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei 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

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

191 inet6_pfil_hook.ph_type = PFIL_TYPE_AF;
192 inet6_pfil_hook.ph_af = AF_INET6;
193 if ((i = pfil_head_register(&inet6_pfil_hook)) != 0)
194 printf("%s: WARNING: unable to register pfil hook, "
195 "error %d\n", __func__, i);
196#endif /* PFIL_HOOKS */
197 ip6intrq.ifq_maxlen = ip6qmaxlen;
198 mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF);
199 netisr_register(NETISR_IPV6, ip6_input, &ip6intrq);
199 netisr_register(NETISR_IPV6, ip6_input, &ip6intrq, 0);
200 scope6_init();
201 addrsel_policy_init();
202 nd6_init();
203 frag6_init();
204#ifndef RANDOM_IP_ID
205 ip6_flow_seq = arc4random();
206#endif
207 ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR;

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

244 u_int32_t rtalert = ~0;
245 int nxt, ours = 0;
246 struct ifnet *deliverifp = NULL;
247#ifdef PFIL_HOOKS
248 struct in6_addr odst;
249#endif
250 int srcrt = 0;
251
200 scope6_init();
201 addrsel_policy_init();
202 nd6_init();
203 frag6_init();
204#ifndef RANDOM_IP_ID
205 ip6_flow_seq = arc4random();
206#endif
207 ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR;

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

244 u_int32_t rtalert = ~0;
245 int nxt, ours = 0;
246 struct ifnet *deliverifp = NULL;
247#ifdef PFIL_HOOKS
248 struct in6_addr odst;
249#endif
250 int srcrt = 0;
251
252 GIANT_REQUIRED; /* XXX for now */
252#ifdef IPSEC
253 /*
254 * should the inner packet be considered authentic?
255 * see comment in ah4_input().
256 */
257 if (m) {
258 m->m_flags &= ~M_AUTHIPHDR;
259 m->m_flags &= ~M_AUTHIPDGM;

--- 1316 unchanged lines hidden ---
253#ifdef IPSEC
254 /*
255 * should the inner packet be considered authentic?
256 * see comment in ah4_input().
257 */
258 if (m) {
259 m->m_flags &= ~M_AUTHIPHDR;
260 m->m_flags &= ~M_AUTHIPDGM;

--- 1316 unchanged lines hidden ---