X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fvde_device.c;h=e2692eb88c1d1792ea6526beadb5ef7f26c72235;hp=73ad7136a2e3e10f7e1284249d31520d2e284106;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hpb=3a316823b971396a428f020f401b9fe41252d98d diff --git a/src/vde_device.c b/src/vde_device.c index 73ad7136..e2692eb8 100644 --- a/src/vde_device.c +++ b/src/vde_device.c @@ -44,8 +44,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); @@ -62,6 +63,7 @@ static bool setup_device(void) { }; conn = plug.vde_open(device, identname, &args); + if(!conn) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device); return false; @@ -75,29 +77,35 @@ static bool setup_device(void) { logger(DEBUG_ALWAYS, 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) { - plug.vde_close(conn); conn = NULL; + plug.vde_close(conn); + conn = NULL; } - if(plug.dl_handle) + if(plug.dl_handle) { libvdeplug_dynclose(plug); + } - free(device); device = NULL; + free(device); + device = NULL; - free(iface); iface = NULL; + free(iface); + iface = NULL; device_info = NULL; } static bool read_packet(vpn_packet_t *packet) { int 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)); event_exit();