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
a8bedc0
..
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
@@
-63,11
+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)) {
+ if(!get_config_string(lookup_config(
&
config_tree, "Device"), &device)) {
xasprintf(&device, RUNSTATEDIR "/%s.umlsocket", identname);
}
xasprintf(&device, RUNSTATEDIR "/%s.umlsocket", identname);
}
- get_config_string(lookup_config(config_tree, "Interface"), &iface);
+ 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));
@@
-163,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;
@@
-249,7
+249,12
@@
static bool read_packet(vpn_packet_t *packet) {
return false;
}
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");