projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace uint32_t bitfields with bool
[tinc]
/
src
/
uml_device.c
diff --git
a/src/uml_device.c
b/src/uml_device.c
index
406c81d
..
f35ae0d
100644
(file)
--- a/
src/uml_device.c
+++ b/
src/uml_device.c
@@
-1,7
+1,7
@@
/*
device.c -- UML network socket
Copyright (C) 2002-2005 Ivo Timmermans,
/*
device.c -- UML network socket
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-20
17
Guus Sliepen <guus@tinc-vpn.org>
+ 2002-20
22
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
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
@@
-36,7
+36,7
@@
static int request_fd = -1;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
-static c
har *device_info
;
+static c
onst char *device_info = "UML network socket"
;
enum request_type { REQ_NEW_CONTROL };
enum request_type { REQ_NEW_CONTROL };
@@
-47,10
+47,14
@@
static struct request {
struct sockaddr_un sock;
} request;
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) {
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;
static const int one = 1;
struct {
char zero;
@@
-59,13
+63,11
@@
static bool setup_device(void) {
} name;
struct timeval tv;
} name;
struct timeval tv;
- if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
- xasprintf(&device,
LOCALSTATEDIR "/run
/%s.umlsocket", identname);
+ if(!get_config_string(lookup_config(
&
config_tree, "Device"), &device)) {
+ xasprintf(&device,
RUNSTATEDIR "
/%s.umlsocket", identname);
}
}
- get_config_string(lookup_config(config_tree, "Interface"), &iface);
-
- device_info = "UML network socket";
+ get_config_string(lookup_config(&config_tree, "Interface"), &iface);
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));
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));
@@
-106,8
+108,7
@@
static bool setup_device(void) {
name.zero = 0;
name.pid = getpid();
gettimeofday(&tv, NULL);
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) {
memcpy(&data_sun.sun_path, &name, sizeof(name));
if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof(data_sun)) < 0) {
@@
-133,7
+134,11
@@
static bool setup_device(void) {
return false;
}
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) {
strncpy(listen_sun.sun_path, device, sizeof(listen_sun.sun_path));
if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof(listen_sun)) < 0) {
@@
-158,7
+163,7
@@
static bool setup_device(void) {
return true;
}
return true;
}
-void close_device(void) {
+
static
void close_device(void) {
if(listen_fd >= 0) {
close(listen_fd);
listen_fd = -1;
if(listen_fd >= 0) {
close(listen_fd);
listen_fd = -1;
@@
-184,16
+189,14
@@
void close_device(void) {
free(device);
device = NULL;
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) {
device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
-
in
t inlen;
+
ssize_
t inlen;
switch(state) {
case 0: {
switch(state) {
case 0: {
@@
-226,7
+229,7
@@
static bool read_packet(vpn_packet_t *packet) {
}
case 1: {
}
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();
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading request from %s %s: %s", device_info,
device, strerror(errno));
event_exit();
@@
-240,13
+243,18
@@
static bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- if(connect(write_fd, (
struct sockka
dr *)&request.sock, sizeof(request.sock)) < 0) {
+ if(connect(write_fd, (
const struct sockad
dr *)&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;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
event_exit();
return false;
}
- write(request_fd, &data_sun, sizeof(data_sun));
+ if(write(request_fd, &data_sun, sizeof(data_sun)) != sizeof(data_sun)) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error while responding to request from %s %s: %s", device_info, device, strerror(errno));
+ event_exit();
+ return false;
+ }
+
device_fd = data_fd;
logger(DEBUG_ALWAYS, LOG_INFO, "Connection with UML established");
device_fd = data_fd;
logger(DEBUG_ALWAYS, LOG_INFO, "Connection with UML established");