X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=26121e27350b9e5974f6b8982f58a3753eca8be9;hp=f1d648d3db5ea732da81f580bb0cdb4112e550e7;hb=8793fb7d43161f4d5358ff73b7a4937ad7e642e2;hpb=a227843b739d279b63adcf3736ebb03d856080c4

diff --git a/src/solaris/device.c b/src/solaris/device.c
index f1d648d3..26121e27 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-2005 Ivo Timmermans,
-                  2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2012 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
@@ -26,6 +26,7 @@
 #include <net/if_tun.h>
 
 #include "conf.h"
+#include "device.h"
 #include "logger.h"
 #include "net.h"
 #include "utils.h"
@@ -34,15 +35,15 @@
 #define DEFAULT_DEVICE "/dev/tun"
 
 int device_fd = -1;
+static int ip_fd = -1, if_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
 
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
 
-bool setup_device(void) {
-	int ip_fd = -1, if_fd = -1;
+static bool setup_device(void) {
 	int ppa;
 	char *ptr;
 
@@ -50,10 +51,14 @@ bool setup_device(void) {
 		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));
+		logger(LOG_ERR, "Could not open %s: %s", device, strerror(errno));
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	ppa = 0;
 
 	ptr = device;
@@ -62,60 +67,70 @@ bool setup_device(void) {
 	ppa = atoi(ptr);
 
 	if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
-		logger(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
+		logger(LOG_ERR, "Could not open /dev/ip: %s", strerror(errno));
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(ip_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	/* 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));
+		logger(LOG_ERR, "Can't assign new interface: %s", strerror(errno));
 		return false;
 	}
 
 	if((if_fd = open(device, O_RDWR, 0)) < 0) {
-		logger(LOG_ERR, _("Could not open %s twice: %s"), device,
+		logger(LOG_ERR, "Could not open %s twice: %s", device,
 			   strerror(errno));
 		return false;
 	}
 
+#ifdef FD_CLOEXEC
+	fcntl(if_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	if(ioctl(if_fd, I_PUSH, "ip") < 0) {
-		logger(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
+		logger(LOG_ERR, "Can't push IP module: %s", strerror(errno));
 		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));
+		logger(LOG_ERR, "Can't set PPA %d: %s", ppa, strerror(errno));
 		return false;
 	}
 
 	if(ioctl(ip_fd, I_LINK, if_fd) < 0) {
-		logger(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
+		logger(LOG_ERR, "Can't link TUN device to IP: %s", strerror(errno));
 		return false;
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 		xasprintf(&iface, "tun%d", ppa);
 
-	device_info = _("Solaris tun device");
+	device_info = "Solaris tun device";
 
-	logger(LOG_INFO, _("%s is a %s"), device, device_info);
+	logger(LOG_INFO, "%s is a %s", device, device_info);
 
 	return true;
 }
 
-void close_device(void) {
+static void close_device(void) {
+	close(if_fd);
+	close(ip_fd);
 	close(device_fd);
 
 	free(device);
 	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet) {
+static bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
 	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+		logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
 	}
@@ -131,27 +146,28 @@ bool read_packet(vpn_packet_t *packet) {
 			break;
 		default:
 			ifdebug(TRAFFIC) logger(LOG_ERR,
-					   _ ("Unknown IP version %d while reading packet from %s %s"),
+					   "Unknown IP version %d while reading packet from %s %s",
 					   packet->data[14] >> 4, device_info, device);
 			return false;
 	}
 
+	memset(packet->data, 0, 12);
 	packet->len = lenin + 14;
 
 	device_total_in += packet->len;
 
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
 			   device_info);
 
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet) {
-	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+static bool write_packet(vpn_packet_t *packet) {
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   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,
+		logger(LOG_ERR, "Can't write to %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
 	}
@@ -161,8 +177,16 @@ bool write_packet(vpn_packet_t *packet) {
 	return true;
 }
 
-void dump_device_stats(void) {
-	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+static void dump_device_stats(void) {
+	logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
+
+const devops_t os_devops = {
+	.setup = setup_device,
+	.close = close_device,
+	.read = read_packet,
+	.write = write_packet,
+	.dump_stats = dump_device_stats,
+};