X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=0ff313d0bdafd1d7f120082e46413629aad62ab0;hb=2f014ef78a8bcbf6cdac86bf9602e4a4903cf51e;hp=6c5a0a6fd3779c635fed0368fc370fa773f67faf;hpb=aefe87865b47c80b415e2e01ca27b11b208b842d;p=meshlink diff --git a/src/net.h b/src/net.h index 6c5a0a6f..0ff313d0 100644 --- a/src/net.h +++ b/src/net.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_NET_H +#define MESHLINK_NET_H + /* net.h -- header for net.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MESHLINK_NET_H__ -#define __MESHLINK_NET_H__ - #include "event.h" #include "sockaddr.h" @@ -37,8 +37,8 @@ typedef struct vpn_packet_t { struct { - unsigned int probe:1; - unsigned int tcp:1; + unsigned int probe: 1; + unsigned int tcp: 1; }; uint16_t len; /* the actual number of bytes in the `data' field */ uint8_t data[MAXSIZE]; @@ -91,7 +91,6 @@ extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *) extern bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len); extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len); extern void send_packet(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *); -extern void receive_tcppacket(struct meshlink_handle *mesh, struct connection_t *, const char *, int); extern void broadcast_packet(struct meshlink_handle *mesh, const struct node_t *, struct vpn_packet_t *); extern char *get_name(struct meshlink_handle *mesh); extern void load_all_nodes(struct meshlink_handle *mesh); @@ -111,8 +110,6 @@ extern void retry(struct meshlink_handle *mesh); #ifndef HAVE_MINGW #define closesocket(s) close(s) -#else -extern CRITICAL_SECTION mutex; #endif -#endif /* __MESHLINK_NET_H__ */ +#endif