X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=e896f5473e30ae31dcdb2e520a430aa33e931051;hp=88355caabdfa80799558d55d4c6e274db9a491cf;hb=4252ae83a43ea81382ce71ba614e2d1655f2e189;hpb=1c34ba7fb8580949f3bd3a0d804747bbaea28e36

diff --git a/src/linux/device.c b/src/linux/device.c
index 88355caa..e896f547 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -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.6 2002/02/11 12:33:01 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>
@@ -85,7 +86,7 @@ cp
 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
@@ -129,6 +130,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);
@@ -154,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);
+          syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
           return -1;
         }
 
@@ -164,7 +166,7 @@ cp
     {
       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;
         }
 
@@ -193,7 +195,7 @@ cp
     {
       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;
         }
     }
@@ -202,7 +204,7 @@ cp
       *(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;
         }
     }