From c01f78ed3603eecaec8e3649a3bfb3de9742fd24 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 10 Sep 2002 21:29:42 +0000 Subject: [PATCH] Clean up after indent. --- src/cygwin/device.c | 42 ++++++++++++++-------- src/darwin/device.c | 41 ++++++++++++++-------- src/freebsd/device.c | 41 ++++++++++++++-------- src/netbsd/device.c | 40 +++++++++++++-------- src/openbsd/device.c | 77 ++++++++++++++++++++++++----------------- src/raw_socket/device.c | 43 +++++++++++++++-------- src/solaris/device.c | 38 +++++++++++++------- 7 files changed, 208 insertions(+), 114 deletions(-) diff --git a/src/cygwin/device.c b/src/cygwin/device.c index 7cc8b1cb..3bfc2ab1 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.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" @@ -53,18 +53,21 @@ int setup_device(void) { 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; if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) 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)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -75,18 +78,24 @@ int setup_device(void) device_info = _("Stub device for Cygwin environment"); syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } void close_device(void) { - cp close(device_fd); + cp(); + + close(device_fd); } int read_packet(vpn_packet_t *packet) { 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, device, strerror(errno)); return -1; @@ -102,11 +111,13 @@ int read_packet(vpn_packet_t *packet) } return 0; -cp} +} 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"), packet->len, device_info); @@ -117,12 +128,15 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; - cp return 0; + + return 0; } 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/darwin/device.c b/src/darwin/device.c index 99741f66..4b597ad2 100644 --- a/src/darwin/device.c +++ b/src/darwin/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.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" @@ -58,18 +58,21 @@ extern subnet_t mymac; */ 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; if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) 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)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -80,12 +83,15 @@ int setup_device(void) device_info = _("MacOS/X tun device"); syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } 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 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, device, strerror(errno)); return -1; @@ -115,11 +124,13 @@ int read_packet(vpn_packet_t *packet) packet->len, device_info); return 0; -cp} +} 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"), packet->len, device_info); @@ -130,11 +141,13 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; -cp} +} 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/freebsd/device.c b/src/freebsd/device.c index 074f3473..5e0fff25 100644 --- a/src/freebsd/device.c +++ b/src/freebsd/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.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" @@ -58,18 +58,21 @@ extern subnet_t mymac; */ 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; if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) 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)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -80,12 +83,15 @@ int setup_device(void) device_info = _("FreeBSD tap device"); syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } 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 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, device, strerror(errno)); return -1; @@ -110,11 +119,13 @@ int read_packet(vpn_packet_t *packet) packet->len, device_info); return 0; -cp} +} 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"), packet->len, device_info); @@ -125,11 +136,13 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; -cp} +} 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/netbsd/device.c b/src/netbsd/device.c index 232e58df..98b607a3 100644 --- a/src/netbsd/device.c +++ b/src/netbsd/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.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" @@ -63,18 +63,20 @@ extern subnet_t mymac; */ int setup_device(void) { + cp(); + if(!get_config_string(lookup_config(config_tree, "Device"), &device)) device = DEFAULT_DEVICE; if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) 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)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -85,18 +87,24 @@ int setup_device(void) device_info = _("NetBSD tun device"); syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } void close_device(void) { - cp close(device_fd); -cp} + cp(); + + close(device_fd); +} int read_packet(vpn_packet_t *packet) { 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, device, strerror(errno)); return -1; @@ -117,11 +125,13 @@ int read_packet(vpn_packet_t *packet) } return 0; -cp} +} 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"), packet->len, device_info); @@ -132,11 +142,13 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; -cp} +} 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/openbsd/device.c b/src/openbsd/device.c index 48d8b9bd..3e032b6c 100644 --- a/src/openbsd/device.c +++ b/src/openbsd/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.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" @@ -63,18 +63,20 @@ extern subnet_t mymac; */ int setup_device(void) { + cp(); + if(!get_config_string(lookup_config(config_tree, "Device"), &device)) device = DEFAULT_DEVICE; if(!get_config_string(lookup_config(config_tree, "Interface"), &interface)) 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)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -85,22 +87,26 @@ int setup_device(void) device_info = _("OpenBSD tun device"); syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } void close_device(void) { - cp close(device_fd); -cp} + cp(); + + close(device_fd); +} int read_packet(vpn_packet_t *packet) { int lenin; u_int32_t type; - struct iovec vector[2] = { {&type, sizeof(type)} - , {packet->data + 14, MTU - 14} - }; - cp if((lenin = readv(device_fd, vector, 2)) <= 0) { + struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}}; + + cp(); + + if((lenin = readv(device_fd, vector, 2)) <= 0) { syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); return -1; @@ -110,21 +116,23 @@ int read_packet(vpn_packet_t *packet) memcpy(packet->data + 6, mymac.net.mac.address.x, 6); switch (ntohl(type)) { - case AF_INET: - packet->data[12] = 0x8; - packet->data[13] = 0x0; - break; - case AF_INET6: - packet->data[12] = 0x86; - packet->data[13] = 0xDD; - break; - default: - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_ERR, - _ - ("Unknown address family %d while reading packet from %s %s"), - ntohl(type), device_info, device); - return -1; + case AF_INET: + packet->data[12] = 0x8; + packet->data[13] = 0x0; + break; + + case AF_INET6: + packet->data[12] = 0x86; + packet->data[13] = 0xDD; + break; + + default: + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, + _ + ("Unknown address family %d while reading packet from %s %s"), + ntohl(type), device_info, device); + return -1; } packet->len = lenin + 10; @@ -137,14 +145,17 @@ int read_packet(vpn_packet_t *packet) } return 0; -cp} +} int write_packet(vpn_packet_t *packet) { u_int32_t type; struct iovec vector[2]; int af; - cp if(debug_lvl >= DEBUG_TRAFFIC) + + cp(); + + if(debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), packet->len, device_info); @@ -177,11 +188,13 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; -cp} +} 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c index 8dd00a20..b75f824d 100644 --- a/src/raw_socket/device.c +++ b/src/raw_socket/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.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" @@ -62,7 +62,10 @@ int setup_device(void) { struct ifreq ifr; struct sockaddr_ll sa; - cp if(!get_config_string + + cp(); + + if(!get_config_string (lookup_config(config_tree, "Interface"), &interface)) interface = "eth0"; @@ -70,7 +73,8 @@ int setup_device(void) device = interface; 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, strerror(errno)); return -1; @@ -94,9 +98,9 @@ int setup_device(void) syslog(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno)); return -1; } - cp - /* Set default MAC address for ethertap devices */ - mymac.type = SUBNET_MAC; + + /* Set default MAC address for ethertap devices */ + mymac.type = SUBNET_MAC; mymac.net.mac.address.x[0] = 0xfe; mymac.net.mac.address.x[1] = 0xfd; mymac.net.mac.address.x[2] = 0x00; @@ -105,12 +109,15 @@ int setup_device(void) mymac.net.mac.address.x[5] = 0x00; syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } 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 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, device, strerror(errno)); return -1; @@ -136,11 +146,13 @@ int read_packet(vpn_packet_t *packet) } return 0; -cp} +} 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"), packet->len, device_info); @@ -151,12 +163,15 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; - cp return 0; + + return 0; } 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 out: %10d"), device_total_out); -cp} +} diff --git a/src/solaris/device.c b/src/solaris/device.c index 47bfa600..a9ea6eb9 100644 --- a/src/solaris/device.c +++ b/src/solaris/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.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; 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; - 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)); return -1; } - cp ppa = 0; + + ppa = 0; ptr = device; while(*ptr && !isdigit((int) *ptr)) @@ -128,18 +131,24 @@ int setup_device(void) mymac.net.mac.address.x[5] = 0x00; syslog(LOG_INFO, _("%s is a %s"), device, device_info); - cp return 0; + + return 0; } void close_device(void) { - cp close(device_fd); + cp(); + + close(device_fd); } int read_packet(vpn_packet_t *packet) { 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, device, strerror(errno)); return -1; @@ -160,11 +169,13 @@ int read_packet(vpn_packet_t *packet) } return 0; -cp} +} 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"), packet->len, device_info); @@ -175,12 +186,15 @@ int write_packet(vpn_packet_t *packet) } device_total_out += packet->len; - cp return 0; + + return 0; } 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 out: %10d"), device_total_out); -cp} +} -- 2.20.1