/*
device.c -- VDE plug
- Copyright (C) 2012 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2013 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
#include "conf.h"
#include "device.h"
+#include "names.h"
#include "net.h"
#include "logger.h"
#include "utils.h"
static struct vdeconn *conn = NULL;
static int port = 0;
static char *group = NULL;
-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;
+static const char *device_info = "VDE socket";
static bool setup_device(void) {
libvdeplug_dynopen(plug);
return false;
}
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- xasprintf(&device, LOCALSTATEDIR "/run/vde.ctl");
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+ xasprintf(&device, RUNSTATEDIR "/vde.ctl");
+ }
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "VDEGroup"), &group);
- device_info = "VDE socket";
-
struct vde_open_args args = {
.port = port,
.group = group,
};
conn = plug.vde_open(device, identname, &args);
+
if(!conn) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open VDE socket %s", device);
return false;
logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
- if(routing_mode == RMODE_ROUTER)
+ if(routing_mode == RMODE_ROUTER) {
overwrite_mac = true;
+ }
return true;
}
static void close_device(void) {
- if(conn)
+ if(conn) {
plug.vde_close(conn);
+ conn = NULL;
+ }
- if(plug.dl_handle)
+ if(plug.dl_handle) {
libvdeplug_dynclose(plug);
+ }
free(device);
+ device = NULL;
free(iface);
+ iface = NULL;
+
+ device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
- int lenin = plug.vde_recv(conn, packet->data, MTU, 0);
+ int lenin = (ssize_t)plug.vde_recv(conn, DATA(packet), MTU, 0);
+
if(lenin <= 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 = lenin;
- device_total_in += packet->len;
+
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
return true;
}
static bool write_packet(vpn_packet_t *packet) {
- if(plug.vde_send(conn, packet->data, packet->len, 0) < 0) {
+ if((ssize_t)plug.vde_send(conn, DATA(packet), packet->len, 0) < 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 vde_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
- .dump_stats = dump_device_stats,
};