X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=629b49e7f697d6ea2278158c46d5b8cc6507d099;hp=0391f6a2f375280bf80a36e541063d298f470d1a;hb=bf3a11898898c0618cd1b2e7a792b7d7fe56aecb;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/linux/device.c b/src/linux/device.c
index 0391f6a2..629b49e7 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.11 2002/09/09 21:25:23 guus Exp $
+    $Id: device.c,v 1.1.2.13 2002/09/15 22:19:19 guus Exp $
 */
 
 #include "config.h"
@@ -39,7 +39,7 @@
 #else
 #include <linux/if_tun.h>
 #endif
-#define DEFAULT_DEVICE "/dev/misc/net/tun"
+#define DEFAULT_DEVICE "/dev/net/tun"
 #else
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
@@ -73,7 +73,9 @@ int setup_device(void)
 {
 	struct ifreq ifr;
 
-	cp if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+	cp();
+
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = DEFAULT_DEVICE;
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
@@ -82,15 +84,15 @@ int setup_device(void)
 #else
 		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 #endif
-	cp device_fd = open(device, O_RDWR | O_NONBLOCK);
+	device_fd = open(device, O_RDWR | O_NONBLOCK);
 
 	if(device_fd < 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;
+
+	/* 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;
@@ -102,10 +104,12 @@ int setup_device(void)
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
 	memset(&ifr, 0, sizeof(ifr));
-	cp ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+	ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+
 	if(interface)
 		strncpy(ifr.ifr_name, interface, IFNAMSIZ);
-	cp if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
+
+	if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
 		device_info = _("Linux tun/tap device");
 		device_type = DEVICE_TYPE_TUNTAP;
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
@@ -125,22 +129,28 @@ int setup_device(void)
 	}
 
 	syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-	cp return 0;
+
+	return 0;
 }
 
 void close_device(void)
 {
-	cp close(device_fd);
+	cp();
+	
+	close(device_fd);
 }
 
 /*
   read, encrypt and send data that is
   available through the ethertap device
 */
-int read_packet(vpn_packet_t * packet)
+int read_packet(vpn_packet_t *packet)
 {
 	int lenin;
-	cp if(device_type == DEVICE_TYPE_TUNTAP) {
+	
+	cp();
+
+	if(device_type == DEVICE_TYPE_TUNTAP) {
 		lenin = read(device_fd, packet->data, MTU);
 
 		if(lenin <= 0) {
@@ -171,11 +181,13 @@ int read_packet(vpn_packet_t * packet)
 	}
 
 	return 0;
-cp}
+}
 
-int write_packet(vpn_packet_t * packet)
+int write_packet(vpn_packet_t *packet)
 {
-	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);
 
@@ -186,8 +198,8 @@ int write_packet(vpn_packet_t * packet)
 			return -1;
 		}
 	} else {					/* ethertap */
+		*(short int *)(packet->data - 2) = packet->len;
 
-		*(short int *) (packet->data - 2) = packet->len;
 		if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
 			syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 				   strerror(errno));
@@ -196,12 +208,15 @@ int write_packet(vpn_packet_t * packet)
 	}
 
 	device_total_out += packet->len;
-	cp return 0;
+
+	return 0;
 }
 
 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}
+}