X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=a258e34e34f8097cd1c28c43a7eca74771d9fd20;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=118dfaa1931e29b0d4b9adb2f5507eb1232c5963;hpb=a39a9506cd041a7092a98498b362eaacfd2f33c3;p=meshlink

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 118dfaa1..a258e34e 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-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2009 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
@@ -43,8 +43,7 @@ static char *device_info = NULL;
 static int device_total_in = 0;
 static int device_total_out = 0;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
 	int ip_fd = -1, if_fd = -1;
 	int ppa;
 	char *ptr;
@@ -100,7 +99,7 @@ bool setup_device(void)
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-		asprintf(&iface, "tun%d", ppa);
+		xasprintf(&iface, "tun%d", ppa);
 
 	device_info = _("Solaris tun device");
 
@@ -109,8 +108,7 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	close(device_fd);
@@ -119,13 +117,12 @@ void close_device(void)
 	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-	int lenin;
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 
 	cp();
 
-	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+	if((inlen = 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 false;
@@ -147,7 +144,7 @@ bool read_packet(vpn_packet_t *packet)
 			return false;
 	}
 
-	packet->len = lenin + 14;
+	packet->len = inlen + 14;
 
 	device_total_in += packet->len;
 
@@ -157,8 +154,7 @@ bool read_packet(vpn_packet_t *packet)
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
@@ -175,8 +171,7 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
 	cp();
 
 	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);