/*
net.h -- header for net.c
- Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998-2001 Ivo Timmermans <zarq@iname.com>
+ 2000,2001 Guus Sliepen <guus@sliepen.warande.net>
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
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.18 2000/10/28 21:25:21 guus Exp $
+ $Id: net.h,v 1.9.4.34 2001/07/21 15:34:18 guus Exp $
*/
#ifndef __TINC_NET_H__
#include "config.h"
-#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */
+#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */
#define MTU 1600
+#define SALTLEN 2 /* to spice things up for the NSA... */
#define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
#define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
#define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */
-/* flags */
-#define INDIRECTDATA 0x0001 /* Used to indicate that this host has to be reached indirect */
-#define EXPORTINDIRECTDATA 0x0002 /* Used to indicate uplink that it has to tell others to do INDIRECTDATA */
-#define TCPONLY 0x0004 /* Tells sender to send packets over TCP instead of UDP (for firewalls) */
-
/* tap types */
#define TAP_TYPE_ETHERTAP 0
#define TAP_TYPE_TUNTAP 1
typedef unsigned long ipv4_t;
-typedef ipv4_t ip_t; /* alias for ipv4_t */
-
typedef struct ipv6_t
{
unsigned short x[8];
typedef short length_t;
typedef struct vpn_packet_t {
- length_t len; /* the actual number of bytes in the `data' field */
+ length_t len; /* the actual number of bytes in the `data' field */
+ unsigned char salt[SALTLEN]; /* two bytes of randomness */
unsigned char data[MAXSIZE];
} vpn_packet_t;
-typedef struct passphrase_t {
- unsigned short len;
- unsigned char *phrase;
-} passphrase_t;
-
-typedef struct status_bits_t {
- int pinged:1; /* sent ping */
- int got_pong:1; /* received pong */
- int meta:1; /* meta connection exists */
- int active:1; /* 1 if active.. */
- int outgoing:1; /* I myself asked for this conn */
- int termreq:1; /* the termination of this connection was requested */
- int remove:1; /* Set to 1 if you want this connection removed */
- int timeout:1; /* 1 if gotten timeout */
- int validkey:1; /* 1 if we currently have a valid key for him */
- int waitingforkey:1; /* 1 if we already sent out a request */
- int dataopen:1; /* 1 if we have a valid UDP connection open */
- int encryptout:1; /* 1 if we can encrypt outgoing traffic */
- int decryptin:1; /* 1 if we have to decrypt incoming traffic */
- int unused:18;
-} status_bits_t;
-
-typedef struct option_bits_t {
- int unused:32;
-} option_bits_t;
-
typedef struct queue_element_t {
void *packet;
struct queue_element_t *prev;
extern int total_socket_in;
extern int total_socket_out;
-extern char *unknown;
+extern int seconds_till_retry;
extern char *request_name[256];
extern char *status_text[10];
-#include "connlist.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 str2opt(const char *);
extern char *opt2str(int);
-extern int send_packet(ip_t, vpn_packet_t *);
+extern void send_packet(connection_t *, vpn_packet_t *);
+extern void receive_packet(connection_t *, vpn_packet_t *);
+extern void receive_tcppacket(connection_t *, char *, int);
+extern void accept_packet(vpn_packet_t *);
+extern void broadcast_packet(connection_t *, vpn_packet_t *);
extern int setup_network_connections(void);
extern void close_network_connections(void);
extern void main_loop(void);
-extern int setup_vpn_connection(conn_list_t *);
-extern void terminate_connection(conn_list_t *);
-extern void flush_queues(conn_list_t *);
-extern int xrecv(vpn_packet_t *);
-extern void add_queue(packet_queue_t **, void *, size_t);
+extern void terminate_connection(connection_t *, int);
+extern void flush_queue(connection_t *);
+
+#include <config.h>
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
+
+extern int read_rsa_public_key(connection_t *);
#endif /* __TINC_NET_H__ */