X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenbsd%2Fdevice.c;h=bd061358ecb133dff73915fa6369af9dd586fe7d;hp=badb459b623867c22afeefb3ef2e5dbe377a34a2;hb=c73bdd6bc8e213b7e27848b97307228c01570a1d;hpb=ad61c20f42d2bee5cc7976bec4370cf4747b42c3

diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index badb459b..bd061358 100644
--- a/src/openbsd/device.c
+++ b/src/openbsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with OpenBSD 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,9 +17,31 @@
     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 2001/10/12 15:49:11 guus Exp $
+    $Id: device.c,v 1.1.2.7 2002/03/24 17:08:38 guus Exp $
 */
 
+#include "config.h"
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <net/if.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <string.h>
+
+#include <utils.h>
+#include "conf.h"
+#include "net.h"
+#include "subnet.h"
+
+#include "system.h"
+
 #define DEFAULT_DEVICE "/dev/tun0"
 
 #define DEVICE_TYPE_ETHERTAP 0
@@ -27,24 +49,29 @@
 
 int device_fd = -1;
 int device_type;
-char *device_fname;
+char *device;
+char *interface;
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
+extern subnet_t mymac;
+
 /*
   open the local ethertap device
 */
 int setup_device(void)
 {
-  if(!get_config_string(lookup_config(config_tree, "Device"), &device_fname)))
-    device_fname = DEFAULT_DEVICE;
+  if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+    device = DEFAULT_DEVICE;
 
+  if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+    interface = rindex(device, '/')?rindex(device, '/')+1:device;
 cp
-  if((device_fd = open(device_fname, O_RDWR | O_NONBLOCK)) < 0)
+  if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
     {
-      syslog(LOG_ERR, _("Could not open %s: %m"), device_fname);
+      syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
       return -1;
     }
 cp
@@ -60,31 +87,57 @@ cp
 
   device_info = _("OpenBSD tun device");
 
-  syslog(LOG_INFO, _("%s is a %s"), device_fname, device_info);
+  syslog(LOG_INFO, _("%s is a %s"), device, device_info);
 cp
   return 0;
 }
 
+void close_device(void)
+{
+cp
+  close(device_fd);
+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
-  struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data, MTU}};
 
   if((lenin = readv(device_fd, vector, 2)) <= 0)
     {
-      syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname);
+      syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
       return -1;
     }
 
-  packet->len = lenin - sizeof(type);
+  memcpy(packet->data, mymac.net.mac.address.x, 6);
+  memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
+
+  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 %s while reading packet from %s %s"), ntohl(type), device_info, device);
+	return -1;
+    }
+
+  packet->len = lenin + 10;
 
   device_total_in += packet->len;
 
   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;
@@ -93,21 +146,50 @@ 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 %s while writing packet to %s %s"), af, device_info, device);
+	return -1;
+    }
 
-  struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data, MTU}};
+  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)
     {
-      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, device, strerror(errno));
       return -1;
     }
 
   device_total_out += packet->len;
 cp
 }
+
+void dump_device_stats(void)
+{
+cp
+  syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+  syslog(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
+  syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+cp
+}