X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=04a36a8580d9b64f2d7faf09841586cd9288dae3;hp=3cafa2388d800be5e418a2dda11460b6a5d5c918;hb=b069da90d67b49dce041f513a3855b8da3d82f80;hpb=00ddbf5723511d80fbd2522fc503bd409dc6189a

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 3cafa238..04a36a85 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Solaris tun device
-    Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2001-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2001-2005 Ivo Timmermans,
+                  2001-2006 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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.15 2003/07/18 13:41:37 guus Exp $
+    $Id$
 */
 
 
@@ -31,20 +31,19 @@
 #include "logger.h"
 #include "net.h"
 #include "utils.h"
+#include "xalloc.h"
 
 #define DEFAULT_DEVICE "/dev/tun"
 
 int device_fd = -1;
-int device_type;
 char *device = NULL;
 char *iface = NULL;
-char ifrname[IFNAMSIZ];
-char *device_info = NULL;
+static char *device_info = NULL;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
-int setup_device(void)
+bool setup_device(void)
 {
 	int ip_fd = -1, if_fd = -1;
 	int ppa;
@@ -53,11 +52,11 @@ int setup_device(void)
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		device = DEFAULT_DEVICE;
+		device = xstrdup(DEFAULT_DEVICE);
 
 	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
 		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-		return -1;
+		return false;
 	}
 
 	ppa = 0;
@@ -69,35 +68,35 @@ int setup_device(void)
 
 	if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
 		logger(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
-		return -1;
+		return false;
 	}
 
 	/* Assign a new PPA and get its unit number. */
 	if((ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0) {
 		logger(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
-		return -1;
+		return false;
 	}
 
 	if((if_fd = open(device, O_RDWR, 0)) < 0) {
 		logger(LOG_ERR, _("Could not open %s twice: %s"), device,
 			   strerror(errno));
-		return -1;
+		return false;
 	}
 
 	if(ioctl(if_fd, I_PUSH, "ip") < 0) {
 		logger(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
-		return -1;
+		return false;
 	}
 
 	/* Assign ppa according to the unit number returned by tun device */
 	if(ioctl(if_fd, IF_UNITSEL, (char *) &ppa) < 0) {
 		logger(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
-		return -1;
+		return false;
 	}
 
 	if(ioctl(ip_fd, I_LINK, if_fd) < 0) {
 		logger(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
-		return -1;
+		return false;
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
@@ -107,7 +106,7 @@ int setup_device(void)
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -117,7 +116,7 @@ void close_device(void)
 	close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 
@@ -126,11 +125,24 @@ int read_packet(vpn_packet_t *packet)
 	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
 		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
-		return -1;
+		return false;
 	}
 
-	packet->data[12] = 0x08;
-	packet->data[13] = 0x00;
+	switch(packet->data[14] >> 4) {
+		case 4:
+			packet->data[12] = 0x08;
+			packet->data[13] = 0x00;
+			break;
+		case 6:
+			packet->data[12] = 0x86;
+			packet->data[13] = 0xDD;
+			break;
+		default:
+			ifdebug(TRAFFIC) logger(LOG_ERR,
+					   _ ("Unknown IP version %d while reading packet from %s %s"),
+					   packet->data[14] >> 4, device_info, device);
+			return false;
+	}
 
 	packet->len = lenin + 14;
 
@@ -139,10 +151,10 @@ int read_packet(vpn_packet_t *packet)
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
 			   device_info);
 
-	return 0;
+	return true;
 }
 
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
 {
 	cp();
 
@@ -150,14 +162,14 @@ int write_packet(vpn_packet_t *packet)
 			   packet->len, device_info);
 
 	if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
-		logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len,
-			   strerror(errno));
-		return -1;
+		logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info,
+			   device, strerror(errno));
+		return false;
 	}
 
 	device_total_out += packet->len;
 
-	return 0;
+	return true;
 }
 
 void dump_device_stats(void)