- simplify configure.in

[oweals/tinc.git] / src / net.h

diff --git a/src/net.h b/src/net.h
index 6d2677bfdf0fb9f924b5c2dbce9b36f218b1cb4a..083cb2353e169efa8fbf90c5d29cce6428232d0c 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.
 
     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.57 2003/05/06 21:13:17 guus Exp $
+    $Id: net.h,v 1.9.4.59 2003/07/06 17:15:25 guus Exp $

 */
 
 #ifndef __TINC_NET_H__
 */
 
 #ifndef __TINC_NET_H__


@@ -41,7 +41,7 @@
 #define MTU 1514                               /* 1500 bytes payload + 14 bytes ethernet header */
 #endif
 
 #define MTU 1514                               /* 1500 bytes payload + 14 bytes ethernet header */
 #endif
 

-#define MAXSIZE (MTU + 4 + 8 + 64 + MTU/64 + 20)       /* MTU + seqno + padding + HMAC + compressor overhead */
+#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)       /* MTU + seqno + padding + HMAC + compressor overhead */

 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)   /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
 
 #define MAXSOCKETS 128                 /* Overkill... */
 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)   /* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
 
 #define MAXSOCKETS 128                 /* Overkill... */


@@ -70,13 +70,19 @@ typedef short length_t;
 typedef union {
        struct sockaddr sa;
        struct sockaddr_in in;
 typedef union {
        struct sockaddr sa;
        struct sockaddr_in in;

+#ifdef HAVE_STRUCT_SOCKADDR_IN6

        struct sockaddr_in6 in6;
        struct sockaddr_in6 in6;

+#endif

 } sockaddr_t;
 
 #ifdef SA_LEN
 #define SALEN(s) SA_LEN(&s)
 #else
 } 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))
 #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 {
 #endif
 
 typedef struct vpn_packet_t {