tinc/src/darwin device.c,1.1.2.9,1.1.2.10

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src/darwin
In directory humbolt:/tmp/cvs-serv6420/src/darwin

Modified Files:
      Tag: CABAL
	device.c 
Log Message:
Use bools and enums where appropriate.


Index: device.c
===================================================================
RCS file: /home/CVS/tinc/src/darwin/Attic/device.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- device.c	2003/07/18 13:41:36	1.1.2.9
+++ device.c	2003/07/22 20:55:21	1.1.2.10
@@ -30,14 +30,13 @@
 #define DEFAULT_DEVICE "/dev/tun0"
 
 int device_fd = -1;
-int device_type;
 char *device;
 char *iface;
 char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-int setup_device(void)
+bool setup_device(void)
 {
 	cp();
 
@@ -49,14 +48,14 @@
 
 	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 = _("MacOS/X tun device");
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -66,7 +65,7 @@
 	close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 
@@ -75,7 +74,7 @@
 	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;
 	}
 
 	packet->data[12] = 0x08;
@@ -88,10 +87,10 @@
 	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();
 
@@ -101,10 +100,12 @@
 	if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
 		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)

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/