X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ffd_device.c;h=e879a341361338ac1f8f3d41485836f07f47f045;hb=b0b4a2f1eb3bef0141d817cbf3b575a5dd28f241;hp=5cfe75fe3914cd66887b71e9d4db14d5b783fb93;hpb=628739fb41f3877b2da0f8fb50793a2f51ff70c4;p=tinc

diff --git a/src/fd_device.c b/src/fd_device.c
index 5cfe75fe..e879a341 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 <guus@tinc-vpn.org>
+                    2001-2021   Guus Sliepen <guus@tinc-vpn.org>
                     2009        Grzegorz Dymarek <gregd72002@googlemail.com>
                     2016-2020   Pacien TRAN-GIRARD <pacien@pacien.net>
 
@@ -20,9 +20,11 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "system.h"
+
+#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 
-#include "system.h"
 #include "conf.h"
 #include "device.h"
 #include "ethernet.h"
@@ -83,7 +85,7 @@ static int read_fd(int socket) {
 
 	if(cmsgptr->cmsg_len != CMSG_LEN(sizeof(device_fd))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Wrong CMSG data length: %lu, expected %lu!",
-		       (unsigned long)cmsgptr->cmsg_len, CMSG_LEN(sizeof(device_fd)));
+		       (unsigned long)cmsgptr->cmsg_len, (unsigned long)CMSG_LEN(sizeof(device_fd)));
 		return -1;
 	}
 
@@ -114,7 +116,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 +128,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] == '@') {
@@ -234,3 +237,4 @@ const devops_t fd_devops = {
 	.read = read_packet,
 	.write = write_packet,
 };
+#endif