X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ffreebsd%2Fdevice.c;h=1139c65b071a70b9ed4e22166e1d55c61ba84900;hp=492ba33d3f95db5154808cfadf4b614e29963217;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36

diff --git a/src/freebsd/device.c b/src/freebsd/device.c
index 492ba33d..1139c65b 100644
--- a/src/freebsd/device.c
+++ b/src/freebsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with FreeBSD 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,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.2 2002/02/10 21:57:54 guus Exp $
+    $Id: device.c,v 1.1.2.5 2002/06/21 10:11:35 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -62,11 +63,11 @@ cp
     device = DEFAULT_DEVICE;
 
   if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
-    interface = netname;
+    interface = rindex(device, '/')?rindex(device, '/')+1:device;
 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
@@ -104,7 +105,7 @@ int read_packet(vpn_packet_t *packet)
 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;
     }
 
@@ -129,7 +130,7 @@ cp
 
   if(write(device_fd, packet->data, packet->len) < 0)
     {
-      syslog(LOG_ERR, _("Error while writing to %s %s: %m"), device_info, device);
+      syslog(LOG_ERR, _("Error while writing to %s %s: %s"), device_info, device, strerror(errno));
       return -1;
     }