X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetbsd%2Fdevice.c;h=33896aa6bd8fd13fb1ab916da44226d488a9a69d;hp=ed8cb4e538759c39d3980cd385d5888a4a992eda;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=2fb8a62edef7cb0988e44f92c3948cde6f34875e

diff --git a/src/netbsd/device.c b/src/netbsd/device.c
index ed8cb4e5..33896aa6 100644
--- a/src/netbsd/device.c
+++ b/src/netbsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with NetBSD tun 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.1 2002/02/12 14:40:12 guus Exp $
+    $Id: device.c,v 1.1.2.4 2002/06/21 10:11:36 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
@@ -101,13 +102,11 @@ cp
 int read_packet(vpn_packet_t *packet)
 {
   int lenin;
-  u_int32_t type;
-  struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
 cp
 
-  if((lenin = readv(device_fd, vector, 2)) <= 0)
+  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;
     }
 
@@ -116,7 +115,7 @@ cp
   packet->data[12] = 0x08;
   packet->data[13] = 0x00;
 
-  packet->len = lenin + 10;
+  packet->len = lenin + 14;
 
   device_total_in += packet->len;
 
@@ -131,21 +130,14 @@ cp
 
 int write_packet(vpn_packet_t *packet)
 {
-  u_int32_t type = htonl(AF_INET);
-  struct iovec vector[2];
 cp
   if(debug_lvl >= DEBUG_TRAFFIC)
     syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
            packet->len, device_info);
 
-  vector[0].iov_base = &type;
-  vector[0].iov_len = sizeof(type);
-  vector[1].iov_base = packet->data + 14;
-  vector[1].iov_len = packet->len - 14;
-
-  if(writev(device_fd, vector, 2) < 0)
+  if(write(device_fd, packet->data + 14, packet->len - 14) < 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;
     }