j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Simplify logging, update copyrights and some minor cleanups.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-12 17:41:48 +00:00
parent 2a7f11c0e9
commit 5db596c684
55 changed files with 501 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/linux/device.c
View file

@ -1,7 +1,7 @@
/*
device.c -- Interaction with Linux ethertap and tun/tap 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
@ -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.16 2003/07/06 22:11:35 guus Exp $
$Id: device.c,v 1.1.2.17 2003/07/12 17:41:48 guus Exp $
*/
#include "config.h"
@ -67,9 +67,6 @@ char *device_info;
int device_total_in = 0;
int device_total_out = 0;
/*
open the local ethertap device
*/
int setup_device(void)
{
struct ifreq ifr;
@ -88,7 +85,7 @@ int setup_device(void)
device_fd = open(device, O_RDWR | O_NONBLOCK);
if(device_fd < 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;
}
@ -113,7 +110,7 @@ int setup_device(void)
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
interface = ifrname;
} else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
logger(DEBUG_ALWAYS, LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
interface = ifrname;
} else
@ -126,7 +123,7 @@ int setup_device(void)
interface = rindex(device, '/') ? rindex(device, '/') + 1 : 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;
}
@ -138,10 +135,6 @@ void close_device(void)
close(device_fd);
}
/*
read, encrypt and send data that is
available through the ethertap device
*/
int read_packet(vpn_packet_t *packet)
{
int lenin;
@ -153,7 +146,7 @@ int read_packet(vpn_packet_t *packet)
lenin = read(device_fd, packet->data + 10, MTU - 10);
if(lenin <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return -1;
}
@ -164,7 +157,7 @@ int read_packet(vpn_packet_t *packet)
lenin = read(device_fd, packet->data, MTU);
if(lenin <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return -1;
}
@ -175,7 +168,7 @@ int read_packet(vpn_packet_t *packet)
lenin = read(device_fd, packet->data - 2, MTU + 2);
if(lenin <= 0) {
logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"),
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
return -1;
}
@ -186,7 +179,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;
@ -196,21 +189,21 @@ 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);
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) {
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;
}
break;
case DEVICE_TYPE_TAP:
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;
}
@ -219,7 +212,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) {
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;
}
@ -235,7 +228,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);
}