j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Provide all missing IPv6 definitions in lib/ipv6.h.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-07 11:11:33 +00:00
parent 1401faf608
commit 30c0381d71
4 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/net.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.60 2003/07/06 23:16:28 guus Exp $
$Id: net.h,v 1.9.4.61 2003/07/07 11:11:33 guus Exp $
*/
#ifndef __TINC_NET_H__
@ -56,11 +56,6 @@ typedef struct ipv4_t {
uint8_t x[4];
} ipv4_t;
typedef struct ip_mask_t {
ipv4_t address;
ipv4_t mask;
} ip_mask_t;
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
@ -70,19 +65,16 @@ typedef short length_t;
typedef union {
struct sockaddr sa;
struct sockaddr_in in;
#ifdef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 in6;
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif
} sockaddr_t;
#ifdef SA_LEN
#define SALEN(s) SA_LEN(&s)
#else
#ifdef HAVE_STRUCT_SOCKADDR_IN6
#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
#else
#define SALEN(s) (sizeof sockaddr_in)
#endif
#endif
typedef struct vpn_packet_t {