/*
device.c -- UML network socket
- Copyright (C) 2002-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
- 2002-2004 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2002-2005 Ivo Timmermans,
+ 2002-2009 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 "utils.h"
#include "route.h"
-#include "system.h"
-
int device_fd = -1;
static int listen_fd = -1;
static int request_fd = -1;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
-char *device;
-char *iface;
-char *device_info;
+char *device = NULL;
+char *iface = NULL;
+static char *device_info;
extern char *identname;
extern bool running;
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
enum request_type { REQ_NEW_CONTROL };
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
- if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
- iface = device;
+ get_config_string(lookup_config(config_tree, "Interface"), &iface);
device_info = _("UML network socket");
close(write_fd);
unlink(device);
+
+ free(device);
+ if(iface) free(iface);
}
bool read_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"),
packet->len, device_info);
- return true;
+ return false;
}
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
- if(sendto(write_fd, packet->data, packet->len, 0, &request.sock, sizeof request.sock) < 0) {
- logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
- strerror(errno));
- running = false;
+ if(write(write_fd, packet->data, packet->len) < 0) {
+ if(errno != EINTR && errno != EAGAIN) {
+ logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
+ running = false;
+ }
+
return false;
}