j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

More consistent variable naming.

Browse source
This commit is contained in:
Guus Sliepen 2007-05-18 11:19:31 +00:00
parent 29fbce4497
commit e37ef57a95
8 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/bsd/device.c
View file

@ -142,13 +142,13 @@ void close_device(void) {
}
bool read_packet(vpn_packet_t *packet) {
int lenin;
int inlen;
cp();
switch(device_type) {
case DEVICE_TYPE_TUN:
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
@ -170,14 +170,14 @@ bool read_packet(vpn_packet_t *packet) {
return false;
}
packet->len = lenin + 14;
packet->len = inlen + 14;
break;
case DEVICE_TYPE_TUNIFHEAD: {
u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
if((lenin = readv(device_fd, vector, 2)) <= 0) {
if((inlen = readv(device_fd, vector, 2)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
@ -201,18 +201,18 @@ bool read_packet(vpn_packet_t *packet) {
return false;
}
packet->len = lenin + 10;
packet->len = inlen + 10;
break;
}
case DEVICE_TYPE_TAP:
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno));
return false;
}
packet->len = lenin;
packet->len = inlen;
break;
default: