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

[oweals/tinc.git] / src / raw_socket / device.c

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 1b9d8949fd56a69cab03a252ccdaf1717fbcb554..3cb62c0d7c3b2587df5d6d729e06754da53caeb8 100644 (file)
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/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.5 2003/06/11 19:28:38 guus Exp $
+    $Id: device.c,v 1.1.2.6 2003/07/06 22:11:37 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>
 #include <sys/socket.h>
@@ -39,7 +38,7 @@
 #include <utils.h>
 #include "conf.h"
 #include "net.h"
-#include "subnet.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -73,7 +72,7 @@ int setup_device(void)
        device_info = _("raw socket");
 
        if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
-               syslog(LOG_ERR, _("Could not open %s: %s"), device_info,
+               logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device_info,
                           strerror(errno));
                return -1;
        }
@@ -82,7 +81,7 @@ int setup_device(void)
        strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
                close(device_fd);
-               syslog(LOG_ERR, _("Can't find interface %s: %s"), interface,
+               logger(DEBUG_ALWAYS, LOG_ERR, _("Can't find interface %s: %s"), interface,
                           strerror(errno));
                return -1;
        }
@@ -93,11 +92,11 @@ int setup_device(void)
        sa.sll_ifindex = ifr.ifr_ifindex;
 
        if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-               syslog(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
                return -1;
        }
 
-       syslog(LOG_INFO, _("%s is a %s"), device, device_info);
+       logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
 
        return 0;
 }
@@ -120,7 +119,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: %s"), device_info,
+               logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
                           device, strerror(errno));
                return -1;
        }
@@ -129,8 +128,7 @@ 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);
        }
 
@@ -141,12 +139,11 @@ 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);
 
        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;
        }
@@ -160,7 +157,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);
 }