Merge branch 'master' into saverio

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index f534efdda46efc3f1acf7e89c59959ade976669d..c49f0bd4ba08cd7451d78dae097b40acf9899957 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,6 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -21,7 +20,6 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include "ipv6.h"
 #include "cipher.h"
 #include "digest.h"
 #include "event.h"
@@ -131,8 +129,6 @@ extern sockaddr_t localdiscovery_address;
 extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
 extern int keylifetime;
-extern int udp_rcvbuf;
-extern int udp_sndbuf;
 extern int max_connection_burst;
 extern bool do_prune;
 extern char *myport;
@@ -185,7 +181,6 @@ extern int main_loop(void);
 extern void terminate_connection(struct connection_t *, bool);
 extern bool node_read_ecdsa_public_key(struct node_t *);
 extern bool read_ecdsa_public_key(struct connection_t *);
-extern bool read_rsa_public_key(struct connection_t *);
 extern void send_mtu_probe(struct node_t *);
 extern void handle_device_data(void *, int);
 extern void handle_meta_connection_data(struct connection_t *);