X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fvde_device.c;h=b5f0785e3b5283498c1f20d4efd50838eb9fd339;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=55d66b469ea6f4cbf0d1ee5472610a7c0a46c222;hpb=ed1d0878afe53032a4b63e87afd4a435015cf5de;p=tinc

diff --git a/src/vde_device.c b/src/vde_device.c
index 55d66b46..b5f0785e 100644
--- 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);
@@ -44,8 +43,9 @@ static bool setup_device(void) {
 		return false;
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+		xasprintf(&device, RUNSTATEDIR "/vde.ctl");
+	}
 
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
@@ -53,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,
@@ -62,6 +60,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 +74,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, packet->data, 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));
 		event_exit();
@@ -112,7 +117,7 @@ static bool read_packet(vpn_packet_t *packet) {
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-	if((ssize_t)plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
+	if((ssize_t)plug.vde_send(conn, DATA(packet), 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));
 			event_exit();