X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=9a1688a805624a0146f08e93ef09e8e62ee30754;hp=45c2d5f656b5b90338e7cce3de62a526c34d26dd;hb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b;hpb=65e8e06c6dc7349b11c3c1e8f4071b51e2994c65

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 45c2d5f6..9a1688a8 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -195,19 +195,19 @@ static void close_device(void) {
 }
 
 static 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
 #endif
-				lenin = read(device_fd, packet->data + 14, MTU - 14);
+				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;
@@ -229,14 +229,14 @@ static 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;
@@ -260,18 +260,18 @@ static 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:
@@ -301,7 +301,7 @@ static 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];