projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove mymac stuff from device.c.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
5f3e2a8
..
ae38402
100644
(file)
--- 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>
/*
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
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,87
+17,100
@@
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.
40 2002/02/20 22:15:32
guus Exp $
+ $Id: net.h,v 1.9.4.
58 2003/05/07 11:21:58
guus Exp $
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
+#include "config.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
+#include <openssl/evp.h>
-#include "config.h"
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
-#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 */
+#else
+#define MTU 1514 /* 1500 bytes payload + 14 bytes ethernet header */
+#endif
-#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
+#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 */
-typedef struct mac_t
-{
- unsigned char x[6];
+#define MAXSOCKETS 128 /* Overkill... */
+
+#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */
+
+typedef struct mac_t {
+ uint8_t x[6];
} mac_t;
} 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;
typedef struct ip_mask_t {
- ipv4_t address;
- ipv4_t mask;
+
ipv4_t address;
+
ipv4_t mask;
} ip_mask_t;
} ip_mask_t;
-typedef struct ipv6_t
-{
- unsigned short x[8];
+typedef struct ipv6_t {
+ uint16_t x[8];
} ipv6_t;
} ipv6_t;
-typedef unsigned short port_t;
-
typedef short length_t;
typedef union {
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;
} sockaddr_t;
-#define SA_PORT(s) ((s.sa.sa_family==AF_INET)?s.in.sin_port:(s.sa.sa_family==AF_INET6)?s.in6.sin6_port:0)
-
-#ifdef HAVE_LINUX
- #define SA_LEN(s) sizeof(sockaddr_t)
+#ifdef SA_LEN
+#define SALEN(s) SA_LEN(&s)
#else
#else
-
#define SA_LEN(s) (s.sa_len
)
+
#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)
)
#endif
typedef struct vpn_packet_t {
#endif
typedef struct vpn_packet_t {
- length_t len; /* the actual number of bytes in the `data' field */
- 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 {
} 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;
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 {
} 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;
} 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;
extern int maxtimeout;
extern int seconds_till_retry;
extern int addressfamily;
@@
-105,21
+118,23
@@
extern int addressfamily;
extern char *request_name[];
extern char *status_text[];
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
;
-extern int
udp_socket
;
+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 int keyexpires;
extern int keylifetime;
extern int do_prune;
extern int do_purge;
extern char *myport;
+extern time_t now;
+extern EVP_CIPHER_CTX packet_ctx;
extern void retry_outgoing(outgoing_t *);
extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(
void
);
+extern void handle_incoming_vpn_data(
int
);
extern void finish_connecting(connection_t *);
extern void do_outgoing_connection(connection_t *);
extern void finish_connecting(connection_t *);
extern void do_outgoing_connection(connection_t *);
-extern int handle_new_meta_connection(
void
);
+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 int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
extern void send_packet(struct node_t *, vpn_packet_t *);
@@
-135,4
+150,4
@@
extern void terminate_connection(connection_t *, int);
extern void flush_queue(struct node_t *);
extern int read_rsa_public_key(struct connection_t *);
extern void flush_queue(struct node_t *);
extern int read_rsa_public_key(struct connection_t *);
-#endif /* __TINC_NET_H__ */
+#endif
/* __TINC_NET_H__ */