X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=d647734ed16d92a1baf9bdf56cccfede7625fbfc;hb=ce8775000ab38229a78ecf3dc26bab008ca0f332;hp=fd1f35ddaa77e83bdef189d6f0e4afff1ccac85e;hpb=430c90412c521c534113b3c4e5fc883e9b7ecff0;p=tinc

diff --git a/src/bsd/device.c b/src/bsd/device.c
index fd1f35dd..d647734e 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction BSD tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2011 Guus Sliepen <guus@tinc-vpn.org>
                   2009      Grzegorz Dymarek <gregd72002@googlemail.com>
 
     This program is free software; you can redistribute it and/or modify
@@ -47,11 +47,11 @@ int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
-static int device_total_in = 0;
-static int device_total_out = 0;
+static uint64_t device_total_in = 0;
+static uint64_t device_total_out = 0;
 #if defined(TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
-#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD)
+#elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
 static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
 #else
 static device_type_t device_type = DEVICE_TYPE_TUN;
@@ -64,7 +64,7 @@ bool setup_device(void) {
 		device = xstrdup(DEFAULT_DEVICE);
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 
 	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
 		if(!strcasecmp(type, "tun"))
@@ -150,6 +150,17 @@ bool setup_device(void) {
 			if(routing_mode == RMODE_ROUTER)
 				overwrite_mac = true;
 			device_info = "Generic BSD tap device";
+#ifdef TAPGIFNAME
+			{
+				struct ifreq ifr;
+				if(ioctl(device_fd, TAPGIFNAME, (void*)&ifr) == 0) {
+					if(iface)
+						free(iface);
+					iface = xstrdup(ifr.ifr_name);
+				}
+			}
+			
+#endif
 			break;
 #ifdef HAVE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
@@ -179,20 +190,19 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	int inlen;
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
 #ifdef HAVE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			if(device_type == DEVICE_TYPE_TUNEMU)
-				lenin = tunemu_read(device_fd, packet->data + 14, MTU - 14);
+				inlen = tunemu_read(device_fd, packet->data + 14, MTU - 14);
 			else
-#else
-				lenin = read(device_fd, packet->data + 14, MTU - 14);
 #endif
+				inlen = read(device_fd, packet->data + 14, MTU - 14);
 
-			if(lenin <= 0) {
+			if(inlen <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				return false;
@@ -214,14 +224,14 @@ bool read_packet(vpn_packet_t *packet) {
 					return false;
 			}
 
-			packet->len = lenin + 14;
+			packet->len = inlen + 14;
 			break;
 
 		case DEVICE_TYPE_TUNIFHEAD: {
 			u_int32_t type;
-			struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
+			struct iovec vector[2] = {{&type, sizeof type}, {packet->data + 14, MTU - 14}};
 
-			if((lenin = readv(device_fd, vector, 2)) <= 0) {
+			if((inlen = readv(device_fd, vector, 2)) <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				return false;
@@ -245,18 +255,18 @@ bool read_packet(vpn_packet_t *packet) {
 					return false;
 			}
 
-			packet->len = lenin + 10;
+			packet->len = inlen + 10;
 			break;
 		}
 
 		case DEVICE_TYPE_TAP:
-			if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+			if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
 				logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
 					   device, strerror(errno));
 				return false;
 			}
 
-			packet->len = lenin;
+			packet->len = inlen;
 			break;
 
 		default:
@@ -268,7 +278,6 @@ bool read_packet(vpn_packet_t *packet) {
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s",
 			   packet->len, device_info);
 
-	logger(LOG_INFO, "E:fd_read");
 	return true;
 }
 
@@ -287,7 +296,7 @@ bool write_packet(vpn_packet_t *packet) {
 
 		case DEVICE_TYPE_TUNIFHEAD: {
 			u_int32_t type;
-			struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, packet->len - 14}};
+			struct iovec vector[2] = {{&type, sizeof type}, {packet->data + 14, packet->len - 14}};
 			int af;
 			
 			af = (packet->data[12] << 8) + packet->data[13];
@@ -343,6 +352,6 @@ bool write_packet(vpn_packet_t *packet) {
 
 void dump_device_stats(void) {
 	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);
+	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }