X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fuml_device.c;h=3e7b8219fc4f000328f3fb482c0aa56695cc5300;hb=87f96aec8c48327d879c20ff2b789c88a675173d;hp=2a06de371d390b91e82e2590809f4fbb685062e3;hpb=a073b2cb0bca646685a83479db6b66d518240bc5;p=tinc

diff --git a/src/uml_device.c b/src/uml_device.c
index 2a06de37..3e7b8219 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-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2017 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
@@ -41,10 +41,10 @@ static char *device_info;
 enum request_type { REQ_NEW_CONTROL };
 
 static struct request {
-  uint32_t magic;
-  uint32_t version;
-  enum request_type type;
-  struct sockaddr_un sock;
+	uint32_t magic;
+	uint32_t version;
+	enum request_type type;
+	struct sockaddr_un sock;
 } request;
 
 static struct sockaddr_un data_sun;
@@ -59,8 +59,9 @@ static bool setup_device(void) {
 	} name;
 	struct timeval tv;
 
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
 		xasprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+	}
 
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
@@ -76,7 +77,7 @@ static bool setup_device(void) {
 	fcntl(write_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
+	setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
 	if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
@@ -94,7 +95,7 @@ static bool setup_device(void) {
 	fcntl(data_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
+	setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
 	if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
@@ -107,9 +108,9 @@ static bool setup_device(void) {
 	gettimeofday(&tv, NULL);
 	name.usecs = tv.tv_usec;
 	data_sun.sun_family = AF_UNIX;
-	memcpy(&data_sun.sun_path, &name, sizeof name);
+	memcpy(&data_sun.sun_path, &name, sizeof(name));
 
-	if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof data_sun) < 0) {
+	if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof(data_sun)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind data %s: %s", device_info, strerror(errno));
 		event_exit();
 		return false;
@@ -117,7 +118,7 @@ static bool setup_device(void) {
 
 	if((listen_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", device_info,
-			   strerror(errno));
+		       strerror(errno));
 		return false;
 	}
 
@@ -125,7 +126,7 @@ static bool setup_device(void) {
 	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-	setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
+	setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
 	if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
@@ -133,8 +134,9 @@ static bool setup_device(void) {
 	}
 
 	listen_sun.sun_family = AF_UNIX;
-	strncpy(listen_sun.sun_path, device, sizeof listen_sun.sun_path);
-	if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof listen_sun) < 0) {
+	strncpy(listen_sun.sun_path, device, sizeof(listen_sun.sun_path));
+
+	if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof(listen_sun)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind %s to %s: %s", device_info, device, strerror(errno));
 		return false;
 	}
@@ -149,35 +151,44 @@ 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;
 }
 
 void close_device(void) {
 	if(listen_fd >= 0) {
-		close(listen_fd); listen_fd = -1;
+		close(listen_fd);
+		listen_fd = -1;
 	}
 
 	if(request_fd >= 0) {
-		close(request_fd); request_fd = -1;
+		close(request_fd);
+		request_fd = -1;
 	}
 
 	if(data_fd >= 0) {
-		close(data_fd); data_fd = -1;
+		close(data_fd);
+		data_fd = -1;
 	}
 
 	if(write_fd >= 0) {
-		close(write_fd); write_fd = -1;
+		close(write_fd);
+		write_fd = -1;
 	}
 
 	unlink(device);
 
-	free(device); device = NULL;
+	free(device);
+	device = NULL;
+
 	if(iface) {
-		free(iface); iface = NULL;
+		free(iface);
+		iface = NULL;
 	}
+
 	device_info = NULL;
 }
 
@@ -185,95 +196,96 @@ static bool read_packet(vpn_packet_t *packet) {
 	int inlen;
 
 	switch(state) {
-		case 0: {
-			struct sockaddr sa;
-			socklen_t salen = sizeof sa;
+	case 0: {
+		struct sockaddr sa;
+		socklen_t salen = sizeof(sa);
+
+		request_fd = accept(listen_fd, &sa, &salen);
 
-			request_fd = accept(listen_fd, &sa, &salen);
-			if(request_fd < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Could not accept connection to %s %s: %s", device_info, device, strerror(errno));
-				return false;
-			}
+		if(request_fd < 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Could not accept connection to %s %s: %s", device_info, device, strerror(errno));
+			return false;
+		}
 
 #ifdef FD_CLOEXEC
-			fcntl(request_fd, F_SETFD, FD_CLOEXEC);
+		fcntl(request_fd, F_SETFD, FD_CLOEXEC);
 #endif
 
-			if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
-				event_exit();
-				return false;
-			}
+		if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+			event_exit();
+			return false;
+		}
+
+		close(listen_fd);
+		listen_fd = -1;
+		device_fd = request_fd;
+		state = 1;
+
+		return false;
+	}
 
-			close(listen_fd);
-			listen_fd = -1;
-			device_fd = request_fd;
-			state = 1;
+	case 1: {
+		if((inlen = read(request_fd, &request, sizeof(request))) != sizeof(request)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading request from %s %s: %s", device_info,
+			       device, strerror(errno));
+			event_exit();
+			return false;
+		}
 
+		if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown magic %x, version %d, request type %d from %s %s",
+			       request.magic, request.version, request.type, device_info, device);
+			event_exit();
 			return false;
 		}
 
-		case 1: {
-			if((inlen = read(request_fd, &request, sizeof request)) != sizeof request) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading request from %s %s: %s", device_info,
-					   device, strerror(errno));
-				event_exit();
-				return false;
-			}
-
-			if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Unknown magic %x, version %d, request type %d from %s %s",
-						request.magic, request.version, request.type, device_info, device);
-				event_exit();
-				return false;
-			}
-
-			if(connect(write_fd, (struct sockkadr *)&request.sock, sizeof request.sock) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
-				event_exit();
-				return false;
-			}
-
-			write(request_fd, &data_sun, sizeof data_sun);
-			device_fd = data_fd;
-
-			logger(DEBUG_ALWAYS, LOG_INFO, "Connection with UML established");
-
-			state = 2;
+		if(connect(write_fd, (struct sockkadr *)&request.sock, sizeof(request.sock)) < 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
+			event_exit();
 			return false;
 		}
 
-		case 2: {
-			if((inlen = read(data_fd, DATA(packet), MTU)) <= 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-					   device, strerror(errno));
-				event_exit();
-				return false;
-			}
+		write(request_fd, &data_sun, sizeof(data_sun));
+		device_fd = data_fd;
 
-			packet->len = inlen;
+		logger(DEBUG_ALWAYS, LOG_INFO, "Connection with UML established");
 
-			logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
-					   device_info);
+		state = 2;
+		return false;
+	}
 
-			return true;
+	case 2: {
+		if((inlen = read(data_fd, DATA(packet), MTU)) <= 0) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
+			       device, strerror(errno));
+			event_exit();
+			return false;
 		}
 
-		default:
-			logger(DEBUG_ALWAYS, LOG_ERR, "Invalid value for state variable in " __FILE__);
-			abort();
+		packet->len = inlen;
+
+		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
+		       device_info);
+
+		return true;
+	}
+
+	default:
+		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid value for state variable in " __FILE__);
+		abort();
 	}
 }
 
 static bool write_packet(vpn_packet_t *packet) {
 	if(state != 2) {
 		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Dropping packet of %d bytes to %s: not connected to UML yet",
-				packet->len, device_info);
+		       packet->len, device_info);
 		return false;
 	}
 
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
-			   packet->len, device_info);
+	       packet->len, device_info);
 
 	if(write(write_fd, DATA(packet), packet->len) < 0) {
 		if(errno != EINTR && errno != EAGAIN) {