X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fvde_device.c;h=815b956fbeae12f417fde3633f3f870196a484be;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=8f601e79361040d7c82c0e021b89680a20a26015;hpb=178e52f76ef4ba40748c13ea7e518837394d6dbc;p=tinc

diff --git a/src/vde_device.c b/src/vde_device.c
index 8f601e79..815b956f 100644
--- a/src/vde_device.c
+++ b/src/vde_device.c
@@ -1,6 +1,6 @@
 /*
     device.c -- VDE plug
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2012 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
@@ -45,7 +45,7 @@ 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;
 	}
 
@@ -68,13 +68,17 @@ 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;
 	}
 
 	device_fd = plug.vde_datafd(conn);
 
-	logger(LOG_INFO, "%s is a %s", device, device_info);
+#ifdef FD_CLOEXEC
+	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
 	if(routing_mode == RMODE_ROUTER)
 		overwrite_mac = true;
@@ -95,24 +99,24 @@ 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(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
 		running = false;
 		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, packet->data, packet->len, 0) < 0) {
 		if(errno != EINTR && errno != EAGAIN) {
-			logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+			logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 			running = false;
 		}
 
@@ -125,9 +129,9 @@ static bool write_packet(vpn_packet_t *packet) {
 }
 
 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);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
 
 const devops_t vde_devops = {