X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=5be210a582f6eb2b33b8916fab0b8b92dcd9b229;hb=6e80da3370249caa1082c23c3ef55f338d1e9e74;hp=519896e71c4e513d1559d12ef48a7bfce5b53b71;hpb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 519896e7..5be210a5 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -75,7 +75,7 @@ bool setup_device(void) {
 #ifdef HAVE_LINUX_IF_TUN_H
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
-	memset(&ifr, 0, sizeof(ifr));
+	memset(&ifr, 0, sizeof ifr);
 	if(routing_mode == RMODE_ROUTER) {
 		ifr.ifr_flags = IFF_TUN;
 		device_type = DEVICE_TYPE_TUN;
@@ -118,43 +118,43 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 	
 	cp();
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			lenin = read(device_fd, packet->data + 10, MTU - 10);
+			inlen = read(device_fd, packet->data + 10, MTU - 10);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
 					   device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin + 10;
+			packet->len = inlen + 10;
 			break;
 		case DEVICE_TYPE_TAP:
-			lenin = read(device_fd, packet->data, MTU);
+			inlen = read(device_fd, packet->data, MTU);
 
-			if(lenin <= 0) {
+			if(inlen <= 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;
 		case DEVICE_TYPE_ETHERTAP:
-			lenin = read(device_fd, packet->data - 2, MTU + 2);
+			inlen = read(device_fd, packet->data - 2, MTU + 2);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
 					   device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin - 2;
+			packet->len = inlen - 2;
 			break;
 	}