X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=686db6ab6f56a5d7a80226fd5f04c63d7842ffed;hp=ea66384604fef2849d42e17a4a403410c38748b2;hb=0b9175e998c2180e5d73ef3d644a49d620c68cad;hpb=868104703003605711582c984b57f8933bf361ee

diff --git a/src/linux/device.c b/src/linux/device.c
index ea663846..686db6ab 100644
--- 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.15 2003/06/11 19:28:37 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"
 
@@ -89,7 +88,7 @@ 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;
 	}
 
@@ -114,7 +113,7 @@ 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
@@ -127,7 +126,7 @@ int setup_device(void)
 		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;
 }
@@ -154,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;
 			}
@@ -165,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;
 			}
@@ -176,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;
 			}
@@ -187,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;
 }
@@ -199,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;
 			}
@@ -223,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;
 			}
@@ -239,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);
 }