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

Clean up after indent.

Browse source
This commit is contained in:
Guus Sliepen 2002-09-10 21:29:42 +00:00
parent 161f917dd0
commit c01f78ed36
7 changed files with 208 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/cygwin/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.3 2002/09/09 22:33:21 guus Exp $ $Id: device.c,v 1.1.2.4 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -53,16 +53,19 @@ int setup_device(void)
{ {
struct ifreq ifr; struct ifreq ifr;
cp if(!get_config_string(lookup_config(config_tree, "Device"), &device)) cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -75,18 +78,24 @@ int setup_device(void)
device_info = _("Stub device for Cygwin environment"); device_info = _("Stub device for Cygwin environment");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
close(device_fd);
} }
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -102,11 +111,13 @@ int read_packet(vpn_packet_t *packet)
} }
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -117,12 +128,15 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp return 0;
return 0;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

37
src/darwin/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.4 2002/09/09 22:33:23 guus Exp $ $Id: device.c,v 1.1.2.5 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -58,16 +58,19 @@ extern subnet_t mymac;
*/ */
int setup_device(void) int setup_device(void)
{ {
cp if(!get_config_string(lookup_config(config_tree, "Device"), &device)) cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -80,12 +83,15 @@ int setup_device(void)
device_info = _("MacOS/X tun device"); device_info = _("MacOS/X tun device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
close(device_fd);
} }
/* /*
@ -95,7 +101,10 @@ void close_device(void)
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -115,11 +124,13 @@ int read_packet(vpn_packet_t *packet)
packet->len, device_info); packet->len, device_info);
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -130,11 +141,13 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

37
src/freebsd/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.7 2002/09/09 22:33:23 guus Exp $ $Id: device.c,v 1.1.2.8 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -58,16 +58,19 @@ extern subnet_t mymac;
*/ */
int setup_device(void) int setup_device(void)
{ {
cp if(!get_config_string(lookup_config(config_tree, "Device"), &device)) cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -80,12 +83,15 @@ int setup_device(void)
device_info = _("FreeBSD tap device"); device_info = _("FreeBSD tap device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
close(device_fd);
} }
/* /*
@ -95,7 +101,10 @@ void close_device(void)
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -110,11 +119,13 @@ int read_packet(vpn_packet_t *packet)
packet->len, device_info); packet->len, device_info);
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -125,11 +136,13 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

36
src/netbsd/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.6 2002/09/09 22:33:24 guus Exp $ $Id: device.c,v 1.1.2.7 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -63,16 +63,18 @@ extern subnet_t mymac;
*/ */
int setup_device(void) int setup_device(void)
{ {
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -85,18 +87,24 @@ int setup_device(void)
device_info = _("NetBSD tun device"); device_info = _("NetBSD tun device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
cp}
close(device_fd);
}
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -117,11 +125,13 @@ int read_packet(vpn_packet_t *packet)
} }
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -132,11 +142,13 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

43
src/openbsd/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.11 2002/09/09 22:33:27 guus Exp $ $Id: device.c,v 1.1.2.12 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -63,16 +63,18 @@ extern subnet_t mymac;
*/ */
int setup_device(void) int setup_device(void)
{ {
cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
interface = rindex(device, '/') ? rindex(device, '/') + 1 : device; interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -85,22 +87,26 @@ int setup_device(void)
device_info = _("OpenBSD tun device"); device_info = _("OpenBSD tun device");
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
cp}
close(device_fd);
}
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
u_int32_t type; u_int32_t type;
struct iovec vector[2] = { {&type, sizeof(type)} struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
, {packet->data + 14, MTU - 14}
}; cp();
cp if((lenin = readv(device_fd, vector, 2)) <= 0) {
if((lenin = readv(device_fd, vector, 2)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -114,10 +120,12 @@ int read_packet(vpn_packet_t *packet)
packet->data[12] = 0x8; packet->data[12] = 0x8;
packet->data[13] = 0x0; packet->data[13] = 0x0;
break; break;
case AF_INET6: case AF_INET6:
packet->data[12] = 0x86; packet->data[12] = 0x86;
packet->data[13] = 0xDD; packet->data[13] = 0xDD;
break; break;
default: default:
if(debug_lvl >= DEBUG_TRAFFIC) if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_ERR, syslog(LOG_ERR,
@ -137,14 +145,17 @@ int read_packet(vpn_packet_t *packet)
} }
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
u_int32_t type; u_int32_t type;
struct iovec vector[2]; struct iovec vector[2];
int af; int af;
cp if(debug_lvl >= DEBUG_TRAFFIC)
cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -177,11 +188,13 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

39
src/raw_socket/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.3 2002/09/09 22:33:31 guus Exp $ $Id: device.c,v 1.1.2.4 2002/09/10 21:29:42 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -62,7 +62,10 @@ int setup_device(void)
{ {
struct ifreq ifr; struct ifreq ifr;
struct sockaddr_ll sa; struct sockaddr_ll sa;
cp if(!get_config_string
cp();
if(!get_config_string
(lookup_config(config_tree, "Interface"), &interface)) (lookup_config(config_tree, "Interface"), &interface))
interface = "eth0"; interface = "eth0";
@ -70,7 +73,8 @@ int setup_device(void)
device = interface; device = interface;
device_info = _("raw socket"); device_info = _("raw socket");
cp if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device_info, syslog(LOG_ERR, _("Could not open %s: %s"), device_info,
strerror(errno)); strerror(errno));
return -1; return -1;
@ -94,7 +98,7 @@ int setup_device(void)
syslog(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp
/* Set default MAC address for ethertap devices */ /* Set default MAC address for ethertap devices */
mymac.type = SUBNET_MAC; mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[0] = 0xfe;
@ -105,12 +109,15 @@ int setup_device(void)
mymac.net.mac.address.x[5] = 0x00; mymac.net.mac.address.x[5] = 0x00;
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
close(device_fd);
} }
/* /*
@ -120,7 +127,10 @@ void close_device(void)
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -136,11 +146,13 @@ int read_packet(vpn_packet_t *packet)
} }
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -151,12 +163,15 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp return 0;
return 0;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }

38
src/solaris/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.10 2002/09/09 22:33:31 guus Exp $ $Id: device.c,v 1.1.2.11 2002/09/10 21:29:42 guus Exp $
*/ */
@ -65,14 +65,17 @@ int setup_device(void)
int ppa; int ppa;
char *ptr; char *ptr;
cp if(!get_config_string(lookup_config(config_tree, "Device"), &device)) cp();
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) { if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno)); syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1; return -1;
} }
cp ppa = 0;
ppa = 0;
ptr = device; ptr = device;
while(*ptr && !isdigit((int) *ptr)) while(*ptr && !isdigit((int) *ptr))
@ -128,18 +131,24 @@ int setup_device(void)
mymac.net.mac.address.x[5] = 0x00; mymac.net.mac.address.x[5] = 0x00;
syslog(LOG_INFO, _("%s is a %s"), device, device_info); syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp return 0;
return 0;
} }
void close_device(void) void close_device(void)
{ {
cp close(device_fd); cp();
close(device_fd);
} }
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
cp();
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
device, strerror(errno)); device, strerror(errno));
return -1; return -1;
@ -160,11 +169,13 @@ int read_packet(vpn_packet_t *packet)
} }
return 0; return 0;
cp} }
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
cp if(debug_lvl >= DEBUG_TRAFFIC) cp();
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
@ -175,12 +186,15 @@ int write_packet(vpn_packet_t *packet)
} }
device_total_out += packet->len; device_total_out += packet->len;
cp return 0;
return 0;
} }
void dump_device_stats(void) void dump_device_stats(void)
{ {
cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device); 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 in: %10d"), device_total_in);
syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out); syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
cp} }