X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=6a94ce38bc9129526affc025752132de437601ed;hp=1b9d8949fd56a69cab03a252ccdaf1717fbcb554;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=12de5a8eedd985f4732e88de6185f77a8244612c

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 1b9d8949..6a94ce38 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002 Ivo Timmermans <ivo@o2w.nl>,
-                  2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2002-2003 Ivo Timmermans <ivo@o2w.nl>,
+                  2002-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,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.7 2003/07/12 17:41:48 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"
 
@@ -53,9 +52,6 @@ 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;
@@ -73,7 +69,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(LOG_ERR, _("Could not open %s: %s"), device_info,
 			   strerror(errno));
 		return -1;
 	}
@@ -82,7 +78,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(LOG_ERR, _("Can't find interface %s: %s"), interface,
 			   strerror(errno));
 		return -1;
 	}
@@ -93,11 +89,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(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
 		return -1;
 	}
 
-	syslog(LOG_INFO, _("%s is a %s"), device, device_info);
+	logger(LOG_INFO, _("%s is a %s"), device, device_info);
 
 	return 0;
 }
@@ -109,10 +105,6 @@ void close_device(void)
 	close(device_fd);
 }
 
-/*
-  read, encrypt and send data that is
-  available through the ethertap device
-*/
 int read_packet(vpn_packet_t *packet)
 {
 	int lenin;
@@ -120,7 +112,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(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return -1;
 	}
@@ -129,8 +121,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,
+	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
 			   device_info);
 	}
 
@@ -141,12 +132,11 @@ int write_packet(vpn_packet_t *packet)
 {
 	cp();
 
-	if(debug_lvl >= DEBUG_TRAFFIC)
-		syslog(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);
 
 	if(write(device_fd, packet->data, packet->len) < 0) {
-		syslog(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;
 	}
@@ -160,7 +150,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(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);
 }