Set $INTERFACE correctly when using ethertap while compiled with tun/tap support.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 1cb4307..e896f54 100644 (file)
--- 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 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2001-2002 Guus Sliepen <guus@sliepen.warande.net>
 
     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,12 +17,13 @@
     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.3 2001/10/27 13:13:35 guus Exp $
+    $Id: device.c,v 1.1.2.8 2002/03/24 16:36:56 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -55,13 +56,15 @@
 
 int device_fd = -1;
 int device_type;
-char *device_fname;
+char *device;
+char *interface;
+char ifrname[IFNAMSIZ];
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
-subnet_t mymac;
+extern subnet_t mymac;
 
 /*
   open the local ethertap device
@@ -71,13 +74,19 @@ int setup_device(void)
   struct ifreq ifr;
 
 cp
-  if(!get_config_string(lookup_config(config_tree, "Device"), &device_fname))
-    device_fname = DEFAULT_DEVICE;
+  if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+    device = DEFAULT_DEVICE;
 
+  if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+#ifdef HAVE_TUNTAP
+    interface = netname;
+#else
+    interface = rindex(device, '/')?rindex(device, '/')+1:device;
+#endif
 cp
-  if((device_fd = open(device_fname, O_RDWR | O_NONBLOCK)) < 0)
+  if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
     {
-      syslog(LOG_ERR, _("Could not open %s: %m"), device_fname);
+      syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
       return -1;
     }
 cp
@@ -97,29 +106,34 @@ cp
   memset(&ifr, 0, sizeof(ifr));
 cp
   ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
-  if (netname)
-    strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+  if (interface)
+    strncpy(ifr.ifr_name, interface, IFNAMSIZ);
 cp
   if (!ioctl(device_fd, TUNSETIFF, (void *) &ifr))
   {
-      device_info = _("Linux tun/tap device");
+    device_info = _("Linux tun/tap device");
     device_type = DEVICE_TYPE_TUNTAP;
+    strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+    interface = ifrname;
   }
   else
     if (!ioctl(device_fd, (('T'<< 8) | 202), (void *) &ifr))
     {
-      syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device_fname);
+      syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
       device_type = DEVICE_TYPE_TUNTAP;
       device_info = _("Linux tun/tap device");
+      strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+      interface = ifrname;
     }
     else
 #endif
     {
       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_fname, device_info);
+  syslog(LOG_INFO, _("%s is a %s"), device, device_info);
 cp
   return 0;
 }
@@ -142,7 +156,7 @@ cp
     {
       if((lenin = read(device_fd, packet->data, MTU)) <= 0)
         {
-          syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname);
+          syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
           return -1;
         }
 
@@ -150,11 +164,9 @@ cp
     }
   else /* ethertap */
     {
-      struct iovec vector[2] = {{&packet->len, 2}, {packet->data, MTU}};
-
-      if((lenin = readv(device_fd, vector, 2)) <= 0)
+      if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
         {
-          syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname);
+          syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
           return -1;
         }
 
@@ -183,17 +195,16 @@ cp
     {
       if(write(device_fd, packet->data, packet->len) < 0)
         {
-          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device_fname);
+          syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
           return -1;
         }
     }
   else/* ethertap */
     {
-      struct iovec vector[2] = {{&packet->len, 2}, {packet->data, MTU}};
-
-      if(writev(device_fd, vector, 2) < 0)
+      *(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: %m"), device_info, device_fname);
+          syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
           return -1;
         }
     }
@@ -206,7 +217,7 @@ cp
 void dump_device_stats(void)
 {
 cp
-  syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device_fname);
+  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