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

diff --git a/src/uml_device.c b/src/uml_device.c
index 3e7b8219..be609114 100644
--- a/src/uml_device.c
+++ b/src/uml_device.c
@@ -36,7 +36,7 @@ static int request_fd = -1;
 static int data_fd = -1;
 static int write_fd = -1;
 static int state = 0;
-static char *device_info;
+static const char *device_info = "UML network socket";
 
 enum request_type { REQ_NEW_CONTROL };
 
@@ -60,13 +60,11 @@ static bool setup_device(void) {
 	struct timeval tv;
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
-		xasprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+		xasprintf(&device, RUNSTATEDIR "/%s.umlsocket", identname);
 	}
 
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
-	device_info = "UML network socket";
-
 	if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
 		event_exit();
@@ -135,6 +133,7 @@ static bool setup_device(void) {
 
 	listen_sun.sun_family = AF_UNIX;
 	strncpy(listen_sun.sun_path, device, sizeof(listen_sun.sun_path));
+	listen_sun.sun_path[sizeof(listen_sun.sun_path) - 1] = 0;
 
 	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));
@@ -240,7 +239,7 @@ static bool read_packet(vpn_packet_t *packet) {
 			return false;
 		}
 
-		if(connect(write_fd, (struct sockkadr *)&request.sock, sizeof(request.sock)) < 0) {
+		if(connect(write_fd, (const struct sockaddr *)&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;