Create/bind TCP and UDP listening sockets in pairs.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 93ac391..6a98118 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,12 +17,15 @@
     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.38 2002/02/10 21:57:54 guus Exp $
+    $Id: net.h,v 1.9.4.45 2002/03/01 13:18:54 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <sys/time.h>
 
 #include "config.h"
@@ -31,13 +34,17 @@
 #define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
 
 #define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
+#define MAXSOCKETS 128 /* Overkill... */
 
 typedef struct mac_t
 {
   unsigned char x[6];
 } mac_t;
 
-typedef unsigned long ipv4_t;
+typedef struct ipv4_t
+{
+  unsigned char x[4];
+} ipv4_t;
 
 typedef struct ip_mask_t {
   ipv4_t address;
@@ -53,8 +60,21 @@ typedef unsigned short port_t;
 
 typedef short length_t;
 
+typedef union {
+  struct sockaddr sa;
+  struct sockaddr_in in;
+  struct sockaddr_in6 in6;
+} sockaddr_t;
+
+#ifdef SA_LEN
+#define SALEN(s) SA_LEN(&s)
+#else
+#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
+#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];
 } vpn_packet_t;
@@ -73,16 +93,36 @@ typedef struct packet_queue_t {
 typedef struct outgoing_t {
   char *name;
   int timeout;
+  struct config_t *cfg;
+  struct addrinfo *ai;
+  struct addrinfo *aip;
 } outgoing_t;
 
 extern int maxtimeout;
 extern int seconds_till_retry;
+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 */
 
+extern int tcp_socket[MAXSOCKETS];
+extern int udp_socket[MAXSOCKETS];
+extern int listen_sockets;
+extern int keyexpires;
+extern int keylifetime;
+extern int do_prune;
+extern int do_purge;
+extern char *myport;
+
+extern void retry_outgoing(outgoing_t *);
+extern void handle_incoming_vpn_data(int);
+extern void finish_connecting(connection_t *);
+extern void do_outgoing_connection(connection_t *);
+extern int handle_new_meta_connection(int);
+extern int setup_listen_socket(sockaddr_t *);
+extern int setup_vpn_in_socket(sockaddr_t *);
 extern void send_packet(struct node_t *, vpn_packet_t *);
 extern void receive_packet(struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);