X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fcygwin%2Fdevice.c;h=e706d57f134223b97e1a715ccb494f6b207819d7;hp=9b06d4d15ae2c029ecc6ba84536cf09c004f64f6;hb=0b9175e998c2180e5d73ef3d644a49d620c68cad;hpb=868104703003605711582c984b57f8933bf361ee diff --git a/src/cygwin/device.c b/src/cygwin/device.c index 9b06d4d1..e706d57f 100644 --- a/src/cygwin/device.c +++ b/src/cygwin/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:36 guus Exp $ + $Id: device.c,v 1.1.2.6 2003/07/06 22:11:33 guus Exp $ */ #include "config.h" @@ -28,13 +28,12 @@ #include #include #include -#include #include #include #include "conf.h" #include "net.h" -#include "subnet.h" +#include "logger.h" #include "system.h" @@ -60,13 +59,13 @@ int setup_device(void) 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 = _("Stub device for Cygwin environment"); - syslog(LOG_INFO, _("%s is a %s"), device, device_info); + logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info); return 0; } @@ -85,7 +84,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; } @@ -94,10 +93,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; } @@ -106,12 +103,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; } @@ -125,7 +121,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); }