X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fipv6.h;h=b57ba74b5d8b0ba9c76b6f3a0dc8b5d1eac73143;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=46cf62df6a9de2b3cbc9d92fc2e94ef866d830ca;hpb=3def9d2ad88a9015af4c42aac329e0e2a80679f7;p=tinc diff --git a/src/ipv6.h b/src/ipv6.h index 46cf62df..b57ba74b 100644 --- a/src/ipv6.h +++ b/src/ipv6.h @@ -1,7 +1,10 @@ +#ifndef TINC_IPV6_H +#define TINC_IPV6_H + /* ipv6.h -- missing IPv6 related definitions Copyright (C) 2005 Ivo Timmermans - 2006-2012 Guus Sliepen + 2006-2016 Guus Sliepen 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 @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_IPV6_H__ -#define __TINC_IPV6_H__ - #ifndef AF_INET6 #define AF_INET6 10 #endif @@ -29,29 +29,6 @@ #define IPPROTO_ICMPV6 58 #endif -#ifndef HAVE_STRUCT_IN6_ADDR -struct in6_addr { - union { - uint8_t u6_addr8[16]; - uint16_t u6_addr16[8]; - uint32_t u6_addr32[4]; - } in6_u; -} __attribute__ ((__gcc_struct__, __packed__)); -#define s6_addr in6_u.u6_addr8 -#define s6_addr16 in6_u.u6_addr16 -#define s6_addr32 in6_u.u6_addr32 -#endif - -#ifndef HAVE_STRUCT_SOCKADDR_IN6 -struct sockaddr_in6 { - uint16_t sin6_family; - uint16_t sin6_port; - uint32_t sin6_flowinfo; - struct in6_addr sin6_addr; - uint32_t sin6_scope_id; -} __attribute__ ((__gcc_struct__, __packed__)); -#endif - #ifndef IN6_IS_ADDR_V4MAPPED #define IN6_IS_ADDR_V4MAPPED(a) \ ((((__const uint32_t *) (a))[0] == 0) \ @@ -127,4 +104,4 @@ struct nd_opt_hdr { } __attribute__ ((__gcc_struct__, __packed__)); #endif -#endif /* __TINC_IPV6_H__ */ +#endif