Deleted Added
full compact
dest6.c (59760) dest6.c (62587)
1/* $FreeBSD: head/sys/netinet6/dest6.c 62587 2000-07-04 16:35:15Z itojun $ */
2/* $KAME: dest6.c,v 1.12 2000/05/05 11:00:57 sumikawa Exp $ */
3
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

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

20 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
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.
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
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright

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

23 * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/sys/netinet6/dest6.c 59760 2000-04-29 15:36:14Z phk $
30 */
31
31 */
32
33#include "opt_inet.h"
34#include "opt_inet6.h"
35
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/mbuf.h>
35#include <sys/domain.h>
36#include <sys/protosw.h>
37#include <sys/socket.h>
38#include <sys/errno.h>
39#include <sys/time.h>
40
41#include <net/if.h>
42#include <net/route.h>
43
44#include <netinet/in.h>
45#include <netinet/in_var.h>
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/mbuf.h>
39#include <sys/domain.h>
40#include <sys/protosw.h>
41#include <sys/socket.h>
42#include <sys/errno.h>
43#include <sys/time.h>
44
45#include <net/if.h>
46#include <net/route.h>
47
48#include <netinet/in.h>
49#include <netinet/in_var.h>
46#include <netinet6/ip6.h>
50#include
47#include <netinet6/ip6_var.h>
51#include <netinet6/ip6_var.h>
48#include <netinet6/icmp6.h>
52#include
49
50/*
51 * Destination options header processing.
52 */
53int
54dest6_input(mp, offp, proto)
55 struct mbuf **mp;
56 int *offp, proto;
57{
58 register struct mbuf *m = *mp;
59 int off = *offp, dstoptlen, optlen;
60 struct ip6_dest *dstopts;
61 u_int8_t *opt;
62
63 /* validation of the length of the header */
53
54/*
55 * Destination options header processing.
56 */
57int
58dest6_input(mp, offp, proto)
59 struct mbuf **mp;
60 int *offp, proto;
61{
62 register struct mbuf *m = *mp;
63 int off = *offp, dstoptlen, optlen;
64 struct ip6_dest *dstopts;
65 u_int8_t *opt;
66
67 /* validation of the length of the header */
68#ifndef PULLDOWN_TEST
64 IP6_EXTHDR_CHECK(m, off, sizeof(*dstopts), IPPROTO_DONE);
65 dstopts = (struct ip6_dest *)(mtod(m, caddr_t) + off);
69 IP6_EXTHDR_CHECK(m, off, sizeof(*dstopts), IPPROTO_DONE);
70 dstopts = (struct ip6_dest *)(mtod(m, caddr_t) + off);
71#else
72 IP6_EXTHDR_GET(dstopts, struct ip6_dest *, m, off, sizeof(*dstopts));
73 if (dstopts == NULL)
74 return IPPROTO_DONE;
75#endif
66 dstoptlen = (dstopts->ip6d_len + 1) << 3;
67
76 dstoptlen = (dstopts->ip6d_len + 1) << 3;
77
78#ifndef PULLDOWN_TEST
68 IP6_EXTHDR_CHECK(m, off, dstoptlen, IPPROTO_DONE);
69 dstopts = (struct ip6_dest *)(mtod(m, caddr_t) + off);
79 IP6_EXTHDR_CHECK(m, off, dstoptlen, IPPROTO_DONE);
80 dstopts = (struct ip6_dest *)(mtod(m, caddr_t) + off);
81#else
82 IP6_EXTHDR_GET(dstopts, struct ip6_dest *, m, off, dstoptlen);
83 if (dstopts == NULL)
84 return IPPROTO_DONE;
85#endif
70 off += dstoptlen;
71 dstoptlen -= sizeof(struct ip6_dest);
72 opt = (u_int8_t *)dstopts + sizeof(struct ip6_dest);
73
74 /* search header for all options. */
75 for (optlen = 0; dstoptlen > 0; dstoptlen -= optlen, opt += optlen) {
76 switch(*opt) {
77 case IP6OPT_PAD1:

--- 29 unchanged lines hidden ---
86 off += dstoptlen;
87 dstoptlen -= sizeof(struct ip6_dest);
88 opt = (u_int8_t *)dstopts + sizeof(struct ip6_dest);
89
90 /* search header for all options. */
91 for (optlen = 0; dstoptlen > 0; dstoptlen -= optlen, opt += optlen) {
92 switch(*opt) {
93 case IP6OPT_PAD1:

--- 29 unchanged lines hidden ---