X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=904c36cba6282049eaa6072b8f6d3c48bb92fe80;hp=08d9364daef97ff848c9e7c034c4fd27350edf54;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/src/linux/device.c b/src/linux/device.c
index 08d9364d..904c36cb 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -17,7 +17,7 @@
     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.18 2003/07/17 15:06:27 guus Exp $
+    $Id: device.c,v 1.1.2.20 2003/07/22 20:55:21 guus Exp $
 */
 
 #include "system.h"
@@ -39,23 +39,23 @@
 #include "route.h"
 #include "utils.h"
 
-enum {
+typedef enum device_type_t {
 	DEVICE_TYPE_ETHERTAP,
 	DEVICE_TYPE_TUN,
 	DEVICE_TYPE_TAP,
-};
+} device_type_t;
 
 int device_fd = -1;
-int device_type;
+device_type_t device_type;
 char *device;
-char *interface;
+char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
-int setup_device(void)
+bool setup_device(void)
 {
 	struct ifreq ifr;
 
@@ -64,17 +64,17 @@ int setup_device(void)
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = DEFAULT_DEVICE;
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 #ifdef HAVE_TUNTAP
-		interface = netname;
+		iface = netname;
 #else
-		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 #endif
 	device_fd = open(device, O_RDWR | O_NONBLOCK);
 
 	if(device_fd < 0) {
 		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-		return -1;
+		return false;
 	}
 
 #ifdef HAVE_TUNTAP
@@ -91,29 +91,29 @@ int setup_device(void)
 		device_info = _("Linux tun/tap device (tap mode)");
 	}
 
-	if(interface)
-		strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+	if(iface)
+		strncpy(ifr.ifr_name, iface, IFNAMSIZ);
 
 	if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-		interface = ifrname;
+		iface = ifrname;
 	} else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
 		logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-		interface = ifrname;
+		iface = ifrname;
 	} else
 #endif
 	{
 		if(routing_mode == RMODE_ROUTER)
-			overwrite_mac = 1;
+			overwrite_mac = true;
 		device_info = _("Linux ethertap device");
 		device_type = DEVICE_TYPE_ETHERTAP;
-		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 	}
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
-	return 0;
+	return true;
 }
 
 void close_device(void)
@@ -123,7 +123,7 @@ void close_device(void)
 	close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 	
@@ -136,7 +136,7 @@ int read_packet(vpn_packet_t *packet)
 			if(lenin <= 0) {
 				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
 					   device_info, device, strerror(errno));
-				return -1;
+				return false;
 			}
 
 			packet->len = lenin + 10;
@@ -147,7 +147,7 @@ int read_packet(vpn_packet_t *packet)
 			if(lenin <= 0) {
 				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
 					   device_info, device, strerror(errno));
-				return -1;
+				return false;
 			}
 
 			packet->len = lenin;
@@ -158,7 +158,7 @@ int read_packet(vpn_packet_t *packet)
 			if(lenin <= 0) {
 				logger(LOG_ERR, _("Error while reading from %s %s: %s"),
 					   device_info, device, strerror(errno));
-				return -1;
+				return false;
 			}
 
 			packet->len = lenin - 2;
@@ -170,10 +170,10 @@ 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)
 {
 	cp();
 
@@ -186,14 +186,14 @@ int write_packet(vpn_packet_t *packet)
 			if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
 				logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 					   strerror(errno));
-				return -1;
+				return false;
 			}
 			break;
 		case DEVICE_TYPE_TAP:
 			if(write(device_fd, packet->data, packet->len) < 0) {
 				logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 					   strerror(errno));
-				return -1;
+				return false;
 			}
 			break;
 		case DEVICE_TYPE_ETHERTAP:
@@ -202,14 +202,14 @@ int write_packet(vpn_packet_t *packet)
 			if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
 				logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 					   strerror(errno));
-				return -1;
+				return false;
 			}
 			break;
 	}
 
 	device_total_out += packet->len;
 
-	return 0;
+	return true;
 }
 
 void dump_device_stats(void)