- Split tap device stuff out of net.[ch]

- Each OS gets it's own device.c to get rid of evil #ifdefs.
- Cleaned up Linux ethertap and tun/tap handling.

diff --git a/src/device.h b/src/device.h
new file mode 100644 (file)
index 0000000..a8b65cc
--- /dev/null
+++ b/src/device.h
@@ -0,0 +1,32 @@
+/*
+    net.h -- generic header for device.c
+    Copyright (C) 2001 Ivo Timmermans <zarq@iname.com>
+                  2001 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
+    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: device.h,v 1.1.2.1 2001/10/12 15:16:03 guus Exp $
+*/
+
+#ifndef __TINC_DEVICE_H__
+#define __TINC_DEVICE_H__
+
+extern void setup_device(void);
+extern void close_device(void);
+extern vpn_packet_t *read_packet(void);
+extern void write_packet(vpn_packet_t *);
+extern void dump_device_stats(void);
+
+#endif __TINC_DEVICE_H__

diff --git a/src/linux/device.c b/src/linux/device.c
new file mode 100644 (file)
index 0000000..a3bc2bb
--- /dev/null
+++ b/src/linux/device.c
@@ -0,0 +1,179 @@
+/*
+    device.c -- Interaction with Linux ethertap and tun/tap device
+    Copyright (C) 2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2001 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
+    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: device.c,v 1.1.2.1 2001/10/12 15:16:03 guus Exp $
+*/
+
+#ifdef HAVE_TUNTAP
+ #ifdef LINUX_IF_TUN_H
+  #include LINUX_IF_TUN_H
+ #else
+  #include <linux/if_tun.h>
+ #endif
+ #define DEFAULT_DEVICE "/dev/misc/net/tun"
+#else
+ #define DEFAULT_DEVICE "/dev/tap0"
+#endif
+
+#define DEVICE_TYPE_ETHERTAP 0
+#define DEVICE_TYPE_TUNTAP 1
+
+int device_fd = -1;
+int device_type;
+char *device_fname;
+char *device_info;
+
+int device_total_in = 0;
+int device_total_out = 0;
+
+/*
+  open the local ethertap device
+*/
+int setup_device(void)
+{
+  struct ifreq ifr;
+
+cp
+  if(!get_config_string(lookup_config(config_tree, "Device"), &device_fname)))
+    device_fname = DEFAULT_DEVICE;
+
+cp
+  if((device_fd = open(device_fname, O_RDWR | O_NONBLOCK)) < 0)
+    {
+      syslog(LOG_ERR, _("Could not open %s: %m"), device_fname);
+      return -1;
+    }
+cp
+  device_fd = device_fd;
+
+  /* Set default MAC address for ethertap devices */
+
+  mymac.type = SUBNET_MAC;
+  mymac.net.mac.address.x[0] = 0xfe;
+  mymac.net.mac.address.x[1] = 0xfd;
+  mymac.net.mac.address.x[2] = 0x00;
+  mymac.net.mac.address.x[3] = 0x00;
+  mymac.net.mac.address.x[4] = 0x00;
+  mymac.net.mac.address.x[5] = 0x00;
+
+#ifdef HAVE_TUNTAP
+  /* Ok now check if this is an old ethertap or a new tun/tap thingie */
+
+  memset(&ifr, 0, sizeof(ifr));
+cp
+  ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+  if (netname)
+    strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+cp
+  if (!ioctl(device_fd, TUNSETIFF, (void *) &ifr))
+  {
+      device_info = _("Linux tun/tap device");
+    device_type = DEVICE_TYPE_TUNTAP;
+  }
+  else
+    if (!ioctl(device_fd, (('T'<< 8) | 202), (void *) &ifr))
+    {
+      syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device_fname);
+      device_type = TAP_TYPE_TUNTAP;
+      device_info = _("Linux tun/tap device");
+    }
+    else
+#endif
+    {
+      device_info = _("Linux ethertap device");
+      device_type = TAP_TYPE_ETHERTAP;
+    }
+
+  syslog(LOG_INFO, _("%s is a %s"), device_fname, device_info);
+cp
+  return 0;
+}
+
+/*
+  read, encrypt and send data that is
+  available through the ethertap device
+*/
+int read_packet(vpn_packet_t *packet)
+{
+  int lenin;
+cp
+  if(device_type == DEVICE_TYPE_TUNTAP)
+    {
+      if((lenin = read(device_fd, packet->data, MTU)) <= 0)
+        {
+          syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname);
+          return -1;
+        }
+
+      packet->len = lenin;
+    }
+  else /* ethertap */
+    {
+      struct iovec vector[2] = {{packet->len, 2}, {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);
+          return -1;
+        }
+
+      packet->len = lenin - 2;
+    }
+#endif
+
+  device_total_in += packet->len;
+
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    {
+      syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), device_info, packet.len);
+    }
+
+  return 0;
+cp
+}
+
+int write_packet(vpn_packet_t *packet)
+{
+cp
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+           packet->len, device_info);
+
+  if(device_type == DEVICE_TYPE_TUNTAP)
+    {
+      if(write(device_fd, packet->data, packet->len) < 0)
+        {
+          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, packet.len);
+          return -1;
+        }
+    }
+  else/* ethertap */
+    {
+      struct iovec vector[2] = {{packet->len, 2}, {packet->data, MTU}};
+
+      if(writev(device_fd, vector, 2) < 0)
+        {
+          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, packet.len);
+          return -1;
+        }
+    }
+
+  device_total_out += packet->len;
+cp
+}