projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights, links, email addresses and let Subversion update $Id$ keywords.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
43371ad
..
54663aa
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
3
Ivo Timmermans <zarq@iname.com>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
4
Ivo Timmermans <zarq@iname.com>
+ 2000-200
4 Guus Sliepen <guus@tinc-vpn
.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,7
+17,7
@@
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.64 2003/07/17 15:06:26 guus Exp
$
+ $Id$
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-25,6
+25,8
@@
#include <openssl/evp.h>
#include <openssl/evp.h>
+#include "ipv6.h"
+
#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
@@
-52,10
+54,21
@@
typedef struct ipv6_t {
typedef short length_t;
typedef short length_t;
-typedef union {
+#define AF_UNKNOWN 255
+
+struct sockaddr_unknown {
+ uint16_t family;
+ uint16_t pad1;
+ uint32_t pad2;
+ char *address;
+ char *port;
+};
+
+typedef union sockaddr_t {
struct sockaddr sa;
struct sockaddr_in in;
struct sockaddr_in6 in6;
struct sockaddr sa;
struct sockaddr_in in;
struct sockaddr_in6 in6;
+ struct sockaddr_unknown unknown;
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif
@@
-85,6
+98,12
@@
typedef struct packet_queue_t {
queue_element_t *tail;
} packet_queue_t;
queue_element_t *tail;
} packet_queue_t;
+typedef struct listen_socket_t {
+ int tcp;
+ int udp;
+ sockaddr_t sa;
+} listen_socket_t;
+
#include "conf.h"
typedef struct outgoing_t {
#include "conf.h"
typedef struct outgoing_t {
@@
-95,12
+114,6
@@
typedef struct outgoing_t {
struct addrinfo *aip;
} outgoing_t;
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;
extern int maxtimeout;
extern int seconds_till_retry;
extern int addressfamily;
@@
-109,8
+122,8
@@
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern int keyexpires;
extern int keylifetime;
extern int listen_sockets;
extern int keyexpires;
extern int keylifetime;
-extern
int
do_prune;
-extern
int
do_purge;
+extern
bool
do_prune;
+extern
bool
do_purge;
extern char *myport;
extern time_t now;
extern EVP_CIPHER_CTX packet_ctx;
extern char *myport;
extern time_t now;
extern EVP_CIPHER_CTX packet_ctx;
@@
-123,19
+136,24
@@
extern void retry_outgoing(outgoing_t *);
extern void handle_incoming_vpn_data(int);
extern void finish_connecting(struct connection_t *);
extern void do_outgoing_connection(struct connection_t *);
extern void handle_incoming_vpn_data(int);
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 void send_packet(struct node_t *, vpn_packet_t *);
+extern
bool
handle_new_meta_connection(int);
+extern int setup_listen_socket(
const
sockaddr_t *);
+extern int setup_vpn_in_socket(
const
sockaddr_t *);
+extern void send_packet(
const
struct node_t *, vpn_packet_t *);
extern void receive_tcppacket(struct connection_t *, char *, int);
extern void receive_tcppacket(struct connection_t *, char *, int);
-extern void broadcast_packet(struct node_t *, vpn_packet_t *);
-extern
int
setup_network_connections(void);
+extern void broadcast_packet(
const
struct node_t *, vpn_packet_t *);
+extern
bool
setup_network_connections(void);
extern void setup_outgoing_connection(struct outgoing_t *);
extern void try_outgoing_connections(void);
extern void close_network_connections(void);
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 terminate_connection(struct connection_t *,
int
);
+extern
int
main_loop(void);
+extern void terminate_connection(struct connection_t *,
bool
);
extern void flush_queue(struct node_t *);
extern void flush_queue(struct node_t *);
-extern int read_rsa_public_key(struct connection_t *);
+extern bool read_rsa_public_key(struct connection_t *);
+extern void send_mtu_probe(struct node_t *);
+
+#ifndef HAVE_MINGW
+#define closesocket(s) close(s)
+#endif
#endif /* __TINC_NET_H__ */
#endif /* __TINC_NET_H__ */