X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fvde_device.c;h=d97a694fb1b27ad49bbd71531fb184737bceffd6;hp=e69ae80236457cf973bf9fb5c0efe1e3e8c32ae4;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=f71ce341800739c7cdee01d7cf025e7492da22ac diff --git a/src/vde_device.c b/src/vde_device.c index e69ae802..d97a694f 100644 --- a/src/vde_device.c +++ b/src/vde_device.c @@ -49,8 +49,9 @@ static bool setup_device(void) { return false; } - if(!get_config_string(lookup_config(config_tree, "Device"), &device)) + if(!get_config_string(lookup_config(config_tree, "Device"), &device)) { xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl"); + } get_config_string(lookup_config(config_tree, "Interface"), &iface); @@ -67,6 +68,7 @@ static bool setup_device(void) { }; conn = plug.vde_open(device, identname, &args); + if(!conn) { logger(LOG_ERR, "Could not open VDE socket %s", device); return false; @@ -80,18 +82,21 @@ static bool setup_device(void) { logger(LOG_INFO, "%s is a %s", device, device_info); - if(routing_mode == RMODE_ROUTER) + if(routing_mode == RMODE_ROUTER) { overwrite_mac = true; + } return true; } static void close_device(void) { - if(conn) + if(conn) { plug.vde_close(conn); + } - if(plug.dl_handle) + if(plug.dl_handle) { libvdeplug_dynclose(plug); + } free(device); @@ -100,6 +105,7 @@ static void close_device(void) { static bool read_packet(vpn_packet_t *packet) { int lenin = (ssize_t)plug.vde_recv(conn, packet->data, MTU, 0); + if(lenin <= 0) { logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno)); running = false;