X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fvde_device.c;h=be53e0a255e90d7ac8389c85732ba5f6a6efcd9c;hb=1be7dc759a64d436fd7586aad43b545f2dc665b5;hp=ab2ffdcd70617bc174dddb490f1982cd1f13eb3d;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;p=tinc diff --git a/src/vde_device.c b/src/vde_device.c index ab2ffdcd..be53e0a2 100644 --- a/src/vde_device.c +++ b/src/vde_device.c @@ -23,6 +23,7 @@ #include "conf.h" #include "device.h" +#include "names.h" #include "net.h" #include "logger.h" #include "utils.h" @@ -35,9 +36,6 @@ static int port = 0; static char *group = NULL; static char *device_info; -extern char *identname; -extern volatile bool running; - static uint64_t device_total_in = 0; static uint64_t device_total_out = 0; @@ -99,10 +97,10 @@ static void close_device(void) { } static bool read_packet(vpn_packet_t *packet) { - int lenin = plug.vde_recv(conn, packet->data, MTU, 0); + int lenin = (ssize_t)plug.vde_recv(conn, packet->data, MTU, 0); if(lenin <= 0) { logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno)); - running = false; + event_exit(); return false; } @@ -114,10 +112,10 @@ static bool read_packet(vpn_packet_t *packet) { } static bool write_packet(vpn_packet_t *packet) { - if(plug.vde_send(conn, packet->data, packet->len, 0) < 0) { + if((ssize_t)plug.vde_send(conn, packet->data, packet->len, 0) < 0) { if(errno != EINTR && errno != EAGAIN) { logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno)); - running = false; + event_exit(); } return false;