X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ffd_device.c;h=205b628b6736f7c9a4992c7c1c5a5fdd4b395e4f;hb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;hp=8ac51fa1420984da1773410d631f642ceb0a16a8;hpb=5a738e685bd002661276cf6938c5b74ef1ec0ccf;p=tinc diff --git a/src/fd_device.c b/src/fd_device.c index 8ac51fa1..205b628b 100644 --- a/src/fd_device.c +++ b/src/fd_device.c @@ -1,7 +1,7 @@ /* fd_device.c -- Interaction with Android tun fd Copyright (C) 2001-2005 Ivo Timmermans, - 2001-2016 Guus Sliepen + 2001-2021 Guus Sliepen 2009 Grzegorz Dymarek 2016-2020 Pacien TRAN-GIRARD @@ -20,16 +20,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "system.h" + +#ifdef HAVE_SYS_UN_H #include -#include "system.h" #include "conf.h" #include "device.h" #include "ethernet.h" #include "logger.h" #include "net.h" #include "route.h" -#include "utils.h" struct unix_socket_addr { size_t size; @@ -114,7 +115,9 @@ end: } static struct unix_socket_addr parse_socket_addr(const char *path) { - struct sockaddr_un socket_addr; + struct sockaddr_un socket_addr = { + .sun_family = AF_UNIX, + }; size_t path_length; if(strlen(path) >= sizeof(socket_addr.sun_path)) { @@ -124,7 +127,6 @@ static struct unix_socket_addr parse_socket_addr(const char *path) { }; } - socket_addr.sun_family = AF_UNIX; strncpy(socket_addr.sun_path, path, sizeof(socket_addr.sun_path)); if(path[0] == '@') { @@ -172,6 +174,10 @@ static bool setup_device(void) { static void close_device(void) { close(device_fd); device_fd = -1; + free(iface); + iface = NULL; + free(device); + device = NULL; } static inline uint16_t get_ip_ethertype(vpn_packet_t *packet) { @@ -234,3 +240,4 @@ const devops_t fd_devops = { .read = read_packet, .write = write_packet, }; +#endif