X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=9c3009d5bb7931720b33fc361f8f76741aca8718;hb=fba1c85f44edfc56c19d35332b1eb825179a8bb6;hp=e8fdc1bc3abc94b603f022f8382c415d39babb96;hpb=798fa2f04c52b0639713f74b1195847bec40c16a;p=tinc

diff --git a/src/bsd/device.c b/src/bsd/device.c
index e8fdc1bc..9c3009d5 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction BSD tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2011 Guus Sliepen <guus@tinc-vpn.org>
                   2009      Grzegorz Dymarek <gregd72002@googlemail.com>
 
     This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include "system.h"
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "route.h"
@@ -51,7 +52,7 @@ static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
 #if defined(TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
-#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
+#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
 static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
 #else
 static device_type_t device_type = DEVICE_TYPE_TUN;
@@ -190,20 +191,19 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
 #ifdef HAVE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			if(device_type == DEVICE_TYPE_TUNEMU)
-				lenin = tunemu_read(device_fd, packet->data + 14, MTU - 14);
+				inlen = tunemu_read(device_fd, packet->data + 14, MTU - 14);
 			else
-#else
-				lenin = read(device_fd, packet->data + 14, MTU - 14);
 #endif
+				inlen = read(device_fd, packet->data + 14, MTU - 14);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				return false;
@@ -225,14 +225,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}};
+			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;
@@ -256,18 +256,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:
@@ -297,7 +297,7 @@ bool write_packet(vpn_packet_t *packet) {
 
 		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];