projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const correctness
[tinc]
/
lib
/
ipv6.h
diff --git
a/lib/ipv6.h
b/lib/ipv6.h
index
d8cb4cf
..
9fc93b3
100644
(file)
--- a/
lib/ipv6.h
+++ b/
lib/ipv6.h
@@
-1,7
+1,7
@@
/*
ipv6.h -- missing IPv6 related definitions
/*
ipv6.h -- missing IPv6 related definitions
- Copyright (C) 200
3 Ivo Timmermans <ivo@o2w.nl>
- 200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 200
5 Ivo Timmermans
+ 200
6 Guus Sliepen <guus@tinc-vpn
.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: ipv6.h,v 1.1.2.5 2003/07/18 13:42:35 guus Exp
$
+ $Id$
*/
#ifndef __TINC_IPV6_H__
*/
#ifndef __TINC_IPV6_H__
@@
-38,7
+38,7
@@
struct in6_addr {
uint16_t u6_addr16[8];
uint32_t u6_addr32[4];
} in6_u;
uint16_t u6_addr16[8];
uint32_t u6_addr32[4];
} in6_u;
-};
+}
__attribute__ ((__packed__))
;
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
#define s6_addr32 in6_u.u6_addr32
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
#define s6_addr32 in6_u.u6_addr32
@@
-46,11
+46,12
@@
struct in6_addr {
#ifndef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 {
#ifndef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 {
- in_port_t sin6_port;
+ uint16_t sin6_family;
+ uint16_t sin6_port;
uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;
uint32_t sin6_scope_id;
uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;
uint32_t sin6_scope_id;
-};
+}
__attribute__ ((__packed__))
;
#endif
#ifndef IN6_IS_ADDR_V4MAPPED
#endif
#ifndef IN6_IS_ADDR_V4MAPPED
@@
-73,7
+74,7
@@
struct ip6_hdr {
} ip6_ctlun;
struct in6_addr ip6_src;
struct in6_addr ip6_dst;
} ip6_ctlun;
struct in6_addr ip6_src;
struct in6_addr ip6_dst;
-};
+}
__attribute__ ((__packed__))
;
#define ip6_vfc ip6_ctlun.ip6_un2_vfc
#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
#define ip6_vfc ip6_ctlun.ip6_un2_vfc
#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
@@
-92,28
+93,37
@@
struct icmp6_hdr {
uint16_t icmp6_un_data16[2];
uint8_t icmp6_un_data8[4];
} icmp6_dataun;
uint16_t icmp6_un_data16[2];
uint8_t icmp6_un_data8[4];
} icmp6_dataun;
-};
+}
__attribute__ ((__packed__))
;
#define ICMP6_DST_UNREACH_NOROUTE 0
#define ICMP6_DST_UNREACH 1
#define ICMP6_DST_UNREACH_NOROUTE 0
#define ICMP6_DST_UNREACH 1
+#define ICMP6_PACKET_TOO_BIG 2
#define ICMP6_DST_UNREACH_ADDR 3
#define ND_NEIGHBOR_SOLICIT 135
#define ND_NEIGHBOR_ADVERT 136
#define ICMP6_DST_UNREACH_ADDR 3
#define ND_NEIGHBOR_SOLICIT 135
#define ND_NEIGHBOR_ADVERT 136
+#define icmp6_data32 icmp6_dataun.icmp6_un_data32
+#define icmp6_data16 icmp6_dataun.icmp6_un_data16
+#define icmp6_data8 icmp6_dataun.icmp6_un_data8
+#define icmp6_mtu icmp6_data32[0]
#endif
#ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target;
#endif
#ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target;
-};
+}
__attribute__ ((__packed__))
;
#define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2
#define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2
+#define nd_ns_type nd_ns_hdr.icmp6_type
+#define nd_ns_code nd_ns_hdr.icmp6_code
+#define nd_ns_cksum nd_ns_hdr.icmp6_cksum
+#define nd_ns_reserved nd_ns_hdr.icmp6_data32[0]
#endif
#ifndef HAVE_STRUCT_ND_OPT_HDR
struct nd_opt_hdr {
uint8_t nd_opt_type;
uint8_t nd_opt_len;
#endif
#ifndef HAVE_STRUCT_ND_OPT_HDR
struct nd_opt_hdr {
uint8_t nd_opt_type;
uint8_t nd_opt_len;
-};
+}
__attribute__ ((__packed__))
;
#endif
#endif /* __TINC_IPV6_H__ */
#endif
#endif /* __TINC_IPV6_H__ */