More missing IPv6 definitions and autoconf checks to make sure it compiles

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 4851649..142d867 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -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.62 2003/07/11 16:13:00 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -35,6 +35,8 @@
 #include <inttypes.h>
 #endif
 
+#include "utils.h"
+
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014                               /* 9000 bytes payload + 14 bytes ethernet header */
 #else
@@ -56,11 +58,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 +67,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 {