]> git.meshlink.io Git - meshlink/commitdiff
Use the generic BSD tun/tap code.
authorGuus Sliepen <guus@tinc-vpn.org>
Wed, 10 Nov 2004 18:11:44 +0000 (18:11 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Wed, 10 Nov 2004 18:11:44 +0000 (18:11 +0000)
src/Makefile.am
src/darwin/device.c [deleted file]
src/freebsd/device.c [deleted file]
src/netbsd/device.c [deleted file]
src/openbsd/device.c [deleted file]

index a3b720282f4db27a609c316356c14b9bdbac46c6..10f07af59e950e86de7acf717813d9c4cdaab6c1 100644 (file)
@@ -3,7 +3,7 @@
 
 sbin_PROGRAMS = tincd
 
-EXTRA_DIST = linux/device.c freebsd/device.c openbsd/device.c solaris/device.c netbsd/device.c darwin/device.c cygwin/device.c mingw/device.c raw_socket/device.c
+EXTRA_DIST = linux/device.c bsd/device.c solaris/device.c cygwin/device.c mingw/device.c mingw/common.h raw_socket/device.c uml_socket/device.c
 
 tincd_SOURCES = conf.c connection.c edge.c event.c graph.c logger.c meta.c net.c net_packet.c net_setup.c      \
        net_socket.c netutl.c node.c process.c protocol.c protocol_auth.c protocol_edge.c protocol_misc.c       \
diff --git a/src/darwin/device.c b/src/darwin/device.c
deleted file mode 100644 (file)
index 691a408..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-    device.c -- Interaction with MacOS/X tun device
-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-
-#include "system.h"
-
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-
-#define DEFAULT_DEVICE "/dev/tun0"
-
-typedef enum device_type {
-       DEVICE_TYPE_TUN,
-       DEVICE_TYPE_TAP,
-} device_type_t;
-
-int device_fd = -1;
-char *device;
-char *iface;
-char *device_info;
-static int device_total_in = 0;
-static int device_total_out = 0;
-static device_type_t device_type = DEVICE_TYPE_TUN;
-
-bool setup_device(void)
-{
-       char *type;
-
-       cp();
-
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-               device = DEFAULT_DEVICE;
-
-       if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-
-       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-               return false;
-       }
-
-       if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
-               if(!strcasecmp(type, "tun"))
-                       device_type = DEVICE_TYPE_TUN;
-               else if(!strcasecmp(type, "tap"))
-                       device_type = DEVICE_TYPE_TAP;
-               else {
-                       logger(LOG_ERR, _("Unknown device type %s!"), type);
-                       return false;
-               }
-       } else {
-               if(strstr(device, "tap"))
-                       device_type = DEVICE_TYPE_TAP;
-       }
-
-       switch(device_type) {
-               default:
-                       device_type = DEVICE_TYPE_TUN;
-               case DEVICE_TYPE_TUN:
-                       device_info = _("MacOS/X tun device");
-                       break;
-               case DEVICE_TYPE_TAP:
-                       if(routing_mode == RMODE_ROUTER)
-                               overwrite_mac = true;
-                       device_info = _("MacOS/X tap device");
-                       break;
-       }
-
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
-
-       return true;
-}
-
-void close_device(void)
-{
-       cp();
-
-       close(device_fd);
-}
-
-bool read_packet(vpn_packet_t *packet)
-{
-       int lenin;
-
-       cp();
-
-       switch(device_type) {
-               case DEVICE_TYPE_TUN:
-                       if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-                               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-                                          device, strerror(errno));
-                               return false;
-                       }
-
-                       switch(packet->data[14] >> 4) {
-                               case 4:
-                                       packet->data[12] = 0x08;
-                                       packet->data[13] = 0x00;
-                                       break;
-                               case 6:
-                                       packet->data[12] = 0x86;
-                                       packet->data[13] = 0xDD;
-                                       break;
-                               default:
-                                       ifdebug(TRAFFIC) logger(LOG_ERR,
-                                                          _ ("Unknown IP type %d while reading packet from %s %s"),
-                                                          packet->data[14] >> 4, device_info, device);
-                                       return false;
-                       }
-
-                       packet->len = lenin + 14;
-                       break;
-               case DEVICE_TYPE_TAP:
-                       if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
-                               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-                                          device, strerror(errno));
-                               return false;
-                       }
-
-                       packet->len = lenin;
-                       break;
-               default:
-                       return false;
-       }
-               
-       device_total_in += packet->len;
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"),
-                          packet->len, device_info);
-
-       return true;
-}
-
-bool write_packet(vpn_packet_t *packet)
-{
-       cp();
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
-                          packet->len, device_info);
-
-       switch(device_type) {
-               case DEVICE_TYPE_TUN:
-                       if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
-                               logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
-                                          device, strerror(errno));
-                               return false;
-                       }
-                       break;
-               case DEVICE_TYPE_TAP:
-                       if(write(device_fd, packet->data, packet->len) < 0) {
-                               logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
-                                          device, strerror(errno));
-                               return false;
-                       }
-                       break;
-               default:
-                       return false;
-       }
-
-       device_total_out += packet->len;
-
-       return true;
-}
-
-void dump_device_stats(void)
-{
-       cp();
-
-       logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-       logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-       logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-}
diff --git a/src/freebsd/device.c b/src/freebsd/device.c
deleted file mode 100644 (file)
index 2d9a0eb..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    device.c -- Interaction with FreeBSD tap device
-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-
-#include "system.h"
-
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "utils.h"
-
-#define DEFAULT_DEVICE "/dev/tap0"
-
-int device_fd = -1;
-char *device;
-char *iface;
-char *device_info;
-static int device_total_in = 0;
-static int device_total_out = 0;
-
-bool setup_device(void)
-{
-       cp();
-
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-               device = DEFAULT_DEVICE;
-
-       if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-
-       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-               return false;
-       }
-
-       device_info = _("FreeBSD tap device");
-
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
-
-       return true;
-}
-
-void close_device(void)
-{
-       cp();
-
-       close(device_fd);
-}
-
-bool read_packet(vpn_packet_t *packet)
-{
-       int lenin;
-
-       cp();
-
-       if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
-               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-                          device, strerror(errno));
-               return false;
-       }
-
-       packet->len = lenin;
-
-       device_total_in += packet->len;
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"),
-                          packet->len, device_info);
-
-       return true;
-}
-
-bool write_packet(vpn_packet_t *packet)
-{
-       cp();
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
-                          packet->len, device_info);
-
-       if(write(device_fd, packet->data, packet->len) < 0) {
-               logger(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
-                          device, strerror(errno));
-               return false;
-       }
-
-       device_total_out += packet->len;
-
-       return true;
-}
-
-void dump_device_stats(void)
-{
-       cp();
-
-       logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-       logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-       logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-}
diff --git a/src/netbsd/device.c b/src/netbsd/device.c
deleted file mode 100644 (file)
index 53198e4..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    device.c -- Interaction with NetBSD tun device
-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-
-#include "system.h"
-
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "utils.h"
-
-#define DEFAULT_DEVICE "/dev/tun0"
-
-#define DEVICE_TYPE_ETHERTAP 0
-#define DEVICE_TYPE_TUNTAP 1
-
-int device_fd = -1;
-char *device;
-char *iface;
-char *device_info;
-
-static int device_total_in = 0;
-static int device_total_out = 0;
-
-bool setup_device(void)
-{
-       cp();
-
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-               device = DEFAULT_DEVICE;
-
-       if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-               return false;
-       }
-
-       device_info = _("NetBSD tun device");
-
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
-
-       return true;
-}
-
-void close_device(void)
-{
-       cp();
-
-       close(device_fd);
-}
-
-bool read_packet(vpn_packet_t *packet)
-{
-       int lenin;
-
-       cp();
-
-       if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
-               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-                          device, strerror(errno));
-               return false;
-       }
-
-       packet->data[12] = 0x08;
-       packet->data[13] = 0x00;
-
-       packet->len = lenin + 14;
-
-       device_total_in += packet->len;
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
-                          device_info);
-
-       return true;
-}
-
-bool write_packet(vpn_packet_t *packet)
-{
-       cp();
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
-                          packet->len, device_info);
-
-       if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
-               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
-                          strerror(errno));
-               return false;
-       }
-
-       device_total_out += packet->len;
-
-       return true;
-}
-
-void dump_device_stats(void)
-{
-       cp();
-
-       logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-       logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-       logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-}
diff --git a/src/openbsd/device.c b/src/openbsd/device.c
deleted file mode 100644 (file)
index 92c3c03..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    device.c -- Interaction with OpenBSD tun device
-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-
-#include "system.h"
-#include <sys/uio.h>
-
-#include "conf.h"
-#include "logger.h"
-#include "net.h"
-#include "utils.h"
-
-#define DEFAULT_DEVICE "/dev/tun0"
-
-int device_fd = -1;
-char *device;
-char *iface;
-char *device_info;
-
-static int device_total_in = 0;
-static int device_total_out = 0;
-
-bool setup_device(void)
-{
-       cp();
-
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-               device = DEFAULT_DEVICE;
-
-       if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-               return false;
-       }
-
-       device_info = _("OpenBSD tun device");
-
-       logger(LOG_INFO, _("%s is a %s"), device, device_info);
-
-       return true;
-}
-
-void close_device(void)
-{
-       cp();
-
-       close(device_fd);
-}
-
-bool 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) {
-               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
-                          device, strerror(errno));
-               return false;
-       }
-
-       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:
-                       ifdebug(TRAFFIC) logger(LOG_ERR,
-                                          _ ("Unknown address family %d while reading packet from %s %s"),
-                                          ntohl(type), device_info, device);
-                       return false;
-       }
-
-       packet->len = lenin + 10;
-
-       device_total_in += packet->len;
-
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
-                          device_info);
-
-       return true;
-}
-
-bool write_packet(vpn_packet_t *packet)
-{
-       u_int32_t type;
-       struct iovec vector[2];
-       int af;
-
-       cp();
-
-       ifdebug(TRAFFIC) logger(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:
-               ifdebug(TRAFFIC) logger(LOG_ERR,
-                                  _("Unknown address family %d while writing packet to %s %s"),
-                                  af, device_info, device);
-               return false;
-       }
-
-       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) {
-               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
-                          strerror(errno));
-               return false;
-       }
-
-       device_total_out += packet->len;
-
-       return true;
-}
-
-void dump_device_stats(void)
-{
-       cp();
-
-       logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-       logger(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-       logger(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-}