- Small fixes to graph algorithms

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index a3bc2bb..02d7a7a 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -17,9 +17,21 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     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 $
+    $Id: device.c,v 1.1.2.4 2001/10/31 12:50:24 guus Exp $

 */
 
 */
 

+#include "config.h"
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <net/if.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <string.h>
+#include <sys/ioctl.h>
+

 #ifdef HAVE_TUNTAP
  #ifdef LINUX_IF_TUN_H
   #include LINUX_IF_TUN_H
 #ifdef HAVE_TUNTAP
  #ifdef LINUX_IF_TUN_H
   #include LINUX_IF_TUN_H


@@ -31,17 +43,28 @@
  #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 
  #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 

+#include <utils.h>
+#include "conf.h"
+#include "net.h"
+#include "subnet.h"
+
+#include "system.h"
+

 #define DEVICE_TYPE_ETHERTAP 0
 #define DEVICE_TYPE_TUNTAP 1
 
 int device_fd = -1;
 int device_type;
 #define DEVICE_TYPE_ETHERTAP 0
 #define DEVICE_TYPE_TUNTAP 1
 
 int device_fd = -1;
 int device_type;

-char *device_fname;
+char *device;
+char *interface;
+char ifrname[IFNAMSIZ];

 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 

+subnet_t mymac;
+

 /*
   open the local ethertap device
 */
 /*
   open the local ethertap device
 */


@@ -50,18 +73,18 @@ int setup_device(void)
   struct ifreq ifr;
 
 cp
   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
 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
       return -1;
     }
 cp

-  device_fd = device_fd;
-

   /* Set default MAC address for ethertap devices */
 
   mymac.type = SUBNET_MAC;
   /* Set default MAC address for ethertap devices */
 
   mymac.type = SUBNET_MAC;


@@ -78,33 +101,43 @@ cp
   memset(&ifr, 0, sizeof(ifr));
 cp
   ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
   memset(&ifr, 0, sizeof(ifr));
 cp
   ifr.ifr_flags = IFF_TAP | IFF_NO_PI;

-  if (netname)
-    strncpy(ifr.ifr_name, netname, IFNAMSIZ);
+  if (interface)
+    strncpy(ifr.ifr_name, interface, IFNAMSIZ);

 cp
   if (!ioctl(device_fd, TUNSETIFF, (void *) &ifr))
   {
 cp
   if (!ioctl(device_fd, TUNSETIFF, (void *) &ifr))
   {

-      device_info = _("Linux tun/tap device");
+    device_info = _("Linux tun/tap device");

     device_type = DEVICE_TYPE_TUNTAP;
     device_type = DEVICE_TYPE_TUNTAP;

+    strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+    interface = ifrname;

   }
   else
     if (!ioctl(device_fd, (('T'<< 8) | 202), (void *) &ifr))
     {
   }
   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;
+      syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+      device_type = DEVICE_TYPE_TUNTAP;

       device_info = _("Linux tun/tap device");
       device_info = _("Linux tun/tap device");

+      strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
+      interface = ifrname;

     }
     else
 #endif
     {
       device_info = _("Linux ethertap device");
     }
     else
 #endif
     {
       device_info = _("Linux ethertap device");

-      device_type = TAP_TYPE_ETHERTAP;
+      device_type = DEVICE_TYPE_ETHERTAP;

     }
 
     }
 

-  syslog(LOG_INFO, _("%s is a %s"), device_fname, device_info);
+  syslog(LOG_INFO, _("%s is a %s"), device, device_info);

 cp
   return 0;
 }
 
 cp
   return 0;
 }
 

+void close_device(void)
+{
+cp
+  close(device_fd);
+}
+

 /*
   read, encrypt and send data that is
   available through the ethertap device
 /*
   read, encrypt and send data that is
   available through the ethertap device


@@ -117,7 +150,7 @@ cp
     {
       if((lenin = read(device_fd, packet->data, MTU)) <= 0)
         {
     {
       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;
         }
 
           return -1;
         }
 


@@ -125,23 +158,22 @@ cp
     }
   else /* ethertap */
     {
     }
   else /* ethertap */
     {

-      struct iovec vector[2] = {{packet->len, 2}, {packet->data, MTU}};
+      struct iovec vector[2] = {{&packet->len, 2}, {packet->data, MTU}};

 
       if((lenin = readv(device_fd, vector, 2)) <= 0)
         {
 
       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: %m"), device_info, device);

           return -1;
         }
 
       packet->len = lenin - 2;
     }
           return -1;
         }
 
       packet->len = lenin - 2;
     }

-#endif

 
   device_total_in += packet->len;
 
   if(debug_lvl >= DEBUG_TRAFFIC)
     {
 
   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;
     }
 
   return 0;


@@ -159,21 +191,31 @@ cp
     {
       if(write(device_fd, packet->data, packet->len) < 0)
         {
     {
       if(write(device_fd, packet->data, packet->len) < 0)
         {

-          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, packet.len);
+          syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device);

           return -1;
         }
     }
   else/* ethertap */
     {
           return -1;
         }
     }
   else/* ethertap */
     {

-      struct iovec vector[2] = {{packet->len, 2}, {packet->data, MTU}};
+      struct iovec vector[2] = {{&packet->len, 2}, {packet->data, MTU}};

 
       if(writev(device_fd, vector, 2) < 0)
         {
 
       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: %m"), device_info, device);

           return -1;
         }
     }
 
   device_total_out += packet->len;
           return -1;
         }
     }
 
   device_total_out += packet->len;

+cp
+  return 0;
+}
+
+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
 }