X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=8e239591bc78b548f69c79b84caa8013663a7674;hb=3a149f7521dfff67e6a790c1a830afc649ae083e;hp=23178a3624c26ca8695983e701c0d39db3b7749d;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 23178a36..8e239591 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -27,11 +27,8 @@
 #include "../device.h"
 #include "../logger.h"
 #include "../names.h"
-#include "../net.h"
 #include "../route.h"
-#include "../utils.h"
 #include "../xalloc.h"
-#include "../device.h"
 
 typedef enum device_type_t {
 	DEVICE_TYPE_TUN,
@@ -44,14 +41,14 @@ char *device = NULL;
 char *iface = NULL;
 static char *type = NULL;
 static char ifrname[IFNAMSIZ];
-static char *device_info;
+static const char *device_info;
 
 static bool setup_device(void) {
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+	if(!get_config_string(lookup_config(&config_tree, "Device"), &device)) {
 		device = xstrdup(DEFAULT_DEVICE);
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+	if(!get_config_string(lookup_config(&config_tree, "Interface"), &iface))
 		if(netname) {
 			iface = xstrdup(netname);
 		}
@@ -67,9 +64,9 @@ static bool setup_device(void) {
 	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	struct ifreq ifr = {{{0}}};
+	struct ifreq ifr = {0};
 
-	get_config_string(lookup_config(config_tree, "DeviceType"), &type);
+	get_config_string(lookup_config(&config_tree, "DeviceType"), &type);
 
 	if(type && strcasecmp(type, "tun") && strcasecmp(type, "tap")) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unknown device type %s!", type);
@@ -95,7 +92,7 @@ static bool setup_device(void) {
 
 	bool t1q = false;
 
-	if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q) {
+	if(get_config_bool(lookup_config(&config_tree, "IffOneQueue"), &t1q) && t1q) {
 		ifr.ifr_flags |= IFF_ONE_QUEUE;
 	}
 
@@ -103,10 +100,12 @@ static bool setup_device(void) {
 
 	if(iface) {
 		strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+		ifr.ifr_name[IFNAMSIZ - 1] = 0;
 	}
 
 	if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+		ifrname[IFNAMSIZ - 1] = 0;
 		free(iface);
 		iface = xstrdup(ifrname);
 	} else {
@@ -117,7 +116,7 @@ static bool setup_device(void) {
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
 	if(ifr.ifr_flags & IFF_TAP) {
-		struct ifreq ifr_mac = {};
+		struct ifreq ifr_mac = {0};
 
 		if(!ioctl(device_fd, SIOCGIFHWADDR, &ifr_mac)) {
 			memcpy(mymac.x, ifr_mac.ifr_hwaddr.sa_data, ETH_ALEN);
@@ -143,7 +142,7 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int inlen;
+	size_t inlen;
 
 	switch(device_type) {
 	case DEVICE_TYPE_TUN: