Move several variables to mesh.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index 4d2d48aa4765a58a9e72b60f3bc205bd119e42f7..c87bbf3684bfd0ede2bff6fe36133e1deb2b8f4e 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -23,6 +23,7 @@
 #include "cipher.h"
 #include "digest.h"
 #include "event.h"
+#include "sockaddr.h"
 
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9018        /* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
@@ -38,40 +39,12 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-typedef short length_t;
-
-#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_unknown unknown;
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
-       struct sockaddr_storage storage;
-#endif
-} sockaddr_t;
-
-#ifdef SA_LEN
-#define SALEN(s) SA_LEN(&s)
-#else
-#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
-#endif
-
 typedef struct vpn_packet_t {
        struct {
                unsigned int probe:1;
                unsigned int tcp:1;
        };
-       length_t len;           /* the actual number of bytes in the `data' field */
+       uint16_t len;           /* the actual number of bytes in the `data' field */
        uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
@@ -106,8 +79,6 @@ typedef struct outgoing_t {
        timeout_t ev;
 } outgoing_t;
 
-extern list_t *outgoing_list;
-
 extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
@@ -123,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;
@@ -141,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"
@@ -186,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__ */