X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_device.c;h=68f4cd251aad969acec7a7870592291b3de3d39c;hp=744080a177bcb7dc430534d3854ce53512a604e5;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hpb=8ac096b5bf9da1b3961a3ac4a03d083629222a63 diff --git a/src/uml_device.c b/src/uml_device.c index 744080a1..68f4cd25 100644 --- 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, - 2002-2012 Guus Sliepen + 2002-2017 Guus Sliepen 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 "names.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; -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 { @@ -73,7 +68,7 @@ static bool setup_device(void) { 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)); - running = false; + event_exit(); return false; } @@ -85,13 +80,13 @@ static bool setup_device(void) { if(fcntl(write_fd, F_SETFL, O_NONBLOCK) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno)); - running = false; + event_exit(); return false; } if((data_fd = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not open data %s: %s", device_info, strerror(errno)); - running = false; + event_exit(); return false; } @@ -103,7 +98,7 @@ static bool setup_device(void) { if(fcntl(data_fd, F_SETFL, O_NONBLOCK) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno)); - running = false; + event_exit(); return false; } @@ -113,10 +108,10 @@ static bool setup_device(void) { 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) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind data %s: %s", device_info, strerror(errno)); - running = false; + event_exit(); return false; } @@ -161,22 +156,29 @@ static bool setup_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); - 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) { @@ -199,7 +201,7 @@ static bool read_packet(vpn_packet_t *packet) { if(fcntl(listen_fd, F_SETFL, O_NONBLOCK) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "fcntl", strerror(errno)); - running = false; + event_exit(); return false; } @@ -215,20 +217,20 @@ static bool read_packet(vpn_packet_t *packet) { 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)); - running = false; + event_exit(); return false; } if(request.magic != 0xfeedface || request.version != 3 || request.type != REQ_NEW_CONTROL) { 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); - running = false; + event_exit(); return false; } - if(connect(write_fd, &request.sock, sizeof request.sock) < 0) { + if(connect(write_fd, (struct sockkadr *)&request.sock, sizeof request.sock) < 0) { logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind write %s: %s", device_info, strerror(errno)); - running = false; + event_exit(); return false; } @@ -242,17 +244,15 @@ static bool read_packet(vpn_packet_t *packet) { } case 2: { - if((inlen = read(data_fd, packet->data, MTU)) <= 0) { + 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)); - running = false; + event_exit(); return false; } packet->len = inlen; - device_total_in += packet->len; - logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info); @@ -275,30 +275,21 @@ static bool write_packet(vpn_packet_t *packet) { logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s", 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) { logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno)); - running = false; + event_exit(); } return false; } - device_total_out += packet->len; - return true; } -static void dump_device_stats(void) { - logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device); - logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in: %10"PRIu64, device_total_in); - logger(DEBUG_ALWAYS, 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, - .dump_stats = dump_device_stats, };