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

diff --git a/src/solaris/device.c b/src/solaris/device.c
index fadae573..89481c7b 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -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,
@@ -84,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;
 	}
 
@@ -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;
 		}
 
@@ -295,11 +297,16 @@ static void close_device(void) {
 }
 
 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, DATA(packet) + 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;
 			}
@@ -319,16 +326,19 @@ static bool read_packet(vpn_packet_t *packet) {
 			}
 
 			memset(DATA(packet), 0, 12);
-			packet->len = inlen + 14;
+			packet->len = sbuf.len + 14;
 			break;
 
 		case DEVICE_TYPE_TAP:
-			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));
+			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, DATA(packet) + 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, DATA(packet), 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;