X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=fadae5739432bea6bd3618d978c2fc255ffc5787;hb=3e61c7233b087b8400c29ca7a8d079aad8b706d8;hp=303da913484ff754e95a031c0a0f07d38c7081e6;hpb=c9bdac68e1b56d34b8fd8bff03bddda1d2cca516;p=tinc

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 303da913..fadae573 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -2,7 +2,7 @@
     device.c -- Interaction with Solaris tun device
     Copyright (C) 2001-2005 Ivo Timmermans,
                   2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
-                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 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
@@ -33,7 +33,11 @@
 #include "../route.h"
 #include "../utils.h"
 #include "../xalloc.h"
-#include "../if_tun.h"
+
+#ifndef TUNNEWPPA
+#warning Missing net/if_tun.h, using hardcoded value for TUNNEWPPA
+#define TUNNEWPPA       (('T'<<16) | 0x0001)
+#endif
 
 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
@@ -44,18 +48,11 @@ static enum {
 } device_type = DEVICE_TYPE_TUN;
 
 int device_fd = -1;
-static int if_fd = -1;
 static int ip_fd = -1;
-static int arp_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
 
-uint64_t device_in_packets = 0;
-uint64_t device_in_bytes = 0;
-uint64_t device_out_packets = 0;
-uint64_t device_out_bytes = 0;
-
 static bool setup_device(void) {
 	char *type;
 
@@ -136,6 +133,7 @@ static bool setup_device(void) {
 		}
 	}
 
+	int if_fd;
 	if((if_fd = open(device, O_RDWR, 0)) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", device, strerror(errno));
 		return false;
@@ -289,11 +287,11 @@ static void close_device(void) {
 		}
 	}
 
-	close(ip_fd);
-	close(device_fd);
+	close(ip_fd); ip_fd = -1;
+	close(device_fd); device_fd = -1;
 
-	free(device);
-	free(iface);
+	free(device); device = NULL;
+	free(iface); iface = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -301,31 +299,31 @@ static bool read_packet(vpn_packet_t *packet) {
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+			if((inlen = read(device_fd, DATA(packet) + 14, MTU - 14)) <= 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
 
-			switch(packet->data[14] >> 4) {
+			switch(DATA(packet)[14] >> 4) {
 				case 4:
-					packet->data[12] = 0x08;
-					packet->data[13] = 0x00;
+					DATA(packet)[12] = 0x08;
+					DATA(packet)[13] = 0x00;
 					break;
 				case 6:
-					packet->data[12] = 0x86;
-					packet->data[13] = 0xDD;
+					DATA(packet)[12] = 0x86;
+					DATA(packet)[13] = 0xDD;
 					break;
 				default:
-					logger(DEBUG_TRAFFIC, LOG_ERR, "Unknown IP version %d while reading packet from %s %s", packet->data[14] >> 4, device_info, device);
+					logger(DEBUG_TRAFFIC, LOG_ERR, "Unknown IP version %d while reading packet from %s %s", DATA(packet)[14] >> 4, device_info, device);
 					return false;
 			}
 
-			memset(packet->data, 0, 12);
+			memset(DATA(packet), 0, 12);
 			packet->len = inlen + 14;
 			break;
 
 		case DEVICE_TYPE_TAP:
-			if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
+			if((inlen = read(device_fd, DATA(packet), MTU)) <= 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
@@ -337,9 +335,6 @@ static bool read_packet(vpn_packet_t *packet) {
 			abort();
 	}
 
-	device_in_packets++;
-	device_in_bytes += packet->len;
-
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
 
 	return true;
@@ -350,14 +345,14 @@ static bool write_packet(vpn_packet_t *packet) {
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
+			if(write(device_fd, DATA(packet) + 14, packet->len - 14) < 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
 			break;
 
 		case DEVICE_TYPE_TAP:
-			if(write(device_fd, packet->data, packet->len) < 0) {
+			if(write(device_fd, DATA(packet), packet->len) < 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
@@ -367,22 +362,12 @@ static bool write_packet(vpn_packet_t *packet) {
 			abort();
 	}
 
-	device_out_packets++;
-	device_out_bytes += packet->len;
-
 	return true;
 }
 
-static void dump_device_stats(void) {
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_in_bytes);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_out_bytes);
-}
-
 const devops_t os_devops = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
 };