projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix reading configuration files that do not end with a newline.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
904c36c
..
302fa62
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
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
@@
-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.1.2.20 2003/07/22 20:55:21 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"
@@
-46,14
+42,14
@@
typedef enum device_type_t {
} device_type_t;
int device_fd = -1;
} device_type_t;
int device_fd = -1;
-device_type_t device_type;
+
static
device_type_t device_type;
char *device;
char *iface;
char ifrname[IFNAMSIZ];
char *device_info;
char *device;
char *iface;
char ifrname[IFNAMSIZ];
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)
{
@@
-65,7
+61,7
@@
bool setup_device(void)
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_
TUNTAP
+#ifdef HAVE_
LINUX_IF_TUN_H
iface = netname;
#else
iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
iface = netname;
#else
iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
@@
-77,7
+73,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));
@@
-94,10
+90,10
@@
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);
iface = ifrname;
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
iface = ifrname;
- } else if(!ioctl(device_fd, (('T' << 8) | 202),
(void *)
&ifr)) {
+ } 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);
iface = ifrname;
logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
iface = ifrname;