Move several variables to mesh.

[meshlink] / src / net.h

diff --git a/src/net.h b/src/net.h
index c49f0bd4ba08cd7451d78dae097b40acf9899957..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,57 +39,18 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-typedef struct mac_t {
-       uint8_t x[6];
-} mac_t;
-
-typedef struct ipv4_t {
-       uint8_t x[4];
-} ipv4_t;
-
-typedef struct ipv6_t {
-       uint16_t x[8];
-} ipv6_t;
-
-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 {
-       length_t len;           /* the actual number of bytes in the `data' field */
-       int priority;           /* priority or TOS */
-       uint32_t seqno;         /* 32 bits sequence number (network byte order of course) */
+       struct {
+               unsigned int probe:1;
+               unsigned int tcp:1;
+       };
+       uint16_t len;           /* the actual number of bytes in the `data' field */
        uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
 /* Packet types when using SPTPS */
 
 #define PKT_COMPRESSED 1
-#define PKT_MAC 2
 #define PKT_PROBE 4
 
 typedef enum packet_type_t {
@@ -98,8 +60,8 @@ typedef enum packet_type_t {
 } packet_type_t;
 
 typedef struct listen_socket_t {
-       io_t tcp;
-       io_t udp;
+       struct io_t tcp;
+       struct io_t udp;
        sockaddr_t sa;
        bool bindto;
 } listen_socket_t;
@@ -110,15 +72,13 @@ typedef struct listen_socket_t {
 typedef struct outgoing_t {
        char *name;
        int timeout;
-       splay_tree_t *config_tree;
+       struct splay_tree_t *config_tree;
        struct config_t *cfg;
        struct addrinfo *ai;
        struct addrinfo *aip;
        timeout_t ev;
 } outgoing_t;
 
-extern list_t *outgoing_list;
-
 extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
@@ -134,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;
@@ -152,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"
@@ -168,9 +122,9 @@ extern int setup_listen_socket(const sockaddr_t *);
 extern int setup_vpn_in_socket(const sockaddr_t *);
 extern bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len);
 extern bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len);
-extern void send_packet(struct node_t *, vpn_packet_t *);
+extern void send_packet(struct node_t *, struct vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, const char *, int);
-extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
+extern void broadcast_packet(const struct node_t *, struct vpn_packet_t *);
 extern char *get_name(void);
 extern bool setup_myself_reloadable(void);
 extern bool setup_network(void);
@@ -197,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__ */