X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=4d2d48aa4765a58a9e72b60f3bc205bd119e42f7;hb=722dc566a68a4d81c217a8023967cc3bda78c680;hp=c49f0bd4ba08cd7451d78dae097b40acf9899957;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/net.h b/src/net.h
index c49f0bd4..4d2d48aa 100644
--- a/src/net.h
+++ b/src/net.h
@@ -38,18 +38,6 @@
 
 #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
@@ -79,16 +67,17 @@ typedef union sockaddr_t {
 #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 */
-	int priority;           /* priority or TOS */
-	uint32_t seqno;         /* 32 bits sequence number (network byte order of course) */
 	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 +87,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,7 +99,7 @@ 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;
@@ -168,9 +157,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);