X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=92c3c03010c24114a9563e3116abe436098d86e8;hp=9af2e3e3f0a6db03a72dc073d1de2b7a3b0dd14d;hb=e8b11b1cca11f7f50542a7b34f4251f43447db0d;hpb=00ddbf5723511d80fbd2522fc503bd409dc6189a

diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index 9af2e3e3..92c3c030 100644
--- a/src/openbsd/device.c
+++ b/src/openbsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with OpenBSD 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,10 +17,11 @@
     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.16 2003/07/18 13:41:36 guus Exp $
+    $Id$
 */
 
 #include "system.h"
+#include <sys/uio.h>
 
 #include "conf.h"
 #include "logger.h"
@@ -29,19 +30,15 @@
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
-#define DEVICE_TYPE_ETHERTAP 0
-#define DEVICE_TYPE_TUNTAP 1
-
 int device_fd = -1;
-int device_type;
 char *device;
 char *iface;
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
-int setup_device(void)
+bool setup_device(void)
 {
 	cp();
 
@@ -52,14 +49,14 @@ int setup_device(void)
 		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 -1;
+		return false;
 	}
 
 	device_info = _("OpenBSD tun device");
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -69,7 +66,7 @@ void close_device(void)
 	close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 	u_int32_t type;
@@ -80,7 +77,7 @@ int read_packet(vpn_packet_t *packet)
 	if((lenin = readv(device_fd, vector, 2)) <= 0) {
 		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
-		return -1;
+		return false;
 	}
 
 	switch (ntohl(type)) {
@@ -98,7 +95,7 @@ int read_packet(vpn_packet_t *packet)
 			ifdebug(TRAFFIC) logger(LOG_ERR,
 				           _ ("Unknown address family %d while reading packet from %s %s"),
 				           ntohl(type), device_info, device);
-		        return -1;
+		        return false;
 	}
 
 	packet->len = lenin + 10;
@@ -107,12 +104,11 @@ int read_packet(vpn_packet_t *packet)
 
 	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)
 {
 	u_int32_t type;
 	struct iovec vector[2];
@@ -136,7 +132,7 @@ int write_packet(vpn_packet_t *packet)
 		ifdebug(TRAFFIC) logger(LOG_ERR,
 				   _("Unknown address family %d while writing packet to %s %s"),
 				   af, device_info, device);
-		return -1;
+		return false;
 	}
 
 	vector[0].iov_base = &type;
@@ -147,10 +143,12 @@ int write_packet(vpn_packet_t *packet)
 	if(writev(device_fd, vector, 2) < 0) {
 		logger(LOG_ERR, _("Can't write 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)