Update all device.c files.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 686db6a..caee254 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device

-    Copyright (C) 2001-2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2001-2002 Guus Sliepen <guus@sliepen.eu.org>
+    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
 
     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,20 +17,10 @@
     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.16 2003/07/06 22:11:35 guus Exp $
+    $Id: device.c,v 1.1.2.19 2003/07/18 13:41:36 guus Exp $

 */
 
 */
 

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

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


@@ -43,13 +33,11 @@
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 

-#include <utils.h>

 #include "conf.h"
 #include "conf.h"

+#include "logger.h"

 #include "net.h"
 #include "route.h"
 #include "net.h"
 #include "route.h"

-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"

 
 enum {
        DEVICE_TYPE_ETHERTAP,
 
 enum {
        DEVICE_TYPE_ETHERTAP,


@@ -60,16 +48,13 @@ enum {
 int device_fd = -1;
 int device_type;
 char *device;
 int device_fd = -1;
 int device_type;
 char *device;

-char *interface;
+char *iface;

 char ifrname[IFNAMSIZ];
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
 char ifrname[IFNAMSIZ];
 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;
 int setup_device(void)
 {
        struct ifreq ifr;


@@ -79,16 +64,16 @@ 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, "Device"), &device))
                device = DEFAULT_DEVICE;
 

-       if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+       if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))

 #ifdef HAVE_TUNTAP
 #ifdef HAVE_TUNTAP

-               interface = netname;
+               iface = netname;

 #else
 #else

-               interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;

 #endif
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
        if(device_fd < 0) {
 #endif
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
        if(device_fd < 0) {

-               logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));

                return -1;
        }
 
                return -1;
        }
 


@@ -106,16 +91,16 @@ int setup_device(void)
                device_info = _("Linux tun/tap device (tap mode)");
        }
 
                device_info = _("Linux tun/tap device (tap mode)");
        }
 

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

 
        if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
 
        if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);

-               interface = ifrname;
+               iface = ifrname;

        } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
        } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {

-               logger(DEBUG_ALWAYS, LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+               logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);

                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);

-               interface = ifrname;
+               iface = ifrname;

        } else
 #endif
        {
        } else
 #endif
        {


@@ -123,10 +108,10 @@ int setup_device(void)
                        overwrite_mac = 1;
                device_info = _("Linux ethertap device");
                device_type = DEVICE_TYPE_ETHERTAP;
                        overwrite_mac = 1;
                device_info = _("Linux ethertap device");
                device_type = DEVICE_TYPE_ETHERTAP;

-               interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;

        }
 
        }
 

-       logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
+       logger(LOG_INFO, _("%s is a %s"), device, device_info);

 
        return 0;
 }
 
        return 0;
 }


@@ -138,10 +123,6 @@ void close_device(void)
        close(device_fd);
 }
 
        close(device_fd);
 }
 

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

 int read_packet(vpn_packet_t *packet)
 {
        int lenin;
 int read_packet(vpn_packet_t *packet)
 {
        int lenin;


@@ -153,7 +134,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data + 10, MTU - 10);
 
                        if(lenin <= 0) {
                        lenin = read(device_fd, packet->data + 10, MTU - 10);
 
                        if(lenin <= 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),

                                           device_info, device, strerror(errno));
                                return -1;
                        }
                                           device_info, device, strerror(errno));
                                return -1;
                        }


@@ -164,7 +145,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data, MTU);
 
                        if(lenin <= 0) {
                        lenin = read(device_fd, packet->data, MTU);
 
                        if(lenin <= 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),

                                           device_info, device, strerror(errno));
                                return -1;
                        }
                                           device_info, device, strerror(errno));
                                return -1;
                        }


@@ -175,7 +156,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data - 2, MTU + 2);
 
                        if(lenin <= 0) {
                        lenin = read(device_fd, packet->data - 2, MTU + 2);
 
                        if(lenin <= 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(LOG_ERR, _("Error while reading from %s %s: %s"),

                                           device_info, device, strerror(errno));
                                return -1;
                        }
                                           device_info, device, strerror(errno));
                                return -1;
                        }


@@ -186,7 +167,7 @@ int read_packet(vpn_packet_t *packet)
 
        device_total_in += packet->len;
 
 
        device_total_in += packet->len;
 

-       logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,

                           device_info);
 
        return 0;
                           device_info);
 
        return 0;


@@ -196,21 +177,21 @@ int write_packet(vpn_packet_t *packet)
 {
        cp();
 
 {
        cp();
 

-       logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),

                           packet->len, device_info);
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
                        packet->data[10] = packet->data[11] = 0;
                        if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
                           packet->len, device_info);
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
                        packet->data[10] = packet->data[11] = 0;
                        if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,

                                           strerror(errno));
                                return -1;
                        }
                        break;
                case DEVICE_TYPE_TAP:
                        if(write(device_fd, packet->data, packet->len) < 0) {
                                           strerror(errno));
                                return -1;
                        }
                        break;
                case DEVICE_TYPE_TAP:
                        if(write(device_fd, packet->data, packet->len) < 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,

                                           strerror(errno));
                                return -1;
                        }
                                           strerror(errno));
                                return -1;
                        }


@@ -219,7 +200,7 @@ int write_packet(vpn_packet_t *packet)
                        *(short int *)(packet->data - 2) = packet->len;
 
                        if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
                        *(short int *)(packet->data - 2) = packet->len;
 
                        if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {

-                               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,

                                           strerror(errno));
                                return -1;
                        }
                                           strerror(errno));
                                return -1;
                        }


@@ -235,7 +216,7 @@ void dump_device_stats(void)
 {
        cp();
 
 {
        cp();
 

-       logger(DEBUG_ALWAYS, LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-       logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-       logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+       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);

 }
 }