Simplify logging, update copyrights and some minor cleanups.

[tinc] / src / netbsd / device.c

diff --git a/src/netbsd/device.c b/src/netbsd/device.c
index a8c01f5..3f07639 100644 (file)
--- 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-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2001-2003 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,7 +17,7 @@
     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.2 2002/02/18 16:25:19 guus Exp $
+    $Id: device.c,v 1.1.2.10 2003/07/12 17:41:48 guus Exp $
 */
 
 #include "config.h"
@@ -32,13 +32,12 @@
 #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 "logger.h"
 
 #include "system.h"
 
@@ -56,109 +55,81 @@ 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))
-    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, O_RDWR | O_NONBLOCK)) < 0)
-    {
-      syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-      return -1;
-    }
-cp
-  /* 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;
-
-  device_info = _("NetBSD tun device");
-
-  syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-cp
-  return 0;
+       cp();
+
+       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;
+       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+               return -1;
+       }
+
+       device_info = _("NetBSD tun device");
+
+       logger(LOG_INFO, _("%s is a %s"), device, device_info);
+
+       return 0;
 }
 
 void close_device(void)
 {
-cp
-  close(device_fd);
-cp
+       cp();
+
+       close(device_fd);
 }
 
 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
+       int lenin;
 
-  if((lenin = readv(device_fd, vector, 2)) <= 0)
-    {
-      syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
-      return -1;
-    }
+       cp();
 
-  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;
+       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 -1;
+       }
 
-  packet->len = lenin + 10;
+       packet->data[12] = 0x08;
+       packet->data[13] = 0x00;
 
-  device_total_in += packet->len;
+       packet->len = lenin + 14;
 
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    {
-      syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
-    }
+       device_total_in += packet->len;
 
-  return 0;
-cp
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+                          device_info);
+       }
+
+       return 0;
 }
 
 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)
-    {
-      syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
-      return -1;
-    }
-
-  device_total_out += packet->len;
-cp
+       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 -1;
+       }
+
+       device_total_out += packet->len;
 }
 
 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
+       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);
 }