X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=eac267ad8b1603c53d5038be713764de15b434cc;hb=33f241d97852d7a171f1aaf1bda7f66356ff889e;hp=d14975b311c9e8ee50372d307b687c7f737c15e1;hpb=3ce5e292da8bab3a1316faf1ca18625f05074467;p=meshlink

diff --git a/src/solaris/device.c b/src/solaris/device.c
index d14975b3..eac267ad 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Solaris tun device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2011 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <net/if_tun.h>
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "utils.h"
@@ -114,9 +115,9 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 
-	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;
@@ -138,7 +139,7 @@ bool read_packet(vpn_packet_t *packet) {
 			return false;
 	}
 
-	packet->len = lenin + 14;
+	packet->len = inlen + 14;
 
 	device_total_in += packet->len;