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 02d7a7a..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
 /*
     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
 
     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.
 
     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.4 2001/10/31 12:50:24 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 "config.h"
 
 #include <stdio.h>

+#include <errno.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>


@@ -63,7 +64,7 @@ char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
 int device_total_in = 0;
 int device_total_out = 0;
 

-subnet_t mymac;
+extern subnet_t mymac;

 
 /*
   open the local ethertap device
 
 /*
   open the local ethertap device


@@ -77,11 +78,15 @@ cp
     device = DEFAULT_DEVICE;
 
   if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
     device = DEFAULT_DEVICE;
 
   if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))

+#ifdef HAVE_TUNTAP

     interface = netname;
     interface = netname;

+#else
+    interface = rindex(device, '/')?rindex(device, '/')+1:device;
+#endif

 cp
   if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
     {
 cp
   if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
     {

-      syslog(LOG_ERR, _("Could not open %s: %m"), device);
+      syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));

       return -1;
     }
 cp
       return -1;
     }
 cp


@@ -125,6 +130,7 @@ cp
     {
       device_info = _("Linux ethertap device");
       device_type = DEVICE_TYPE_ETHERTAP;
     {
       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);
     }
 
   syslog(LOG_INFO, _("%s is a %s"), device, device_info);


@@ -150,7 +156,7 @@ cp
     {
       if((lenin = read(device_fd, packet->data, MTU)) <= 0)
         {
     {
       if((lenin = read(device_fd, packet->data, MTU)) <= 0)
         {

-          syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device);
+          syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));

           return -1;
         }
 
           return -1;
         }
 


@@ -158,11 +164,9 @@ cp
     }
   else /* ethertap */
     {
     }
   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);
+          syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));

           return -1;
         }
 
           return -1;
         }
 


@@ -191,17 +195,16 @@ cp
     {
       if(write(device_fd, packet->data, packet->len) < 0)
         {
     {
       if(write(device_fd, packet->data, packet->len) < 0)
         {

-          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device);
+          syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));

           return -1;
         }
     }
   else/* ethertap */
     {
           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);
+          syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));

           return -1;
         }
     }
           return -1;
         }
     }