projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix DecrementTTL option for packets destined to the local node.
[tinc]
/
src
/
uml_device.c
diff --git
a/src/uml_device.c
b/src/uml_device.c
index
f0a9869
..
57d4843
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-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2002-201
3
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
@@
-24,6
+24,7
@@
#include "conf.h"
#include "device.h"
#include "conf.h"
#include "device.h"
+#include "names.h"
#include "net.h"
#include "logger.h"
#include "utils.h"
#include "net.h"
#include "logger.h"
#include "utils.h"
@@
-37,12
+38,6
@@
static int write_fd = -1;
static int state = 0;
static char *device_info;
static int state = 0;
static char *device_info;
-extern char *identname;
-extern volatile bool running;
-
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
-
enum request_type { REQ_NEW_CONTROL };
static struct request {
enum request_type { REQ_NEW_CONTROL };
static struct request {
@@
-72,8
+67,8
@@
static bool setup_device(void) {
device_info = "UML network socket";
if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
device_info = "UML network socket";
if((write_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
- logger(LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not open write %s: %s", device_info, strerror(errno));
+
event_exit()
;
return false;
}
return false;
}
@@
-84,14
+79,14
@@
static bool setup_device(void) {
setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) {
setsockopt(write_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) {
- logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+
event_exit()
;
return false;
}
if((data_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
return false;
}
if((data_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
- logger(LOG_ERR, "Could not open data %s: %s", device_info, strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not open data %s: %s", device_info, strerror(errno));
+
event_exit()
;
return false;
}
return false;
}
@@
-102,8
+97,8
@@
static bool setup_device(void) {
setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) {
setsockopt(data_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) {
- logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+
event_exit()
;
return false;
}
return false;
}
@@
-113,15
+108,15
@@
static bool setup_device(void) {
name.usecs = tv.tv_usec;
data_sun.sun_family = AF_UNIX;
memcpy(&data_sun.sun_path, &name, sizeof name);
name.usecs = tv.tv_usec;
data_sun.sun_family = AF_UNIX;
memcpy(&data_sun.sun_path, &name, sizeof name);
-
+
if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof data_sun) < 0) {
if(bind(data_fd, (struct sockaddr *)&data_sun, sizeof data_sun) < 0) {
- logger(LOG_ERR, "Could not bind data %s: %s", device_info, strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not bind data %s: %s", device_info, strerror(errno));
+
event_exit()
;
return false;
}
if((listen_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
return false;
}
if((listen_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
- logger(LOG_ERR, "Could not open %s: %s", device_info,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not open %s: %s", device_info,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-133,26
+128,26
@@
static bool setup_device(void) {
setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one);
if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
- logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
return false;
}
listen_sun.sun_family = AF_UNIX;
strncpy(listen_sun.sun_path, device, sizeof listen_sun.sun_path);
if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof listen_sun) < 0) {
return false;
}
listen_sun.sun_family = AF_UNIX;
strncpy(listen_sun.sun_path, device, sizeof listen_sun.sun_path);
if(bind(listen_fd, (struct sockaddr *)&listen_sun, sizeof listen_sun) < 0) {
- logger(LOG_ERR, "Could not bind %s to %s: %s", device_info, device, strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not bind %s to %s: %s", device_info, device, strerror(errno));
return false;
}
if(listen(listen_fd, 1) < 0) {
return false;
}
if(listen(listen_fd, 1) < 0) {
- logger(LOG_ERR, "Could not listen on %s %s: %s", device_info, device, strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not listen on %s %s: %s", device_info, device, strerror(errno));
return false;
}
device_fd = listen_fd;
state = 0;
return false;
}
device_fd = listen_fd;
state = 0;
- logger(LOG_INFO, "%s is a %s", device, device_info);
+ logger(
DEBUG_ALWAYS,
LOG_INFO, "%s is a %s", device, device_info);
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
@@
-161,22
+156,29
@@
static bool setup_device(void) {
}
void close_device(void) {
}
void close_device(void) {
- if(listen_fd >= 0)
- close(listen_fd);
+ if(listen_fd >= 0) {
+ close(listen_fd); listen_fd = -1;
+ }
- if(request_fd >= 0)
- close(request_fd);
+ if(request_fd >= 0) {
+ close(request_fd); request_fd = -1;
+ }
- if(data_fd >= 0)
- close(data_fd);
+ if(data_fd >= 0) {
+ close(data_fd); data_fd = -1;
+ }
- if(write_fd >= 0)
- close(write_fd);
+ if(write_fd >= 0) {
+ close(write_fd); write_fd = -1;
+ }
unlink(device);
unlink(device);
- free(device);
- if(iface) free(iface);
+ free(device); device = NULL;
+ if(iface) {
+ free(iface); iface = NULL;
+ }
+ device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
}
static bool read_packet(vpn_packet_t *packet) {
@@
-189,7
+191,7
@@
static bool read_packet(vpn_packet_t *packet) {
request_fd = accept(listen_fd, &sa, &salen);
if(request_fd < 0) {
request_fd = accept(listen_fd, &sa, &salen);
if(request_fd < 0) {
- logger(LOG_ERR, "Could not accept connection to %s %s: %s", device_info, device, strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not accept connection to %s %s: %s", device_info, device, strerror(errno));
return false;
}
return false;
}
@@
-198,8
+200,8
@@
static bool read_packet(vpn_packet_t *packet) {
#endif
if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
#endif
if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) {
- logger(LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno));
+
event_exit()
;
return false;
}
return false;
}
@@
-213,92
+215,81
@@
static bool read_packet(vpn_packet_t *packet) {
case 1: {
if((inlen = read(request_fd, &request, sizeof request)) != sizeof request) {
case 1: {
if((inlen = read(request_fd, &request, sizeof request)) != sizeof request) {
- logger(LOG_ERR, "Error while reading request from %s %s: %s", device_info,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while reading request from %s %s: %s", device_info,
device, strerror(errno));
device, strerror(errno));
-
running = false
;
+
event_exit()
;
return false;
}
if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) {
return false;
}
if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) {
- logger(LOG_ERR, "Unknown magic %x, version %d, request type %d from %s %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Unknown magic %x, version %d, request type %d from %s %s",
request.magic, request.version, request.type, device_info, device);
request.magic, request.version, request.type, device_info, device);
-
running = false
;
+
event_exit()
;
return false;
}
if(connect(write_fd, &request.sock, sizeof request.sock) < 0) {
return false;
}
if(connect(write_fd, &request.sock, sizeof request.sock) < 0) {
- logger(LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno));
-
running = 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);
device_fd = data_fd;
return false;
}
write(request_fd, &data_sun, sizeof data_sun);
device_fd = data_fd;
- logger(LOG_INFO, "Connection with UML established");
+ logger(
DEBUG_ALWAYS,
LOG_INFO, "Connection with UML established");
state = 2;
return false;
}
case 2: {
state = 2;
return false;
}
case 2: {
- if((inlen = read(data_fd,
packet->data
, MTU)) <= 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+ if((inlen = read(data_fd,
DATA(packet)
, MTU)) <= 0) {
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
device, strerror(errno));
-
running = false
;
+
event_exit()
;
return false;
}
packet->len = inlen;
return false;
}
packet->len = inlen;
- device_total_in += packet->len;
-
- ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
+ logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
device_info);
return true;
}
default:
device_info);
return true;
}
default:
- logger(LOG_ERR, "Invalid value for state variable in " __FILE__);
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Invalid value for state variable in " __FILE__);
abort();
}
}
static bool write_packet(vpn_packet_t *packet) {
if(state != 2) {
abort();
}
}
static bool write_packet(vpn_packet_t *packet) {
if(state != 2) {
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Dropping packet of %d bytes to %s: not connected to UML yet",
+
logger(DEBUG_TRAFFIC,
LOG_DEBUG, "Dropping packet of %d bytes to %s: not connected to UML yet",
packet->len, device_info);
return false;
}
packet->len, device_info);
return false;
}
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Writing packet of %d bytes to %s",
+
logger(DEBUG_TRAFFIC,
LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
packet->len, device_info);
- if(write(write_fd,
packet->data
, packet->len) < 0) {
+ if(write(write_fd,
DATA(packet)
, packet->len) < 0) {
if(errno != EINTR && errno != EAGAIN) {
if(errno != EINTR && errno != EAGAIN) {
- logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
-
running = false
;
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+
event_exit()
;
}
return false;
}
}
return false;
}
- device_total_out += packet->len;
-
return true;
}
return true;
}
-static void dump_device_stats(void) {
- logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
- logger(LOG_DEBUG, " total bytes in: %10"PRIu64, device_total_in);
- logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-}
-
const devops_t uml_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
const devops_t uml_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
- .dump_stats = dump_device_stats,
};
};