tinc/src/darwin device.c,1.1.2.6,1.1.2.7

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src/darwin
In directory humbolt:/tmp/cvs-serv26197/src/darwin

Modified Files:
      Tag: CABAL
	device.c 
Log Message:
Define logger(), cleans up source code and allows us to write log entries
to a separate file.


Index: device.c
===================================================================
RCS file: /home/CVS/tinc/src/darwin/Attic/device.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- device.c	2003/06/11 19:28:36	1.1.2.6
+++ device.c	2003/07/06 22:11:33	1.1.2.7
@@ -31,13 +31,12 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <string.h>
 
 #include <utils.h>
 #include "conf.h"
 #include "net.h"
-#include "subnet.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -65,13 +64,13 @@
 		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 
 	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 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;
 	}
 
 	device_info = _("MacOS/X tun 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;
 }
@@ -94,7 +93,7 @@
 	cp();
 
 	if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 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;
 	}
@@ -106,8 +105,7 @@
 
 	device_total_in += packet->len;
 
-	if(debug_lvl >= DEBUG_TRAFFIC)
-		syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"),
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"),
 			   packet->len, device_info);
 
 	return 0;
@@ -117,12 +115,11 @@
 {
 	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 + 14, packet->len - 14) < 0) {
-		syslog(LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Error while writing to %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return -1;
 	}
@@ -134,7 +131,7 @@
 {
 	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);
 }

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/