projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
uml_socket
/
device.c
diff --git
a/src/uml_socket/device.c
b/src/uml_socket/device.c
index
a7a70fb
..
ec9dcb1
100644
(file)
--- a/
src/uml_socket/device.c
+++ b/
src/uml_socket/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-200
6
Guus Sliepen <guus@tinc-vpn.org>
+ 2002-200
9
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
@@
-36,9
+36,9
@@
static int request_fd = -1;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
static int data_fd = -1;
static int write_fd = -1;
static int state = 0;
-char *device;
+char *device
= NULL
;
char *iface = NULL;
char *iface = NULL;
-char *device_info;
+
static
char *device_info;
extern char *identname;
extern bool running;
extern char *identname;
extern bool running;
@@
-57,8
+57,7
@@
static struct request {
static struct sockaddr_un data_sun;
static struct sockaddr_un data_sun;
-bool setup_device(void)
-{
+bool setup_device(void) {
struct sockaddr_un listen_sun;
static const int one = 1;
struct {
struct sockaddr_un listen_sun;
static const int one = 1;
struct {
@@
-71,7
+70,7
@@
bool setup_device(void)
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+
x
asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
get_config_string(lookup_config(config_tree, "Interface"), &iface);
@@
-154,8
+153,7
@@
bool setup_device(void)
return true;
}
return true;
}
-void close_device(void)
-{
+void close_device(void) {
cp();
if(listen_fd >= 0)
cp();
if(listen_fd >= 0)
@@
-171,11
+169,13
@@
void close_device(void)
close(write_fd);
unlink(device);
close(write_fd);
unlink(device);
+
+ free(device);
+ if(iface) free(iface);
}
}
-bool read_packet(vpn_packet_t *packet)
-{
- int lenin;
+bool read_packet(vpn_packet_t *packet) {
+ int inlen;
cp();
cp();
@@
-205,7
+205,7
@@
bool read_packet(vpn_packet_t *packet)
}
case 1: {
}
case 1: {
- if((
leni
n = read(request_fd, &request, sizeof request)) != sizeof request) {
+ if((
inle
n = read(request_fd, &request, sizeof request)) != sizeof request) {
logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
logger(LOG_ERR, _("Error while reading request from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
@@
-235,14
+235,14
@@
bool read_packet(vpn_packet_t *packet)
}
case 2: {
}
case 2: {
- if((
leni
n = read(data_fd, packet->data, MTU)) <= 0) {
+ if((
inle
n = read(data_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
running = false;
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
device_total_in += packet->len;
device_total_in += packet->len;
@@
-254,8
+254,7
@@
bool read_packet(vpn_packet_t *packet)
}
}
}
}
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
cp();
if(state != 2) {
cp();
if(state != 2) {
@@
-281,8
+280,7
@@
bool write_packet(vpn_packet_t *packet)
return true;
}
return true;
}
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
cp();
logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
cp();
logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);