X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=a371e7b439eb1cb1efb0b8199aef2291054032f0;hp=86afc39c85031c73d0b6a6231738f9b8338777c8;hb=2c7c87ec75c94d0b3cca9f7a5aeba34384f77cc1;hpb=c217d214f4f071c235bc7c463a1da6124e2570a6

diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
index 86afc39c..a371e7b4 100644
--- a/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -23,10 +23,12 @@
 #include <sys/un.h>
 
 #include "conf.h"
+#include "device.h"
 #include "net.h"
 #include "logger.h"
 #include "utils.h"
 #include "route.h"
+#include "xalloc.h"
 
 int device_fd = -1;
 static int listen_fd = -1;
@@ -39,10 +41,10 @@ char *iface = NULL;
 static char *device_info;
 
 extern char *identname;
-extern bool running;
+extern volatile bool running;
 
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
 
 enum request_type { REQ_NEW_CONTROL };
 
@@ -55,8 +57,7 @@ static struct request {
 
 static struct sockaddr_un data_sun;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	struct sockaddr_un listen_sun;
 	static const int one = 1;
 	struct {
@@ -66,17 +67,15 @@ bool setup_device(void)
 	} name;
 	struct timeval tv;
 
-	cp();
-
 	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);
 
-	device_info = _("UML network socket");
+	device_info = "UML network socket";
 
 	if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
-		logger(LOG_ERR, _("Could not open write %s: %s"), device_info, strerror(errno));
+		logger(LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
 		running = false;
 		return false;
 	}
@@ -84,13 +83,13 @@ bool setup_device(void)
 	setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
+		logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 		running = false;
 		return false;
 	}
 
 	if((data_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
-		logger(LOG_ERR, _("Could not open data %s: %s"), device_info, strerror(errno));
+		logger(LOG_ERR, "Could not open data %s: %s", device_info, strerror(errno));
 		running = false;
 		return false;
 	}
@@ -98,7 +97,7 @@ bool setup_device(void)
 	setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
+		logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 		running = false;
 		return false;
 	}
@@ -111,13 +110,13 @@ bool setup_device(void)
 	memcpy(&data_sun.sun_path, &name, sizeof name);
 	
 	if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof data_sun) < 0) {
-		logger(LOG_ERR, _("Could not bind data %s: %s"), device_info, strerror(errno));
+		logger(LOG_ERR, "Could not bind data %s: %s", device_info, strerror(errno));
 		running = false;
 		return false;
 	}
 
 	if((listen_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-		logger(LOG_ERR, _("Could not open %s: %s"), device_info,
+		logger(LOG_ERR, "Could not open %s: %s", device_info,
 			   strerror(errno));
 		return false;
 	}
@@ -125,26 +124,26 @@ bool setup_device(void)
 	setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
 
 	if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
+		logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 		return false;
 	}
 
 	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) {
-		logger(LOG_ERR, _("Could not bind %s to %s: %s"), device_info, device, strerror(errno));
+		logger(LOG_ERR, "Could not bind %s to %s: %s", device_info, device, strerror(errno));
 		return false;
 	}
 
 	if(listen(listen_fd, 1) < 0) {
-		logger(LOG_ERR, _("Could not listen on %s %s: %s"), device_info, device, strerror(errno));
+		logger(LOG_ERR, "Could not listen on %s %s: %s", device_info, device, strerror(errno));
 		return false;
 	}
 
 	device_fd = listen_fd;
 	state = 0;
 
-	logger(LOG_INFO, _("%s is a %s"), device, device_info);
+	logger(LOG_INFO, "%s is a %s", device, device_info);
 
 	if(routing_mode == RMODE_ROUTER)
 		overwrite_mac = true;
@@ -152,10 +151,7 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
-	cp();
-
+void close_device(void) {
 	if(listen_fd >= 0)
 		close(listen_fd);
 
@@ -174,25 +170,22 @@ void close_device(void)
 	if(iface) free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
+bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
-	cp();
-
 	switch(state) {
 		case 0: {
 			struct sockaddr sa;
-			int salen = sizeof sa;
+			socklen_t salen = sizeof sa;
 
 			request_fd = accept(listen_fd, &sa, &salen);
 			if(request_fd < 0) {
-				logger(LOG_ERR, _("Could not accept connection to %s %s: %s"), device_info, device, strerror(errno));
+				logger(LOG_ERR, "Could not accept connection to %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
 
 			if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
-				logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl", strerror(errno));
+				logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
 				running = false;
 				return false;
 			}
@@ -207,21 +200,21 @@ bool read_packet(vpn_packet_t *packet)
 
 		case 1: {
 			if((lenin = read(request_fd, &request, sizeof request)) != sizeof request) {
-				logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info,
+				logger(LOG_ERR, "Error while reading request from %s %s: %s", device_info,
 					   device, strerror(errno));
 				running = false;
 				return false;
 			}
 
 			if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) {
-				logger(LOG_ERR, _("Unknown magic %x, version %d, request type %d from %s %s"),
+				logger(LOG_ERR, "Unknown magic %x, version %d, request type %d from %s %s",
 						request.magic, request.version, request.type, device_info, device);
 				running = false;
 				return false;
 			}
 
 			if(connect(write_fd, &request.sock, sizeof request.sock) < 0) {
-				logger(LOG_ERR, _("Could not bind write %s: %s"), device_info, strerror(errno));
+				logger(LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
 				running = false;
 				return false;
 			}
@@ -229,7 +222,7 @@ bool read_packet(vpn_packet_t *packet)
 			write(request_fd, &data_sun, sizeof data_sun);
 			device_fd = data_fd;
 
-			logger(LOG_INFO, _("Connection with UML established"));
+			logger(LOG_INFO, "Connection with UML established");
 
 			state = 2;
 			return false;
@@ -237,7 +230,7 @@ bool read_packet(vpn_packet_t *packet)
 
 		case 2: {
 			if((lenin = read(data_fd, packet->data, MTU)) <= 0) {
-				logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				running = false;
 				return false;
@@ -247,30 +240,31 @@ bool read_packet(vpn_packet_t *packet)
 
 			device_total_in += packet->len;
 
-			ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+			ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
 					   device_info);
 
 			return true;
 		}
+
+		default:
+			logger(LOG_ERR, "Invalid value for state variable in " __FILE__);
+			abort();
 	}
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
-	cp();
-
+bool write_packet(vpn_packet_t *packet) {
 	if(state != 2) {
-		ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Dropping packet of %d bytes to %s: not connected to UML yet"),
+		ifdebug(TRAFFIC) logger(LOG_DEBUG, "Dropping packet of %d bytes to %s: not connected to UML yet",
 				packet->len, device_info);
 		return false;
 	}
 
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   packet->len, device_info);
 
 	if(write(write_fd, packet->data, packet->len) < 0) {
 		if(errno != EINTR && errno != EAGAIN) {
-			logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
+			logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 			running = false;
 		}
 
@@ -282,11 +276,8 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
-	cp();
-
-	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+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);
 }