Fix format strings.

[tinc] / src / openbsd / device.c

diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index a24d2d0..3d7099f 100644 (file)
--- a/src/openbsd/device.c
+++ b/src/openbsd/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.4 2002/02/11 12:33:01 guus Exp $
+    $Id: device.c,v 1.1.2.8 2002/03/27 16:00:38 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
@@ -70,7 +71,7 @@ int setup_device(void)
 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
@@ -107,14 +108,28 @@ cp
 
   if((lenin = readv(device_fd, vector, 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;
     }
 
   memcpy(packet->data, mymac.net.mac.address.x, 6);
   memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
-  packet->data[12] = 0x08;
-  packet->data[13] = 0x00;
+
+  switch(ntohl(type))
+    {
+      case AF_INET:
+        packet->data[12] = 0x8;
+       packet->data[13] = 0x0;
+       break;
+      case AF_INET6:
+        packet->data[12] = 0x86;
+       packet->data[13] = 0xDD;
+       break;
+      default:
+        if(debug_lvl >= DEBUG_TRAFFIC)
+         syslog(LOG_ERR, _("Unknown address family %d while reading packet from %s %s"), ntohl(type), device_info, device);
+       return -1;
+    }
 
   packet->len = lenin + 10;
 
@@ -131,13 +146,30 @@ cp
 
 int write_packet(vpn_packet_t *packet)
 {
-  u_int32_t type = htonl(AF_INET);
+  u_int32_t type;
   struct iovec vector[2];
+  int af;
 cp
   if(debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
            packet->len, device_info);
 
+  af = (packet->data[12] << 8) + packet->data[13];
+
+  switch(af)
+    {
+      case 0x800:
+        type = htonl(AF_INET);
+       break;
+      case 0x86DD:
+        type = htonl(AF_INET6);
+       break;
+      default:
+        if(debug_lvl >= DEBUG_TRAFFIC)
+         syslog(LOG_ERR, _("Unknown address family %d while writing packet to %s %s"), af, device_info, device);
+       return -1;
+    }
+
   vector[0].iov_base = &type;
   vector[0].iov_len = sizeof(type);
   vector[1].iov_base = packet->data + 14;
@@ -145,7 +177,7 @@ cp
 
   if(writev(device_fd, vector, 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;
     }