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
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
1858f5c
..
e692ca9
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Linux ethertap and tun/tap device
/*
device.c -- Interaction with Linux ethertap and tun/tap device
- Copyright (C) 2001-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2001-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 2001-200
5 Ivo Timmermans
,
+ 2001-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
@@
-17,17
+17,13
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: device.c,v 1.4 2003/08/27 13:47:48 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
-#ifdef HAVE_TUNTAP
-#ifdef LINUX_IF_TUN_H
-#include LINUX_IF_TUN_H
-#else
+#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h>
#include <linux/if_tun.h>
-#endif
#define DEFAULT_DEVICE "/dev/net/tun"
#else
#define DEFAULT_DEVICE "/dev/tap0"
#define DEFAULT_DEVICE "/dev/net/tun"
#else
#define DEFAULT_DEVICE "/dev/tap0"
@@
-38,6
+34,7
@@
#include "net.h"
#include "route.h"
#include "utils.h"
#include "net.h"
#include "route.h"
#include "utils.h"
+#include "xalloc.h"
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
@@
-46,29
+43,29
@@
typedef enum device_type_t {
} device_type_t;
int device_fd = -1;
} device_type_t;
int device_fd = -1;
-device_type_t device_type;
-char *device;
-char *iface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+
static
device_type_t device_type;
+char *device
= NULL
;
+char *iface
= NULL
;
+
static
char ifrname[IFNAMSIZ];
+
static
char *device_info;
-int device_total_in = 0;
-int device_total_out = 0;
+
static
int device_total_in = 0;
+
static
int device_total_out = 0;
-bool setup_device(void)
-{
+bool setup_device(void) {
struct ifreq ifr;
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
struct ifreq ifr;
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device =
DEFAULT_DEVICE
;
+ device =
xstrdup(DEFAULT_DEVICE)
;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_TUNTAP
- iface = netname;
+#ifdef HAVE_LINUX_IF_TUN_H
+ if (netname != NULL)
+ iface = xstrdup(netname);
#else
#else
- iface =
rindex(device, '/') ? rindex(device, '/') + 1 : device
;
+ iface =
xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device)
;
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
@@
-77,10
+74,10
@@
bool setup_device(void)
return false;
}
return false;
}
-#ifdef HAVE_
TUNTAP
+#ifdef HAVE_
LINUX_IF_TUN_H
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
- memset(&ifr, 0, sizeof
(ifr)
);
+ memset(&ifr, 0, sizeof
ifr
);
if(routing_mode == RMODE_ROUTER) {
ifr.ifr_flags = IFF_TUN;
device_type = DEVICE_TYPE_TUN;
if(routing_mode == RMODE_ROUTER) {
ifr.ifr_flags = IFF_TUN;
device_type = DEVICE_TYPE_TUN;
@@
-94,13
+91,15
@@
bool setup_device(void)
if(iface)
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
if(iface)
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
- if(!ioctl(device_fd, TUNSETIFF,
(void *)
&ifr)) {
+ if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- iface = ifrname;
- } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
+ if(iface) free(iface);
+ iface = xstrdup(ifrname);
+ } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- iface = ifrname;
+ if(iface) free(iface);
+ iface = xstrdup(ifrname);
} else
#endif
{
} else
#endif
{
@@
-108,7
+107,9
@@
bool setup_device(void)
overwrite_mac = true;
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
overwrite_mac = true;
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
- iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+ if(iface)
+ free(iface);
+ iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
}
logger(LOG_INFO, _("%s is a %s"), device, device_info);
}
logger(LOG_INFO, _("%s is a %s"), device, device_info);
@@
-116,52
+117,53
@@
bool setup_device(void)
return true;
}
return true;
}
-void close_device(void)
-{
+void close_device(void) {
cp();
close(device_fd);
cp();
close(device_fd);
+
+ free(device);
+ free(iface);
}
}
-bool read_packet(vpn_packet_t *packet)
-{
- int lenin;
+bool read_packet(vpn_packet_t *packet) {
+ int inlen;
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
-
leni
n = read(device_fd, packet->data + 10, MTU - 10);
+
inle
n = read(device_fd, packet->data + 10, MTU - 10);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n + 10;
+ packet->len =
inle
n + 10;
break;
case DEVICE_TYPE_TAP:
break;
case DEVICE_TYPE_TAP:
-
leni
n = read(device_fd, packet->data, MTU);
+
inle
n = read(device_fd, packet->data, MTU);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n;
+ packet->len =
inle
n;
break;
case DEVICE_TYPE_ETHERTAP:
break;
case DEVICE_TYPE_ETHERTAP:
-
leni
n = read(device_fd, packet->data - 2, MTU + 2);
+
inle
n = read(device_fd, packet->data - 2, MTU + 2);
- if(
leni
n <= 0) {
+ if(
inle
n <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return false;
}
- packet->len =
leni
n - 2;
+ packet->len =
inle
n - 2;
break;
}
break;
}
@@
-173,8
+175,7
@@
bool read_packet(vpn_packet_t *packet)
return true;
}
return true;
}
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
cp();
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
cp();
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
@@
-212,8
+213,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);