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

Fix BSD tun device support.

Browse source 
This was broken by a botched merge from the master branch in commit d7f6737.
This commit is contained in:
Guus Sliepen 2016-04-27 20:30:36 +02:00
parent 390d25f0b8
commit 8377d0b856
1 changed files with 5 additions and 5 deletions

10
src/bsd/device.c
View file

@ -349,13 +349,13 @@ static bool read_packet(vpn_packet_t *packet) {
case DEVICE_TYPE_UTUN: case DEVICE_TYPE_UTUN:
case DEVICE_TYPE_TUNIFHEAD: { case DEVICE_TYPE_TUNIFHEAD: {
if((inlen = read(device_fd, packet->data + 10, MTU - 10)) <= 0) { if((inlen = read(device_fd, DATA(packet) + 10, MTU - 10)) <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno)); device, strerror(errno));
return false; return false;
} }
switch (packet->data[14] >> 4) { switch (DATA(packet)[14] >> 4) {
case 4: case 4:
DATA(packet)[12] = 0x08; DATA(packet)[12] = 0x08;
DATA(packet)[13] = 0x00; DATA(packet)[13] = 0x00;
@ -369,7 +369,7 @@ static bool read_packet(vpn_packet_t *packet) {
default: default:
logger(DEBUG_TRAFFIC, LOG_ERR, logger(DEBUG_TRAFFIC, LOG_ERR,
"Unknown IP version %d while reading packet from %s %s", "Unknown IP version %d while reading packet from %s %s",
packet->data[14] >> 4, device_info, device); DATA(packet)[14] >> 4, device_info, device);
return false; return false;
} }
@ -430,9 +430,9 @@ static bool write_packet(vpn_packet_t *packet) {
return false; return false;
} }
memcpy(packet->data + 10, &type, sizeof type); memcpy(DATA(packet) + 10, &type, sizeof type);
if(write(device_fd, packet->data + 10, packet->len - 10) < 0) { if(write(device_fd, DATA(packet) + 10, packet->len - 10) < 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno)); strerror(errno));
return false; return false;