Deleted Added
full compact
nd6_nbr.c (54263) nd6_nbr.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/nd6_nbr.c 54263 1999-12-07 17:39:16Z shin $
29 * $FreeBSD: head/sys/netinet6/nd6_nbr.c 55009 1999-12-22 19:13:38Z shin $
30 */
31
30 */
31
32#include "opt_ipsec.h"
33
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/malloc.h>
35#include <sys/mbuf.h>
36#include <sys/socket.h>
37#include <sys/sockio.h>
38#include <sys/time.h>
39#include <sys/kernel.h>

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

418 bcopy(mac, (caddr_t)(nd_opt + 1), ifp->if_addrlen);
419 }
420
421 ip6->ip6_plen = htons((u_short)icmp6len);
422 nd_ns->nd_ns_cksum = 0;
423 nd_ns->nd_ns_cksum
424 = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
425
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/malloc.h>
37#include <sys/mbuf.h>
38#include <sys/socket.h>
39#include <sys/sockio.h>
40#include <sys/time.h>
41#include <sys/kernel.h>

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

420 bcopy(mac, (caddr_t)(nd_opt + 1), ifp->if_addrlen);
421 }
422
423 ip6->ip6_plen = htons((u_short)icmp6len);
424 nd_ns->nd_ns_cksum = 0;
425 nd_ns->nd_ns_cksum
426 = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
427
426#ifdef IPSEC
427 m->m_pkthdr.rcvif = NULL;
428#endif /*IPSEC*/
429 ip6_output(m, NULL, NULL, dad ? IPV6_DADOUTPUT : 0, &im6o, &outif);
430 if (outif) {
431 icmp6_ifstat_inc(outif, ifs6_out_msg);
432 icmp6_ifstat_inc(outif, ifs6_out_neighborsolicit);
433 }
434 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]++;
435}
436

--- 684 unchanged lines hidden ---
428 ip6_output(m, NULL, NULL, dad ? IPV6_DADOUTPUT : 0, &im6o, &outif);
429 if (outif) {
430 icmp6_ifstat_inc(outif, ifs6_out_msg);
431 icmp6_ifstat_inc(outif, ifs6_out_neighborsolicit);
432 }
433 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]++;
434}
435

--- 684 unchanged lines hidden ---