Deleted Added
sdiff udiff text old ( 73059 ) new ( 78064 )
full compact
dest6.c (73059) dest6.c (78064)
1/* $FreeBSD: head/sys/netinet6/dest6.c 73059 2001-02-26 03:41:13Z kris $ */
2/* $KAME: dest6.c,v 1.12 2000/05/05 11:00:57 sumikawa Exp $ */
1/* $FreeBSD: head/sys/netinet6/dest6.c 78064 2001-06-11 12:39:29Z ume $ */
2/* $KAME: dest6.c,v 1.27 2001/03/29 05:34:30 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
10 * are met:

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

30 * SUCH DAMAGE.
31 */
32
33#include "opt_inet.h"
34#include "opt_inet6.h"
35
36#include <sys/param.h>
37#include <sys/systm.h>
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
10 * are met:

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

30 * SUCH DAMAGE.
31 */
32
33#include "opt_inet.h"
34#include "opt_inet6.h"
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/malloc.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>
39#include <sys/mbuf.h>
40#include <sys/domain.h>
41#include <sys/protosw.h>
42#include <sys/socket.h>
43#include <sys/errno.h>
44#include <sys/time.h>
45#include <sys/kernel.h>
44
45#include <net/if.h>
46#include <net/route.h>
47
48#include <netinet/in.h>
49#include <netinet/in_var.h>
50#include <netinet/ip6.h>
51#include <netinet6/ip6_var.h>
52#include <netinet/icmp6.h>
53
54/*
55 * Destination options header processing.
56 */
57int
58dest6_input(mp, offp, proto)
59 struct mbuf **mp;
60 int *offp, proto;
61{
46
47#include <net/if.h>
48#include <net/route.h>
49
50#include <netinet/in.h>
51#include <netinet/in_var.h>
52#include <netinet/ip6.h>
53#include <netinet6/ip6_var.h>
54#include <netinet/icmp6.h>
55
56/*
57 * Destination options header processing.
58 */
59int
60dest6_input(mp, offp, proto)
61 struct mbuf **mp;
62 int *offp, proto;
63{
62 register struct mbuf *m = *mp;
64 struct mbuf *m = *mp;
63 int off = *offp, dstoptlen, optlen;
64 struct ip6_dest *dstopts;
65 u_int8_t *opt;
65 int off = *offp, dstoptlen, optlen;
66 struct ip6_dest *dstopts;
67 u_int8_t *opt;
68 struct ip6_hdr *ip6;
66
69
70 ip6 = mtod(m, struct ip6_hdr *);
71
67 /* validation of the length of the header */
68#ifndef PULLDOWN_TEST
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;

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

97
98 switch (*opt) {
99 case IP6OPT_PAD1:
100 optlen = 1;
101 break;
102 case IP6OPT_PADN:
103 optlen = *(opt + 1) + 2;
104 break;
72 /* validation of the length of the header */
73#ifndef PULLDOWN_TEST
74 IP6_EXTHDR_CHECK(m, off, sizeof(*dstopts), IPPROTO_DONE);
75 dstopts = (struct ip6_dest *)(mtod(m, caddr_t) + off);
76#else
77 IP6_EXTHDR_GET(dstopts, struct ip6_dest *, m, off, sizeof(*dstopts));
78 if (dstopts == NULL)
79 return IPPROTO_DONE;

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

102
103 switch (*opt) {
104 case IP6OPT_PAD1:
105 optlen = 1;
106 break;
107 case IP6OPT_PADN:
108 optlen = *(opt + 1) + 2;
109 break;
105 default: /* unknown option */
106 if ((optlen = ip6_unknown_opt(opt, m,
107 opt-mtod(m, u_int8_t *))) == -1)
108 return(IPPROTO_DONE);
109 optlen += 2;
110 break;
110
111 default: /* unknown option */
112 optlen = ip6_unknown_opt(opt, m,
113 opt - mtod(m, u_int8_t *));
114 if (optlen == -1)
115 return (IPPROTO_DONE);
116 optlen += 2;
117 break;
111 }
112 }
113
114 *offp = off;
118 }
119 }
120
121 *offp = off;
115 return(dstopts->ip6d_nxt);
122 return (dstopts->ip6d_nxt);
116
117 bad:
118 m_freem(m);
123
124 bad:
125 m_freem(m);
119 return(IPPROTO_DONE);
126 return (IPPROTO_DONE);
120}
127}