Switch to K&R style indentation.
This commit is contained in:
Guus Sliepen
parent
5fc1ed17f4
commit
f75dcef72a
44 changed files with 6039 additions and 6132 deletions
|
|
@ -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.9 2002/06/21 10:11:36 guus Exp $
|
||||
$Id: device.c,v 1.1.2.10 2002/09/09 21:25:26 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -63,133 +63,125 @@ extern subnet_t mymac;
|
|||
*/
|
||||
int setup_device(void)
|
||||
{
|
||||
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
|
||||
device = DEFAULT_DEVICE;
|
||||
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)
|
||||
{
|
||||
syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
cp
|
||||
/* Set default MAC address for ethertap devices */
|
||||
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) {
|
||||
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;
|
||||
mymac.net.mac.address.x[0] = 0xfe;
|
||||
mymac.net.mac.address.x[1] = 0xfd;
|
||||
mymac.net.mac.address.x[2] = 0x00;
|
||||
mymac.net.mac.address.x[3] = 0x00;
|
||||
mymac.net.mac.address.x[4] = 0x00;
|
||||
mymac.net.mac.address.x[5] = 0x00;
|
||||
|
||||
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;
|
||||
mymac.net.mac.address.x[3] = 0x00;
|
||||
mymac.net.mac.address.x[4] = 0x00;
|
||||
mymac.net.mac.address.x[5] = 0x00;
|
||||
device_info = _("OpenBSD tun device");
|
||||
|
||||
device_info = _("OpenBSD tun device");
|
||||
|
||||
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
cp
|
||||
return 0;
|
||||
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
cp return 0;
|
||||
}
|
||||
|
||||
void close_device(void)
|
||||
{
|
||||
cp
|
||||
close(device_fd);
|
||||
cp
|
||||
}
|
||||
cp close(device_fd);
|
||||
cp}
|
||||
|
||||
int read_packet(vpn_packet_t *packet)
|
||||
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
|
||||
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) {
|
||||
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
|
||||
device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
memcpy(packet->data, mymac.net.mac.address.x, 6);
|
||||
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
|
||||
|
||||
memcpy(packet->data, mymac.net.mac.address.x, 6);
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
packet->len = lenin + 10;
|
||||
|
||||
packet->len = lenin + 10;
|
||||
device_total_in += packet->len;
|
||||
|
||||
device_total_in += packet->len;
|
||||
if(debug_lvl >= DEBUG_TRAFFIC) {
|
||||
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
|
||||
device_info);
|
||||
}
|
||||
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
{
|
||||
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
|
||||
}
|
||||
return 0;
|
||||
cp}
|
||||
|
||||
return 0;
|
||||
cp
|
||||
}
|
||||
|
||||
int write_packet(vpn_packet_t *packet)
|
||||
int write_packet(vpn_packet_t * packet)
|
||||
{
|
||||
u_int32_t type;
|
||||
struct iovec vector[2];
|
||||
int af;
|
||||
cp
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
|
||||
packet->len, device_info);
|
||||
u_int32_t type;
|
||||
struct iovec vector[2];
|
||||
int af;
|
||||
cp if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
|
||||
packet->len, device_info);
|
||||
|
||||
af = (packet->data[12] << 8) + packet->data[13];
|
||||
af = (packet->data[12] << 8) + packet->data[13];
|
||||
|
||||
switch(af)
|
||||
{
|
||||
case 0x800:
|
||||
type = htonl(AF_INET);
|
||||
break;
|
||||
case 0x86DD:
|
||||
type = htonl(AF_INET6);
|
||||
break;
|
||||
default:
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_ERR, _("Unknown address family %d while writing packet to %s %s"), af, device_info, device);
|
||||
return -1;
|
||||
}
|
||||
switch (af) {
|
||||
case 0x800:
|
||||
type = htonl(AF_INET);
|
||||
break;
|
||||
case 0x86DD:
|
||||
type = htonl(AF_INET6);
|
||||
break;
|
||||
default:
|
||||
if(debug_lvl >= DEBUG_TRAFFIC)
|
||||
syslog(LOG_ERR,
|
||||
_("Unknown address family %d while writing packet to %s %s"),
|
||||
af, device_info, device);
|
||||
return -1;
|
||||
}
|
||||
|
||||
vector[0].iov_base = &type;
|
||||
vector[0].iov_len = sizeof(type);
|
||||
vector[1].iov_base = packet->data + 14;
|
||||
vector[1].iov_len = packet->len - 14;
|
||||
vector[0].iov_base = &type;
|
||||
vector[0].iov_len = sizeof(type);
|
||||
vector[1].iov_base = packet->data + 14;
|
||||
vector[1].iov_len = packet->len - 14;
|
||||
|
||||
if(writev(device_fd, vector, 2) < 0)
|
||||
{
|
||||
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
if(writev(device_fd, vector, 2) < 0) {
|
||||
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
device_total_out += packet->len;
|
||||
cp
|
||||
}
|
||||
device_total_out += packet->len;
|
||||
cp}
|
||||
|
||||
void dump_device_stats(void)
|
||||
{
|
||||
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
|
||||
}
|
||||
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}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue