X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=08b0aea8275211ad4f9a63855b9e8d9390fa47ff;hp=0dc81817b4ed6d4c6f94ca4dec8f3f360cd4db5c;hb=f75dcef72a81a337e847adf0bae54198894f65b9;hpb=c2b738e7b51fbec2b11fbbf030b9a5a36df55fc4

diff --git a/src/net.h b/src/net.h
index 0dc81817..08b0aea8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2002 Ivo Timmermans <zarq@iname.com>
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
 
     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
@@ -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.44 2002/03/01 12:26:56 guus Exp $
+    $Id: net.h,v 1.9.4.53 2002/09/09 21:24:36 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -28,32 +28,41 @@
 #include <netinet/in.h>
 #include <sys/time.h>
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
 #include "config.h"
 
-#define MTU 1514     /* 1500 bytes payload + 14 bytes ethernet header */
-#define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
+#ifdef ENABLE_JUMBOGRAMS
+#define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
+#define MAXSIZE 9100			/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
+#define MAXBUFSIZE 9100			/* Must support TCP packets of length 9000. */
+#else
+#define MTU 1514				/* 1500 bytes payload + 14 bytes ethernet header */
+#define MAXSIZE 1600			/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
+#define MAXBUFSIZE 2100			/* Quite large but needed for support of keys up to 8192 bits. */
+#endif
+
+#define MAXSOCKETS 128			/* Overkill... */
 
-#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
-#define MAXSOCKETS 128 /* Overkill... */
+#define MAXQUEUELENGTH 8		/* Maximum number of packats in a single queue */
 
-typedef struct mac_t
-{
-  unsigned char x[6];
+typedef struct mac_t {
+	uint8_t x[6];
 } mac_t;
 
-typedef struct ipv4_t
-{
-  unsigned char x[4];
+typedef struct ipv4_t {
+	uint8_t x[4];
 } ipv4_t;
 
 typedef struct ip_mask_t {
-  ipv4_t address;
-  ipv4_t mask;
+	ipv4_t address;
+	ipv4_t mask;
 } ip_mask_t;
 
-typedef struct ipv6_t
-{
-  unsigned short x[8];
+typedef struct ipv6_t {
+	uint16_t x[8];
 } ipv6_t;
 
 typedef unsigned short port_t;
@@ -61,9 +70,9 @@ typedef unsigned short port_t;
 typedef short length_t;
 
 typedef union {
-  struct sockaddr sa;
-  struct sockaddr_in in;
-  struct sockaddr_in6 in6;
+	struct sockaddr sa;
+	struct sockaddr_in in;
+	struct sockaddr_in6 in6;
 } sockaddr_t;
 
 #ifdef SA_LEN
@@ -73,31 +82,37 @@ typedef union {
 #endif
 
 typedef struct vpn_packet_t {
-  length_t len;			/* the actual number of bytes in the `data' field */
-  int priority;                 /* priority or TOS */
-  unsigned int seqno;	        /* 32 bits sequence number (network byte order of course) */
-  unsigned char data[MAXSIZE];
+	length_t len;				/* the actual number of bytes in the `data' field */
+	int priority;				/* priority or TOS */
+	uint32_t seqno;				/* 32 bits sequence number (network byte order of course) */
+	uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
 typedef struct queue_element_t {
-  void *packet;
-  struct queue_element_t *prev;
-  struct queue_element_t *next;
+	void *packet;
+	struct queue_element_t *prev;
+	struct queue_element_t *next;
 } queue_element_t;
 
 typedef struct packet_queue_t {
-  queue_element_t *head;
-  queue_element_t *tail;
+	queue_element_t *head;
+	queue_element_t *tail;
 } packet_queue_t;
 
 typedef struct outgoing_t {
-  char *name;
-  int timeout;
-  struct config_t *cfg;
-  struct addrinfo *ai;
-  struct addrinfo *aip;
+	char *name;
+	int timeout;
+	struct config_t *cfg;
+	struct addrinfo *ai;
+	struct addrinfo *aip;
 } outgoing_t;
 
+typedef struct listen_socket_t {
+	int tcp;
+	int udp;
+	sockaddr_t sa;
+} listen_socket_t;
+
 extern int maxtimeout;
 extern int seconds_till_retry;
 extern int addressfamily;
@@ -105,17 +120,16 @@ extern int addressfamily;
 extern char *request_name[];
 extern char *status_text[];
 
-#include "connection.h"		/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+#include "connection.h"			/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 
-extern int tcp_socket[MAXSOCKETS];
-extern int udp_socket[MAXSOCKETS];
-extern int tcp_sockets;
-extern int udp_sockets;
+extern listen_socket_t listen_socket[MAXSOCKETS];
+extern int listen_sockets;
 extern int keyexpires;
 extern int keylifetime;
 extern int do_prune;
 extern int do_purge;
 extern char *myport;
+extern time_t now;
 
 extern void retry_outgoing(outgoing_t *);
 extern void handle_incoming_vpn_data(int);
@@ -137,4 +151,4 @@ extern void terminate_connection(connection_t *, int);
 extern void flush_queue(struct node_t *);
 extern int read_rsa_public_key(struct connection_t *);
 
-#endif /* __TINC_NET_H__ */
+#endif							/* __TINC_NET_H__ */