X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=9a6cfb65aae64e193b06c146006883bbd86be90e;hp=9b92f2e5c4682a613f4ff632d5558f5ea954411d;hb=5bba3124c8c23568def7a4804651a53f3a6b4fd2;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 9b92f2e5..9a6cfb65 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-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2001-2004 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.17 2003/07/31 11:20:32 guus Exp $
+    $Id$
 */
 
 
@@ -37,11 +37,10 @@
 int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
-char ifrname[IFNAMSIZ];
 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;
 
 bool setup_device(void)
 {
@@ -128,8 +127,21 @@ bool read_packet(vpn_packet_t *packet)
 		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;