Deleted Added
full compact
dest6.c (185571) dest6.c (195699)
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

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

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 * $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $
30 */
31
32#include <sys/cdefs.h>
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

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

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 * $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet6/dest6.c 185571 2008-12-02 21:37:28Z bz $");
33__FBSDID("$FreeBSD: head/sys/netinet6/dest6.c 195699 2009-07-14 22:48:30Z rwatson $");
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/malloc.h>
41#include <sys/mbuf.h>

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

50#include <net/if.h>
51#include <net/route.h>
52
53#include <netinet/in.h>
54#include <netinet/in_var.h>
55#include <netinet/ip6.h>
56#include <netinet6/ip6_var.h>
57#include <netinet/icmp6.h>
34
35#include "opt_inet.h"
36#include "opt_inet6.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/malloc.h>
41#include <sys/mbuf.h>

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

50#include <net/if.h>
51#include <net/route.h>
52
53#include <netinet/in.h>
54#include <netinet/in_var.h>
55#include <netinet/ip6.h>
56#include <netinet6/ip6_var.h>
57#include <netinet/icmp6.h>
58#include <netinet6/vinet6.h>
59
60/*
61 * Destination options header processing.
62 */
63int
64dest6_input(struct mbuf **mp, int *offp, int proto)
65{
58
59/*
60 * Destination options header processing.
61 */
62int
63dest6_input(struct mbuf **mp, int *offp, int proto)
64{
66 INIT_VNET_INET6(curvnet);
67 struct mbuf *m = *mp;
68 int off = *offp, dstoptlen, optlen;
69 struct ip6_dest *dstopts;
70 u_int8_t *opt;
71
72 /* validation of the length of the header */
73#ifndef PULLDOWN_TEST
74 IP6_EXTHDR_CHECK(m, off, sizeof(*dstopts), IPPROTO_DONE);

--- 52 unchanged lines hidden ---
65 struct mbuf *m = *mp;
66 int off = *offp, dstoptlen, optlen;
67 struct ip6_dest *dstopts;
68 u_int8_t *opt;
69
70 /* validation of the length of the header */
71#ifndef PULLDOWN_TEST
72 IP6_EXTHDR_CHECK(m, off, sizeof(*dstopts), IPPROTO_DONE);

--- 52 unchanged lines hidden ---