Merging of the entire pre5 branch.

[tinc] / src / freebsd / device.c

diff --git a/src/freebsd/device.c b/src/freebsd/device.c
index b11bab9..492ba33 100644 (file)
--- a/src/freebsd/device.c
+++ b/src/freebsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with FreeBSD tap 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,38 +17,59 @@
     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:22:59 guus Exp $
+    $Id: device.c,v 1.1.2.2 2002/02/10 21:57:54 guus Exp $
 */
 
+#include "config.h"
+
+#include <stdio.h>
+#include <sys/types.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/tap0"
 
 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)
 {
-  struct ifreq ifr;
-
 cp
-  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 = netname;
 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: %m"), device);
       return -1;
     }
 cp
-  device_fd = device_fd;
 
   /* Set default MAC address for ethertap devices */
 
@@ -62,11 +83,17 @@ cp
 
   device_info = _("FreeBSD tap 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);
+}
+
 /*
   read, encrypt and send data that is
   available through the ethertap device
@@ -77,7 +104,7 @@ int read_packet(vpn_packet_t *packet)
 cp
   if((lenin = read(device_fd, packet->data, MTU)) <= 0)
     {
-      syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device_fname);
+      syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device);
       return -1;
     }
 
@@ -102,10 +129,19 @@ cp
 
   if(write(device_fd, packet->data, packet->len) < 0)
     {
-      syslog(LOG_ERR, _("Error while writing to %s %s: %m"), device_info, device_fname);
+      syslog(LOG_ERR, _("Error while writing to %s %s: %m"), device_info, device);
       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
+}