Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / vde_device.c

diff --git a/src/vde_device.c b/src/vde_device.c
index 4cbf712..b5f0785 100644 (file)
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -26,7 +26,6 @@
 #include "names.h"
 #include "net.h"
 #include "logger.h"
-#include "utils.h"
 #include "route.h"
 #include "xalloc.h"
 
@@ -34,7 +33,7 @@ static struct vdepluglib plug;
 static struct vdeconn *conn = NULL;
 static int port = 0;
 static char *group = NULL;
-static char *device_info;
+static const char *device_info = "VDE socket";
 
 static bool setup_device(void) {
        libvdeplug_dynopen(plug);
@@ -54,8 +53,6 @@ static bool setup_device(void) {
 
        get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
 
-       device_info = "VDE socket";
-
        struct vde_open_args args = {
                .port = port,
                .group = group,
@@ -104,7 +101,7 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-       int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
+       ssize_t lenin = (ssize_t) plug.vde_recv(conn, DATA(packet), MTU, 0);
 
        if(lenin <= 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));