projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Under Windows, the installation directory can be found in the registry.
[tinc]
/
lib
/
ipv6.h
diff --git
a/lib/ipv6.h
b/lib/ipv6.h
index
8851d6d
..
0db5d01
100644
(file)
--- a/
lib/ipv6.h
+++ b/
lib/ipv6.h
@@
-17,19
+17,12
@@
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.
2 2003/07/07 11:50:5
2 guus Exp $
+ $Id: ipv6.h,v 1.1.2.
6 2003/07/21 13:14:0
2 guus Exp $
*/
#ifndef __TINC_IPV6_H__
#define __TINC_IPV6_H__
*/
#ifndef __TINC_IPV6_H__
#define __TINC_IPV6_H__
-#include "config.h"
-
-#include <netinet/in.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
#ifndef AF_INET6
#define AF_INET6 10
#endif
#ifndef AF_INET6
#define AF_INET6 10
#endif
@@
-53,14
+46,22
@@
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;
};
#endif
uint32_t sin6_flowinfo;
struct in6_addr sin6_addr;
uint32_t sin6_scope_id;
};
#endif
-#ifndef HAVE_NETINET_IP6_H
+#ifndef IN6_IS_ADDR_V4MAPPED
+#define IN6_IS_ADDR_V4MAPPED(a) \
+ ((((__const uint32_t *) (a))[0] == 0) \
+ && (((__const uint32_t *) (a))[1] == 0) \
+ && (((__const uint32_t *) (a))[2] == htonl (0xffff)))
+#endif
+
+#ifndef HAVE_STRUCT_IP6_HDR
struct ip6_hdr {
union {
struct ip6_hdrctl {
struct ip6_hdr {
union {
struct ip6_hdrctl {
@@
-80,7
+81,9
@@
struct ip6_hdr {
#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt
#define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim
#define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim
#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt
#define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim
#define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim
+#endif
+#ifndef HAVE_STRUCT_ICMP6_HDR
struct icmp6_hdr {
uint8_t icmp6_type;
uint8_t icmp6_code;
struct icmp6_hdr {
uint8_t icmp6_type;
uint8_t icmp6_code;
@@
-96,14
+99,18
@@
struct icmp6_hdr {
#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
+#endif
+#ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target;
};
#define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2
struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target;
};
#define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2
+#endif
+#ifndef HAVE_STRUCT_ND_OPT_HDR
struct nd_opt_hdr {
uint8_t nd_opt_type;
uint8_t nd_opt_len;
struct nd_opt_hdr {
uint8_t nd_opt_type;
uint8_t nd_opt_len;