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 };
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();
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));
free(device);
device = NULL;
- if(iface) {
- free(iface);
- iface = NULL;
- }
+ free(iface);
+ iface = NULL;
device_info = NULL;
}
}
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();
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;