Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 54ea5dc..3050fe2 100644 (file)
--- 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,
@@ -67,7 +64,7 @@ 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);
 
@@ -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: