tinc/src/openbsd device.c,1.1.2.16,1.1.2.17

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

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

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


Index: device.c
===================================================================
RCS file: /home/CVS/tinc/src/openbsd/device.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- device.c	2003/07/18 13:41:36	1.1.2.16
+++ device.c	2003/07/22 20:55:21	1.1.2.17
@@ -33,7 +33,6 @@
 #define DEVICE_TYPE_TUNTAP 1
 
 int device_fd = -1;
-int device_type;
 char *device;
 char *iface;
 char *device_info;
@@ -41,7 +40,7 @@
 int device_total_in = 0;
 int device_total_out = 0;
 
-int setup_device(void)
+bool setup_device(void)
 {
 	cp();
 
@@ -52,14 +51,14 @@
 		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 +68,7 @@
 	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 +79,7 @@
 	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 +97,7 @@
 			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;
@@ -109,10 +108,10 @@
 			   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 +135,7 @@
 		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 +146,12 @@
 	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)

--
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/