Fix compiling when support for UML sockets is enabled.

[tinc] / src / uml_device.c

diff --git a/src/uml_device.c b/src/uml_device.c
index 406c81d..38ebd6f 100644 (file)
--- 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();
@@ -226,7 +224,7 @@ static bool read_packet(vpn_packet_t *packet) {
        }
 
        case 1: {
-               if((inlen = read(request_fd, &request, sizeof(request))) != sizeof request) {
+               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();
@@ -240,7 +238,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;