Define logger(), cleans up source code and allows us to write log entries

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index c5c8bcd..686db6a 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -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.14 2003/06/11 19:09:52 guus Exp $
+    $Id: device.c,v 1.1.2.16 2003/07/06 22:11:35 guus Exp $
 */
 
 #include "config.h"
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <string.h>
 #include <sys/ioctl.h>
 
@@ -47,8 +46,8 @@
 #include <utils.h>
 #include "conf.h"
 #include "net.h"
-#include "subnet.h"
 #include "route.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -68,8 +67,6 @@ char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-extern subnet_t mymac;
-
 /*
   open the local ethertap device
 */
@@ -91,19 +88,10 @@ int setup_device(void)
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
        if(device_fd < 0) {
-               syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
                return -1;
        }
 
-       /* 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 */
 
@@ -125,18 +113,20 @@ int setup_device(void)
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
                interface = ifrname;
        } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
-               syslog(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
+               logger(DEBUG_ALWAYS, LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
                interface = ifrname;
        } else
 #endif
        {
+               if(routing_mode == RMODE_ROUTER)
+                       overwrite_mac = 1;
                device_info = _("Linux ethertap device");
                device_type = DEVICE_TYPE_ETHERTAP;
                interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
        }
 
-       syslog(LOG_INFO, _("%s is a %s"), device, device_info);
+       logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
 
        return 0;
 }
@@ -163,7 +153,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data + 10, MTU - 10);
 
                        if(lenin <= 0) {
-                               syslog(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return -1;
                        }
@@ -174,7 +164,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data, MTU);
 
                        if(lenin <= 0) {
-                               syslog(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return -1;
                        }
@@ -185,7 +175,7 @@ int read_packet(vpn_packet_t *packet)
                        lenin = read(device_fd, packet->data - 2, MTU + 2);
 
                        if(lenin <= 0) {
-                               syslog(LOG_ERR, _("Error while reading from %s %s: %s"),
+                               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return -1;
                        }
@@ -196,10 +186,8 @@ int read_packet(vpn_packet_t *packet)
 
        device_total_in += packet->len;
 
-       if(debug_lvl >= DEBUG_TRAFFIC) {
-               syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+       logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
                           device_info);
-       }
 
        return 0;
 }
@@ -208,22 +196,21 @@ int write_packet(vpn_packet_t *packet)
 {
        cp();
 
-       if(debug_lvl >= DEBUG_TRAFFIC)
-               syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+       logger(DEBUG_TRAFFIC, 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) {
-                               syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(DEBUG_ALWAYS, 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) {
-                               syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
                                           strerror(errno));
                                return -1;
                        }
@@ -232,7 +219,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) {
-                               syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+                               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
                                           strerror(errno));
                                return -1;
                        }
@@ -248,7 +235,7 @@ 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);
+       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);
 }