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 sockaddr_un sock;
} request;
-static struct sockaddr_un data_sun;
+static struct sockaddr_un data_sun = {
+ .sun_family = AF_UNIX,
+};
static bool setup_device(void) {
- struct sockaddr_un listen_sun;
+ struct sockaddr_un listen_sun = {
+ .sun_family = AF_UNIX,
+ };
static const int one = 1;
struct {
char zero;
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();
name.zero = 0;
name.pid = getpid();
gettimeofday(&tv, NULL);
- name.usecs = tv.tv_usec;
- data_sun.sun_family = AF_UNIX;
+ name.usecs = (int) tv.tv_usec;
memcpy(&data_sun.sun_path, &name, sizeof(name));
if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof(data_sun)) < 0) {
return false;
}
- listen_sun.sun_family = AF_UNIX;
+ if(strlen(device) >= sizeof(listen_sun.sun_path)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "UML socket filename %s is too long!", device);
+ return false;
+ }
+
strncpy(listen_sun.sun_path, device, sizeof(listen_sun.sun_path));
if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof(listen_sun)) < 0) {
free(device);
device = NULL;
- if(iface) {
- free(iface);
- iface = NULL;
- }
+ free(iface);
+ iface = NULL;
device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
- int inlen;
+ ssize_t inlen;
switch(state) {
case 0: {
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;