Deleted Added
full compact
ip6.h (53541) ip6.h (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/ip6.h 53541 1999-11-22 02:45:11Z shin $
29 * $FreeBSD: head/sys/netinet6/ip6.h 55009 1999-12-22 19:13:38Z shin $
30 */
31
32/*
33 * Copyright (c) 1982, 1986, 1993
34 * The Regents of the University of California. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions

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

70/*
71 * Definition for internet protocol version 6.
72 * RFC 2460
73 */
74
75struct ip6_hdr {
76 union {
77 struct ip6_hdrctl {
30 */
31
32/*
33 * Copyright (c) 1982, 1986, 1993
34 * The Regents of the University of California. All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions

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

70/*
71 * Definition for internet protocol version 6.
72 * RFC 2460
73 */
74
75struct ip6_hdr {
76 union {
77 struct ip6_hdrctl {
78 u_int32_t ip6_un1_flow; /* 20 bits of flow-ID */
78 u_int32_t ip6_un1_flow; /* 4 bits version,
79 * 8 bits traffic
80 * class,
81 * 20 bits flow-ID */
79 u_int16_t ip6_un1_plen; /* payload length */
80 u_int8_t ip6_un1_nxt; /* next header */
81 u_int8_t ip6_un1_hlim; /* hop limit */
82 } ip6_un1;
82 u_int16_t ip6_un1_plen; /* payload length */
83 u_int8_t ip6_un1_nxt; /* next header */
84 u_int8_t ip6_un1_hlim; /* hop limit */
85 } ip6_un1;
83 u_int8_t ip6_un2_vfc; /* 4 bits version, 4 bits class */
86 u_int8_t ip6_un2_vfc; /* 4 bits version,
87 * top 4 bits trafic class */
84 } ip6_ctlun;
85 struct in6_addr ip6_src; /* source address */
86 struct in6_addr ip6_dst; /* destination address */
87};
88
89#define ip6_vfc ip6_ctlun.ip6_un2_vfc
90#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
91#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen

--- 154 unchanged lines hidden ---
88 } ip6_ctlun;
89 struct in6_addr ip6_src; /* source address */
90 struct in6_addr ip6_dst; /* destination address */
91};
92
93#define ip6_vfc ip6_ctlun.ip6_un2_vfc
94#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
95#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen

--- 154 unchanged lines hidden ---