X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fdarwin%2Fdevice.c;h=00381a5f99bd4da19e74691791bf549e6ee5e0e4;hp=c919de727f32ea861fe9f86cb62af9638fa81df2;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/src/darwin/device.c b/src/darwin/device.c
index c919de72..00381a5f 100644
--- a/src/darwin/device.c
+++ b/src/darwin/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with MacOS/X tun device
-    Copyright (C) 2001-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2001-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2001-2003 Guus Sliepen <guus@sliepen.eu.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,62 +17,45 @@
     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.7 2003/07/06 22:11:33 guus Exp $
+    $Id: device.c,v 1.1.2.10 2003/07/22 20:55:21 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
+#include "system.h"
 
-#include <utils.h>
 #include "conf.h"
-#include "net.h"
 #include "logger.h"
-
-#include "system.h"
+#include "net.h"
+#include "utils.h"
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
 int device_fd = -1;
-int device_type;
 char *device;
-char *interface;
+char *iface;
 char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-/*
-  open the local ethertap device
-*/
-int setup_device(void)
+bool setup_device(void)
 {
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = DEFAULT_DEVICE;
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
-		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 
 	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-		return -1;
+		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+		return false;
 	}
 
 	device_info = _("MacOS/X tun device");
 
-	logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
+	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -82,20 +65,16 @@ void close_device(void)
 	close(device_fd);
 }
 
-/*
-  read, encrypt and send data that is
-  available through the ethertap device
-*/
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 
 	cp();
 
 	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-		logger(DEBUG_ALWAYS, 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 -1;
+		return false;
 	}
 
 	packet->data[12] = 0x08;
@@ -105,33 +84,35 @@ int read_packet(vpn_packet_t *packet)
 
 	device_total_in += packet->len;
 
-	logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"),
+	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();
 
-	logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+	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(DEBUG_ALWAYS, LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
+		logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
 			   device, strerror(errno));
-		return -1;
+		return false;
 	}
 
 	device_total_out += packet->len;
+
+	return true;
 }
 
 void dump_device_stats(void)
 {
 	cp();
 
-	logger(DEBUG_ALWAYS, LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+	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);
 }