X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fvde_device.c;h=0170af32401f6dad1c3674a53c9ccdcb0ab89002;hb=38489e37f50e807e51bfd28ebb8b20396eed1447;hp=258945edb37b628959d8346d75bda908eaab587d;hpb=1b2846d907adfc8472fc9da0c951c3243c7ee143;p=tinc

diff --git a/src/vde_device.c b/src/vde_device.c
index 258945ed..0170af32 100644
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -1,6 +1,6 @@
 /*
     device.c -- VDE plug
-    Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 
 #include "conf.h"
 #include "device.h"
+#include "names.h"
 #include "net.h"
 #include "logger.h"
 #include "utils.h"
@@ -33,24 +34,19 @@ static struct vdepluglib plug;
 static struct vdeconn *conn = NULL;
 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;
+static const char *device_info = "VDE socket";
 
 static bool setup_device(void) {
 	libvdeplug_dynopen(plug);
 
 	if(!plug.dl_handle) {
-		logger(LOG_ERR, "Could not open libvdeplug library!");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open libvdeplug library!");
 		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);
 
@@ -58,8 +54,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,
@@ -67,8 +61,9 @@ static bool setup_device(void) {
 	};
 
 	conn = plug.vde_open(device, identname, &args);
+
 	if(!conn) {
-		logger(LOG_ERR, "Could not open VDE socket %s", device);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device);
 		return false;
 	}
 
@@ -78,66 +73,66 @@ static bool setup_device(void) {
 	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	logger(LOG_INFO, "%s is a %s", device, device_info);
+	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)
+	if(conn) {
 		plug.vde_close(conn);
+		conn = NULL;
+	}
 
-	if(plug.dl_handle)
+	if(plug.dl_handle) {
 		libvdeplug_dynclose(plug);
+	}
 
 	free(device);
+	device = NULL;
 
 	free(iface);
+	iface = NULL;
+
+	device_info = NULL;
 }
 
 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, DATA(packet), MTU, 0);
+
 	if(lenin <= 0) {
-		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
-		running = false;
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
+		event_exit();
 		return false;
 	}
 
 	packet->len = lenin;
-	device_total_in += packet->len;
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
+
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
 
 	return true;
 }
 
 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, DATA(packet), packet->len, 0) < 0) {
 		if(errno != EINTR && errno != EAGAIN) {
-			logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
-			running = false;
+			logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+			event_exit();
 		}
 
 		return false;
 	}
 
-	device_total_out += packet->len;
-
 	return true;
 }
 
-static void dump_device_stats(void) {
-	logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-}
-
 const devops_t vde_devops = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
 };