projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consistently allocate device and iface variables on the heap.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
75e7715
..
87f72ea
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-2005 Ivo Timmermans
<ivo@tinc-vpn.org>
,
- 2001-200
5
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2001-2005 Ivo Timmermans,
+ 2001-200
6
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
@@
-22,12
+22,8
@@
#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,
@@
-49,8
+46,8
@@
int device_fd = -1;
static device_type_t device_type;
char *device;
char *iface;
static device_type_t device_type;
char *device;
char *iface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+
static
char ifrname[IFNAMSIZ];
+
static
char *device_info;
static int device_total_in = 0;
static int device_total_out = 0;
static int device_total_in = 0;
static int device_total_out = 0;
@@
-62,13
+59,13
@@
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))
- 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
+ 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,7
+74,7
@@
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 */
memset(&ifr, 0, sizeof(ifr));
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof(ifr));