[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
tinc/src/openbsd device.c,1.1.2.14,1.1.2.15
Update of /home/CVS/tinc/src/openbsd
In directory humbolt:/tmp/cvs-serv21272/src/openbsd
Modified Files:
Tag: CABAL
device.c
Log Message:
Simplify logging, update copyrights and some minor cleanups.
Index: device.c
===================================================================
RCS file: /home/CVS/tinc/src/openbsd/device.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- device.c 2003/07/06 22:11:37 1.1.2.14
+++ device.c 2003/07/12 17:41:48 1.1.2.15
@@ -1,7 +1,7 @@
/*
device.c -- Interaction with OpenBSD tun device
- Copyright (C) 2001-2002 Ivo Timmermans <ivo@o2w.nl>,
- 2001-2002 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 2001-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-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
@@ -55,9 +55,6 @@
int device_total_in = 0;
int device_total_out = 0;
-/*
- open the local ethertap device
-*/
int setup_device(void)
{
cp();
@@ -68,13 +65,13 @@
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
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 = _("OpenBSD tun device");
- logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
+ logger(LOG_INFO, _("%s is a %s"), device, device_info);
return 0;
}
@@ -95,7 +92,7 @@
cp();
if((lenin = readv(device_fd, vector, 2)) <= 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;
}
@@ -112,7 +109,7 @@
break;
default:
- logger(DEBUG_TRAFFIC, LOG_ERR,
+ ifdebug(TRAFFIC) logger(LOG_ERR,
_ ("Unknown address family %d while reading packet from %s %s"),
ntohl(type), device_info, device);
return -1;
@@ -122,7 +119,7 @@
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);
}
@@ -137,7 +134,7 @@
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);
af = (packet->data[12] << 8) + packet->data[13];
@@ -150,7 +147,7 @@
type = htonl(AF_INET6);
break;
default:
- logger(DEBUG_TRAFFIC, LOG_ERR,
+ ifdebug(TRAFFIC) logger(LOG_ERR,
_("Unknown address family %d while writing packet to %s %s"),
af, device_info, device);
return -1;
@@ -162,7 +159,7 @@
vector[1].iov_len = packet->len - 14;
if(writev(device_fd, vector, 2) < 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;
}
@@ -174,7 +171,7 @@
{
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);
}
--
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/