Simplify logging, update copyrights and some minor cleanups.
This commit is contained in:
parent
2a7f11c0e9
commit
5db596c684
55 changed files with 501 additions and 555 deletions
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
device.c -- Stub for Cygwin environment
|
||||
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.6 2003/07/06 22:11:33 guus Exp $
|
||||
$Id: device.c,v 1.1.2.7 2003/07/12 17:41:47 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -59,13 +59,13 @@ int setup_device(void)
|
|||
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
|
||||
|
||||
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
|
||||
logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
|
||||
logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
device_info = _("Stub device for Cygwin environment");
|
||||
|
||||
logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
logger(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -84,7 +84,7 @@ int read_packet(vpn_packet_t *packet)
|
|||
cp();
|
||||
|
||||
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
|
||||
logger(DEBUG_ALWAYS, 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;
|
||||
}
|
||||
|
|
@ -93,7 +93,7 @@ int read_packet(vpn_packet_t *packet)
|
|||
|
||||
device_total_in += packet->len;
|
||||
|
||||
logger(DEBUG_TRAFFIC, 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);
|
||||
|
||||
return 0;
|
||||
|
|
@ -103,11 +103,11 @@ int write_packet(vpn_packet_t *packet)
|
|||
{
|
||||
cp();
|
||||
|
||||
logger(DEBUG_TRAFFIC, 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) {
|
||||
logger(DEBUG_ALWAYS, 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;
|
||||
}
|
||||
|
|
@ -121,7 +121,7 @@ void dump_device_stats(void)
|
|||
{
|
||||
cp();
|
||||
|
||||
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);
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue