X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=ec9dcb1efa2b7702b1baea71ecf0cb751b0edd39;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=92ec6c3353027c3db42e805fab6ac4a40f7a5f8a;hpb=a39a9506cd041a7092a98498b362eaacfd2f33c3;p=meshlink

diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
index 92ec6c33..ec9dcb1e 100644
--- a/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- UML network socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2009 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
@@ -57,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 {
@@ -71,7 +70,7 @@ bool setup_device(void)
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+		xasprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
 
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
@@ -154,8 +153,7 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	if(listen_fd >= 0)
@@ -176,9 +174,8 @@ void close_device(void)
 	if(iface) free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-	int lenin;
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 
 	cp();
 
@@ -208,7 +205,7 @@ 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;
@@ -238,14 +235,14 @@ 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;
 
@@ -257,8 +254,7 @@ bool read_packet(vpn_packet_t *packet)
 	}
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
 	cp();
 
 	if(state != 2) {
@@ -284,8 +280,7 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
 	cp();
 
 	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);