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
35c66d5
..
72becd7
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/device.c
@@
-73,7
+73,7
@@
bool setup_device(void) {
#ifdef HAVE_LINUX_IF_TUN_H
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
#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)
);
+ 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;
@@
-121,41
+121,41
@@
void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
}
bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
switch(device_type) {
case DEVICE_TYPE_TUN:
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;
}