projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
bsd
/
device.c
diff --git
a/src/bsd/device.c
b/src/bsd/device.c
index
d6ef0e8
..
d647734
100644
(file)
--- a/
src/bsd/device.c
+++ b/
src/bsd/device.c
@@
-190,19
+190,19
@@
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:
#ifdef HAVE_TUNEMU
case DEVICE_TYPE_TUNEMU:
if(device_type == DEVICE_TYPE_TUNEMU)
switch(device_type) {
case DEVICE_TYPE_TUN:
#ifdef HAVE_TUNEMU
case DEVICE_TYPE_TUNEMU:
if(device_type == DEVICE_TYPE_TUNEMU)
-
leni
n = tunemu_read(device_fd, packet->data + 14, MTU - 14);
+
inle
n = tunemu_read(device_fd, packet->data + 14, MTU - 14);
else
#endif
else
#endif
-
leni
n = read(device_fd, packet->data + 14, MTU - 14);
+
inle
n = read(device_fd, packet->data + 14, MTU - 14);
- 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;
@@
-224,14
+224,14
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 14;
+ packet->len =
inle
n + 14;
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
- struct iovec vector[2] = {{&type, sizeof
(type)
}, {packet->data + 14, MTU - 14}};
+ struct iovec vector[2] = {{&type, sizeof
type
}, {packet->data + 14, MTU - 14}};
- if((
leni
n = readv(device_fd, vector, 2)) <= 0) {
+ if((
inle
n = readv(device_fd, vector, 2)) <= 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;
@@
-255,18
+255,18
@@
bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- packet->len =
leni
n + 10;
+ packet->len =
inle
n + 10;
break;
}
case DEVICE_TYPE_TAP:
break;
}
case DEVICE_TYPE_TAP:
- if((
leni
n = read(device_fd, packet->data, MTU)) <= 0) {
+ if((
inle
n = read(device_fd, packet->data, MTU)) <= 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;
default:
break;
default:
@@
-296,7
+296,7
@@
bool write_packet(vpn_packet_t *packet) {
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
- struct iovec vector[2] = {{&type, sizeof
(type)
}, {packet->data + 14, packet->len - 14}};
+ struct iovec vector[2] = {{&type, sizeof
type
}, {packet->data + 14, packet->len - 14}};
int af;
af = (packet->data[12] << 8) + packet->data[13];
int af;
af = (packet->data[12] << 8) + packet->data[13];