Move several variables to mesh.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 706f56904f79cb46907662f4c918e3c60638aa8b..c87bbf3684bfd0ede2bff6fe36133e1deb2b8f4e 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -94,9 +94,6 @@ 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;
@@ -112,9 +109,6 @@ typedef enum proxytype_t {
 } 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"
 #include "node.h"
@@ -157,7 +151,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__ */