X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=450fcd1d601894d0ca489bf54acbf40aa7ad021d;hb=305505f5ec4bb738f175cd897fa409f08d2971a3;hp=a54647ec98c97393002ffdfd43aca8c2ba557e82;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index a54647ec..450fcd1d 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.5 2002/02/10 21:57:54 guus Exp $
+    $Id: device.c,v 1.1.2.7 2002/02/18 16:25:19 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -77,11 +78,15 @@ cp
     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, 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
@@ -150,7 +155,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;
         }
 
@@ -160,7 +165,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;
         }
 
@@ -189,7 +194,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;
         }
     }
@@ -198,7 +203,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;
         }
     }