X-Git-Url: http://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=0088accdcc0910ad3fdc3fd9c476df3938421225;hb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503;hp=450fcd1d601894d0ca489bf54acbf40aa7ad021d;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 450fcd1d..0088accd 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
-    Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2001-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2001-2002 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.7 2002/02/18 16:25:19 guus Exp $
+    $Id: device.c,v 1.1.2.10 2002/09/09 19:40:12 guus Exp $
 */
 
 #include "config.h"
@@ -84,7 +84,9 @@ cp
     interface = rindex(device, '/')?rindex(device, '/')+1:device;
 #endif
 cp
-  if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
+  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;
@@ -130,6 +132,7 @@ cp
     {
       device_info = _("Linux ethertap device");
       device_type = DEVICE_TYPE_ETHERTAP;
+      interface = rindex(device, '/')?rindex(device, '/')+1:device;
     }
 
   syslog(LOG_INFO, _("%s is a %s"), device, device_info);
@@ -153,7 +156,9 @@ int read_packet(vpn_packet_t *packet)
 cp
   if(device_type == DEVICE_TYPE_TUNTAP)
     {
-      if((lenin = read(device_fd, packet->data, MTU)) <= 0)
+      lenin = read(device_fd, packet->data, MTU);
+
+      if(lenin <= 0)
         {
           syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
           return -1;
@@ -163,7 +168,9 @@ cp
     }
   else /* ethertap */
     {
-      if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
+      lenin = read(device_fd, packet->data - 2, MTU + 2);
+
+      if(lenin <= 0)
         {
           syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
           return -1;