Remove forgotten braces.

[tinc] / src / openbsd / device.c

diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index e2201c9..07fa4b9 100644 (file)
--- a/src/openbsd/device.c
+++ b/src/openbsd/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with OpenBSD tun 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
@@ -17,29 +17,15 @@
     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/07/06 22:11:37 guus Exp $
+    $Id: device.c,v 1.1.2.18 2003/07/31 11:31:51 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <utils.h>
+#include "system.h"
+
 #include "conf.h"
-#include "net.h"
 #include "logger.h"
-
-#include "system.h"
+#include "net.h"
+#include "utils.h"
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
@@ -47,36 +33,32 @@
 #define DEVICE_TYPE_TUNTAP 1
 
 int device_fd = -1;
-int device_type;
 char *device;
-char *interface;
+char *iface;
 char *device_info;
 
 int device_total_in = 0;
 int device_total_out = 0;
 
-/*
-  open the local ethertap device
-*/
-int setup_device(void)
+bool setup_device(void)
 {
        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(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
        if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
-               return -1;
+               logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
+               return false;
        }
 
        device_info = _("OpenBSD tun 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 true;
 }
 
 void close_device(void)
@@ -86,7 +68,7 @@ void close_device(void)
        close(device_fd);
 }
 
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
 {
        int lenin;
        u_int32_t type;
@@ -95,9 +77,9 @@ int read_packet(vpn_packet_t *packet)
        cp();
 
        if((lenin = readv(device_fd, vector, 2)) <= 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+               logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
                           device, strerror(errno));
-               return -1;
+               return false;
        }
 
        switch (ntohl(type)) {
@@ -112,24 +94,23 @@ int read_packet(vpn_packet_t *packet)
                        break;
 
                default:
-                       logger(DEBUG_TRAFFIC, LOG_ERR,
+                       ifdebug(TRAFFIC) logger(LOG_ERR,
                                           _ ("Unknown address family %d while reading packet from %s %s"),
                                           ntohl(type), device_info, device);
-                       return -1;
+                       return false;
        }
 
        packet->len = lenin + 10;
 
        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;
+       return true;
 }
 
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
 {
        u_int32_t type;
        struct iovec vector[2];
@@ -137,7 +118,7 @@ int write_packet(vpn_packet_t *packet)
 
        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);
 
        af = (packet->data[12] << 8) + packet->data[13];
@@ -150,10 +131,10 @@ int write_packet(vpn_packet_t *packet)
                type = htonl(AF_INET6);
                break;
        default:
-               logger(DEBUG_TRAFFIC, LOG_ERR,
+               ifdebug(TRAFFIC) logger(LOG_ERR,
                                   _("Unknown address family %d while writing packet to %s %s"),
                                   af, device_info, device);
-               return -1;
+               return false;
        }
 
        vector[0].iov_base = &type;
@@ -162,19 +143,21 @@ int write_packet(vpn_packet_t *packet)
        vector[1].iov_len = packet->len - 14;
 
        if(writev(device_fd, vector, 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;
+               return false;
        }
 
        device_total_out += packet->len;
+
+       return true;
 }
 
 void dump_device_stats(void)
 {
        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);
 }