Move proxy variables to mesh.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 706f56904f79cb46907662f4c918e3c60638aa8b..184dd934d050624491c2c972889ae1ac3976240e 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -91,29 +91,7 @@ extern int listen_sockets;
 extern int keylifetime;
 extern int max_connection_burst;
 extern bool do_prune;
-extern char *myport;
 extern int autoconnect;
-extern bool disablebuggypeers;
-extern int contradicting_add_edge;
-extern int contradicting_del_edge;
-extern time_t last_config_check;
-
-extern char *proxyhost;
-extern char *proxyport;
-extern char *proxyuser;
-extern char *proxypass;
-typedef enum proxytype_t {
-       PROXY_NONE = 0,
-       PROXY_SOCKS4,
-       PROXY_SOCKS4A,
-       PROXY_SOCKS5,
-       PROXY_HTTP,
-       PROXY_EXEC,
-} proxytype_t;
-extern proxytype_t proxytype;
-
-extern char *scriptinterpreter;
-extern char *scriptextension;
 
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"
@@ -157,7 +135,4 @@ extern void load_all_nodes(void);
 extern CRITICAL_SECTION mutex;
 #endif
 
-//TODO: move this to a better place
-extern char *confbase;
-
 #endif /* __TINC_NET_H__ */