X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=758068d8d1c763e135bf6b300df5f1917d4cfcf9;hp=57b6829a04bcd23f794cbb6126c3570fd6691f2a;hb=c2b9c06062d36bde859b630b99a08c7b7428e721;hpb=25a804c94ef0dbc4e5582ea6d8459d5f9a3fe06c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 57b6829a..758068d8 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Solaris tun 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,13 +17,14 @@
     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/11/05 19:06:07 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>
@@ -71,7 +72,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
@@ -82,37 +83,40 @@ cp
   ppa = atoi(ptr);
 
   if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
-     syslog(LOG_ERR, _("Could not open /dev/ip: %m"));
+     syslog(LOG_ERR, _("Could not open /dev/ip: %s"), strerror(errno));
      return -1;
   }
 
   /* Assign a new PPA and get its unit number. */
   if( (ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0){
-     syslog(LOG_ERR, _("Can't assign new interface: %m"));
+     syslog(LOG_ERR, _("Can't assign new interface: %s"), strerror(errno));
      return -1;
   }
 
   if( (if_fd = open(device, O_RDWR, 0)) < 0){
-     syslog(LOG_ERR, _("Could not open %s twice: %m"), device);
+     syslog(LOG_ERR, _("Could not open %s twice: %s"), device, strerror(errno));
      return -1;
   }
 
   if(ioctl(if_fd, I_PUSH, "ip") < 0){
-     syslog(LOG_ERR, _("Can't push IP module: %m"));
+     syslog(LOG_ERR, _("Can't push IP module: %s"), strerror(errno));
      return -1;
   }
 
   /* Assign ppa according to the unit number returned by tun device */
   if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
-     syslog(LOG_ERR, _("Can't set PPA %d: %m"), ppa);
+     syslog(LOG_ERR, _("Can't set PPA %d: %s"), ppa, strerror(errno));
      return -1;
   }
 
   if(ioctl(ip_fd, I_LINK, if_fd) < 0){
-     syslog(LOG_ERR, _("Can't link TUN device to IP: %m"));
+     syslog(LOG_ERR, _("Can't link TUN device to IP: %s"), strerror(errno));
      return -1;
   }
 
+  if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+    asprintf(&interface, "tun%d", ppa);
+
   device_info = _("Solaris tun device");
 
   /* Set default MAC address for ethertap devices */
@@ -142,7 +146,7 @@ int read_packet(vpn_packet_t *packet)
 cp
   if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 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;
     }
 
@@ -157,7 +161,7 @@ cp
 
   if(debug_lvl >= DEBUG_TRAFFIC)
     {
-      syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), device_info, packet->len);
+      syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
     }
 
   return 0;
@@ -173,7 +177,7 @@ cp
 
   if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
     {
-      syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, packet->len);
+      syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, packet->len, strerror(errno));
       return -1;
     }