projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big header file cleanup: everything that has to do with standard system
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
4851649
..
43371ad
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-1,7
+1,7
@@
/*
net.h -- header for net.c
/*
net.h -- header for net.c
- Copyright (C) 1998-200
2
Ivo Timmermans <zarq@iname.com>
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-200
3
Ivo Timmermans <zarq@iname.com>
+ 2000-200
3
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,24
+17,14
@@
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.6
0 2003/07/06 23:16:28
guus Exp $
+ $Id: net.h,v 1.9.4.6
4 2003/07/17 15:06:26
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 <openssl/evp.h>
#include <openssl/evp.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
#ifdef ENABLE_JUMBOGRAMS
#define MTU 9014 /* 9000 bytes payload + 14 bytes ethernet header */
#else
#ifdef ENABLE_JUMBOGRAMS
#define MTU 9014 /* 9000 bytes payload + 14 bytes ethernet header */
#else
@@
-56,11
+46,6
@@
typedef struct ipv4_t {
uint8_t x[4];
} ipv4_t;
uint8_t x[4];
} ipv4_t;
-typedef struct ip_mask_t {
- ipv4_t address;
- ipv4_t mask;
-} ip_mask_t;
-
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
typedef struct ipv6_t {
uint16_t x[8];
} ipv6_t;
@@
-70,19
+55,16
@@
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;
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+ struct sockaddr_storage storage;
#endif
} sockaddr_t;
#ifdef SA_LEN
#define SALEN(s) SA_LEN(&s)
#else
#endif
} 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 {
@@
-103,6
+85,8
@@
typedef struct packet_queue_t {
queue_element_t *tail;
} packet_queue_t;
queue_element_t *tail;
} packet_queue_t;
+#include "conf.h"
+
typedef struct outgoing_t {
char *name;
int timeout;
typedef struct outgoing_t {
char *name;
int timeout;
@@
-121,8
+105,6
@@
extern int maxtimeout;
extern int seconds_till_retry;
extern int addressfamily;
extern int seconds_till_retry;
extern int addressfamily;
-#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
-
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern int keyexpires;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern int keyexpires;
@@
-133,10
+115,14
@@
extern char *myport;
extern time_t now;
extern EVP_CIPHER_CTX packet_ctx;
extern time_t now;
extern EVP_CIPHER_CTX packet_ctx;
+/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+#include "connection.h"
+#include "node.h"
+
extern void retry_outgoing(outgoing_t *);
extern void handle_incoming_vpn_data(int);
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 void finish_connecting(
struct
connection_t *);
+extern void do_outgoing_connection(
struct
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 int handle_new_meta_connection(int);
extern int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
@@
-148,7
+134,7
@@
extern void setup_outgoing_connection(struct outgoing_t *);
extern void try_outgoing_connections(void);
extern void close_network_connections(void);
extern void main_loop(void);
extern void try_outgoing_connections(void);
extern void close_network_connections(void);
extern void main_loop(void);
-extern void terminate_connection(connection_t *, int);
+extern void terminate_connection(
struct
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 *);