X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetbsd%2Fdevice.c;h=d09983394d53c2a1443890fabaa578075244989e;hp=53bd9da8bec0a7113903b0ca0abad4a0e37c89e7;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/netbsd/device.c b/src/netbsd/device.c
index 53bd9da8..d0998339 100644
--- a/src/netbsd/device.c
+++ b/src/netbsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with NetBSD 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,30 +17,15 @@
     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.5 2002/09/09 21:25:23 guus Exp $
+    $Id: device.c,v 1.1.2.12 2003/07/22 20:55:21 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <utils.h>
+#include "system.h"
+
 #include "conf.h"
+#include "logger.h"
 #include "net.h"
-#include "subnet.h"
-
-#include "system.h"
+#include "utils.h"
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
@@ -48,62 +33,53 @@
 #define DEVICE_TYPE_TUNTAP 1
 
 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;
 
-extern subnet_t mymac;
-
-/*
-  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;
-	cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-		syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-		return -1;
+	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(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+		return false;
 	}
-	cp
-		/* Set default MAC address for ethertap devices */
-		mymac.type = SUBNET_MAC;
-	mymac.net.mac.address.x[0] = 0xfe;
-	mymac.net.mac.address.x[1] = 0xfd;
-	mymac.net.mac.address.x[2] = 0x00;
-	mymac.net.mac.address.x[3] = 0x00;
-	mymac.net.mac.address.x[4] = 0x00;
-	mymac.net.mac.address.x[5] = 0x00;
 
 	device_info = _("NetBSD tun device");
 
-	syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-	cp return 0;
+	logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+	return true;
 }
 
 void close_device(void)
 {
-	cp close(device_fd);
-cp}
+	cp();
 
-int read_packet(vpn_packet_t * packet)
+	close(device_fd);
+}
+
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
-	cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-		syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+
+	cp();
+
+	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;
 	}
 
-	memcpy(packet->data, mymac.net.mac.address.x, 6);
-	memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
 	packet->data[12] = 0x08;
 	packet->data[13] = 0x00;
 
@@ -111,32 +87,36 @@ int read_packet(vpn_packet_t * packet)
 
 	device_total_in += packet->len;
 
-	if(debug_lvl >= DEBUG_TRAFFIC) {
-		syslog(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 0;
-cp}
+	return true;
+}
 
-int write_packet(vpn_packet_t * packet)
+bool write_packet(vpn_packet_t *packet)
 {
-	cp if(debug_lvl >= DEBUG_TRAFFIC)
-		syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+	cp();
+
+	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) {
-		syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+		logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 			   strerror(errno));
-		return -1;
+		return false;
 	}
 
 	device_total_out += packet->len;
-cp}
+
+	return true;
+}
 
 void dump_device_stats(void)
 {
-	cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	syslog(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-cp}
+	cp();
+
+	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);
+}