X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=b1a30d22a370c888296190df5aed1cd1a17c3e6f;hp=48d8b9bd4a8129f90bfb640c37bf4356d3df8c8e;hb=12de5a8eedd985f4732e88de6185f77a8244612c;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8

diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index 48d8b9bd..b1a30d22 100644
--- a/src/openbsd/device.c
+++ b/src/openbsd/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.11 2002/09/09 22:33:27 guus Exp $
+    $Id: device.c,v 1.1.2.13 2003/06/11 19:28:37 guus Exp $
 */
 
 #include "config.h"
@@ -56,75 +56,69 @@ char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-extern subnet_t mymac;
-
 /*
   open the local ethertap device
 */
 int setup_device(void)
 {
+	cp();
+
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = DEFAULT_DEVICE;
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
 		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-	cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
 		syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
 		return -1;
 	}
-	cp
-		/* Set default MAC address for ethertap devices */
-		mymac.type = SUBNET_MAC;
-	mymac.net.mac.address.x[0] = 0xfe;
-	mymac.net.mac.address.x[1] = 0xfd;
-	mymac.net.mac.address.x[2] = 0x00;
-	mymac.net.mac.address.x[3] = 0x00;
-	mymac.net.mac.address.x[4] = 0x00;
-	mymac.net.mac.address.x[5] = 0x00;
 
 	device_info = _("OpenBSD tun device");
 
 	syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-	cp return 0;
+
+	return 0;
 }
 
 void close_device(void)
 {
-	cp close(device_fd);
-cp}
+	cp();
+
+	close(device_fd);
+}
 
 int read_packet(vpn_packet_t *packet)
 {
 	int lenin;
 	u_int32_t type;
-	struct iovec vector[2] = { {&type, sizeof(type)}
-	, {packet->data + 14, MTU - 14}
-	};
-	cp if((lenin = readv(device_fd, vector, 2)) <= 0) {
+	struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
+
+	cp();
+
+	if((lenin = readv(device_fd, vector, 2)) <= 0) {
 		syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return -1;
 	}
 
-	memcpy(packet->data, mymac.net.mac.address.x, 6);
-	memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
-
 	switch (ntohl(type)) {
-	case AF_INET:
-		packet->data[12] = 0x8;
-		packet->data[13] = 0x0;
-		break;
-	case AF_INET6:
-		packet->data[12] = 0x86;
-		packet->data[13] = 0xDD;
-		break;
-	default:
-		if(debug_lvl >= DEBUG_TRAFFIC)
-			syslog(LOG_ERR,
-				   _
-				   ("Unknown address family %d while reading packet from %s %s"),
-				   ntohl(type), device_info, device);
-		return -1;
+	        case AF_INET:
+		        packet->data[12] = 0x8;
+		        packet->data[13] = 0x0;
+		        break;
+
+	        case AF_INET6:
+		        packet->data[12] = 0x86;
+		        packet->data[13] = 0xDD;
+		        break;
+
+	        default:
+		        if(debug_lvl >= DEBUG_TRAFFIC)
+			        syslog(LOG_ERR,
+				           _
+				           ("Unknown address family %d while reading packet from %s %s"),
+				           ntohl(type), device_info, device);
+		        return -1;
 	}
 
 	packet->len = lenin + 10;
@@ -137,14 +131,17 @@ int read_packet(vpn_packet_t *packet)
 	}
 
 	return 0;
-cp}
+}
 
 int write_packet(vpn_packet_t *packet)
 {
 	u_int32_t type;
 	struct iovec vector[2];
 	int af;
-	cp if(debug_lvl >= DEBUG_TRAFFIC)
+
+	cp();
+
+	if(debug_lvl >= DEBUG_TRAFFIC)
 		syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
@@ -177,11 +174,13 @@ int write_packet(vpn_packet_t *packet)
 	}
 
 	device_total_out += packet->len;
-cp}
+}
 
 void dump_device_stats(void)
 {
-	cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+	cp();
+
+	syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
 	syslog(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
 	syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-cp}
+}