X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=73046b8c8f9e76c17afcc9fefe6d73c98e4691cb;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hp=2f1972aab14cbeb05591246d7b3a8941fbb5233c;hpb=bd7c8ae78e68e9de99436d03062fccb676549e01;p=tinc

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 2f1972aa..73046b8c 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-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2017 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"
@@ -86,6 +87,9 @@ static bool setup_device(void) {
 	else
 		device_info = "Solaris tap device";
 
+	if(device_type == DEVICE_TYPE_TAP && routing_mode == RMODE_ROUTER)
+		overwrite_mac = true;
+
 	/* The following is black magic copied from OpenVPN. */
 
 	if((ip_fd = open(IP_DEVICE, O_RDWR, 0)) < 0) {
@@ -111,7 +115,7 @@ static bool setup_device(void) {
 
 	struct strioctl strioc_ppa = {
 		.ic_cmd = TUNNEWPPA,
-		.ic_len = sizeof ppa,
+		.ic_len = sizeof(ppa),
 		.ic_dp = (char *)&ppa,
 	};
 
@@ -152,7 +156,7 @@ static bool setup_device(void) {
 	{
 		/* Remove muxes just in case they are left over from a crashed tincd */
 		struct lifreq ifr = {};
-		strncpy(ifr.lifr_name, iface, sizeof ifr.lifr_name);
+		strncpy(ifr.lifr_name, iface, sizeof(ifr.lifr_name));
 		if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
 			int muxid = ifr.lifr_arp_muxid;
 			ioctl(ip_fd, I_PUNLINK, muxid);
@@ -225,7 +229,7 @@ static bool setup_device(void) {
 		/* Set ifname to arp */
 		struct strioctl strioc_if = {
 			.ic_cmd = SIOCSLIFNAME,
-			.ic_len = sizeof ifr,
+			.ic_len = sizeof(ifr),
 			.ic_dp = (char *)&ifr,
 		};
 
@@ -281,7 +285,7 @@ static bool setup_device(void) {
 static void close_device(void) {
 	if(iface) {
 		struct lifreq ifr = {};
-		strncpy(ifr.lifr_name, iface, sizeof ifr.lifr_name);
+		strncpy(ifr.lifr_name, iface, sizeof(ifr.lifr_name));
 		if(ioctl(ip_fd, SIOCGLIFMUXID, &ifr) >= 0) {
 			int muxid = ifr.lifr_arp_muxid;
 			ioctl(ip_fd, I_PUNLINK, muxid);
@@ -298,11 +302,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, packet->data + 14, MTU - 14)) <= 0) {
+			sbuf.maxlen = MTU - 14;
+			sbuf.buf = (char *)packet->data + 14;
+
+			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;
 			}
@@ -322,16 +331,19 @@ static bool read_packet(vpn_packet_t *packet) {
 			}
 
 			memset(packet->data, 0, 12);
-			packet->len = inlen + 14;
+			packet->len = sbuf.len + 14;
 			break;
 
 		case DEVICE_TYPE_TAP:
-			if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
+			sbuf.maxlen = MTU;
+			sbuf.buf = (char *)packet->data;
+
+			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:
@@ -348,16 +360,24 @@ static bool read_packet(vpn_packet_t *packet) {
 static bool write_packet(vpn_packet_t *packet) {
 	ifdebug(TRAFFIC) logger(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) {
+			sbuf.len = packet->len - 14;
+			sbuf.buf = (char *)packet->data + 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) {
+			sbuf.len = packet->len;
+			sbuf.buf = (char *)packet->data;
+
+			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;
 			}