projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move RSA key generation into the wrappers.
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
75e7715
..
5be210a
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"
@@
-55,8
+51,7
@@
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;
-bool setup_device(void)
-{
+bool setup_device(void) {
struct ifreq ifr;
cp();
struct ifreq ifr;
cp();
@@
-65,7
+60,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,10
+72,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;
@@
-116,52
+111,50
@@
bool setup_device(void)
return true;
}
return true;
}
-void close_device(void)
-{
+void close_device(void) {
cp();
close(device_fd);
}
cp();
close(device_fd);
}
-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
+166,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
+204,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);