X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=89481c7b392aa8d5b12f49707d0531b364e9e33a;hb=95f09569beb2e304e6a2112d20cee6fab88f3729;hp=4940ddb593b87810885c58b0368508013970b9f1;hpb=41583d5dcfc1277b1a203478de4cce2cd0cda1b1;p=tinc

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 4940ddb5..89481c7b 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
@@ -24,6 +24,7 @@
 
 #include <sys/stropts.h>
 #include <sys/sockio.h>
+#include <stropts.h>
 
 #include "../conf.h"
 #include "../device.h"
@@ -41,6 +42,7 @@
 
 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
+#define IP_DEVICE "/dev/udp"
 
 static enum {
 	DEVICE_TYPE_TUN,
@@ -48,7 +50,6 @@ static enum {
 } device_type = DEVICE_TYPE_TUN;
 
 int device_fd = -1;
-static int if_fd = -1;
 static int ip_fd = -1;
 char *device = NULL;
 char *iface = NULL;
@@ -85,8 +86,8 @@ static bool setup_device(void) {
 
 	/* The following is black magic copied from OpenVPN. */
 
-	if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", "/dev/ip", strerror(errno));
+	if((ip_fd = open(IP_DEVICE, O_RDWR, 0)) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", IP_DEVICE, strerror(errno));
 		return false;
 	}
 
@@ -134,6 +135,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;
@@ -203,7 +205,7 @@ static bool setup_device(void) {
 
 		/* Push arp module to ip_fd */
 		if(ioctl(ip_fd, I_PUSH, "arp") < 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Could not push ARP module onto %s!", "/dev/ip");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Could not push ARP module onto %s!", IP_DEVICE);
 			return false;
 		}
 
@@ -287,48 +289,56 @@ 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) {
-	int inlen;
+	int result;
+	struct strbuf sbuf;
+	int f = 0;
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+			sbuf.maxlen = MTU - 14;
+			sbuf.buf = (char *)DATA(packet) + 14;
+
+			if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 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);
-			packet->len = inlen + 14;
+			memset(DATA(packet), 0, 12);
+			packet->len = sbuf.len + 14;
 			break;
 
 		case DEVICE_TYPE_TAP:
-			if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
+			sbuf.maxlen = MTU;
+			sbuf.buf = (char *)DATA(packet);
+
+			if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
+				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
 
-			packet->len = inlen + 14;
+			packet->len = sbuf.len;
 			break;
 
 		default:
@@ -343,17 +353,25 @@ static bool read_packet(vpn_packet_t *packet) {
 static bool write_packet(vpn_packet_t *packet) {
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s", packet->len, device_info);
 
+	struct strbuf sbuf;
+
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-			if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+			sbuf.len = packet->len - 14;
+			sbuf.buf = (char *)DATA(packet) + 14;
+
+			if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
+				logger(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) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
+			sbuf.len = packet->len;
+			sbuf.buf = (char *)DATA(packet);
+
+			if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
+				logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
 				return false;
 			}
 			break;