X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_device.c;h=f0a9869b888667c2b785e552a43fde33c793db6d;hp=26bcb01ca46cda59af67645048cf5c803b869c30;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hpb=178e52f76ef4ba40748c13ea7e518837394d6dbc

diff --git a/src/uml_device.c b/src/uml_device.c
index 26bcb01c..f0a9869b 100644
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- UML network socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-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
@@ -77,6 +77,10 @@ static bool setup_device(void) {
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(write_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) {
@@ -91,6 +95,10 @@ static bool setup_device(void) {
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(data_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) {
@@ -118,6 +126,10 @@ static bool setup_device(void) {
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
@@ -168,7 +180,7 @@ void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 
 	switch(state) {
 		case 0: {
@@ -181,6 +193,10 @@ static bool read_packet(vpn_packet_t *packet) {
 				return false;
 			}
 
+#ifdef FD_CLOEXEC
+			fcntl(request_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 			if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
 				logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 				running = false;
@@ -196,7 +212,7 @@ static bool read_packet(vpn_packet_t *packet) {
 		}
 
 		case 1: {
-			if((lenin = read(request_fd, &request, sizeof request)) != sizeof request) {
+			if((inlen = read(request_fd, &request, sizeof request)) != sizeof request) {
 				logger(LOG_ERR, "Error while reading request from %s %s: %s", device_info,
 					   device, strerror(errno));
 				running = false;
@@ -226,14 +242,14 @@ static bool read_packet(vpn_packet_t *packet) {
 		}
 
 		case 2: {
-			if((lenin = read(data_fd, packet->data, MTU)) <= 0) {
+			if((inlen = read(data_fd, packet->data, MTU)) <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				running = false;
 				return false;
 			}
 
-			packet->len = lenin;
+			packet->len = inlen;
 
 			device_total_in += packet->len;