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

Merging of the entire pre5 branch.

Browse source
This commit is contained in:
Guus Sliepen 2002-02-10 21:57:54 +00:00
parent c2752b961c
commit f0aa9641e8
70 changed files with 2575 additions and 4056 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/openbsd/device.c
View file

@ -1,7 +1,7 @@
/*
device.c -- Interaction with OpenBSD tun device
Copyright (C) 2001 Ivo Timmermans <itimmermans@bigfoot.com>,
2001 Guus Sliepen <guus@sliepen.warande.net>
Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
2001-2002 Guus Sliepen <guus@sliepen.warande.net>
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,9 +17,30 @@
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.2 2001/10/12 15:52:03 guus Exp $
$Id: device.c,v 1.1.2.3 2002/02/10 21:57:54 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <fcntl.h>
#include <net/if.h>
#include <unistd.h>
#include <syslog.h>
#include <string.h>
#include <utils.h>
#include "conf.h"
#include "net.h"
#include "subnet.h"
#include "system.h"
#define DEFAULT_DEVICE "/dev/tun0"
#define DEVICE_TYPE_ETHERTAP 0
@ -27,24 +48,29 @@
int device_fd = -1;
int device_type;
char *device_fname;
char *device;
char *interface;
char *device_info;
int device_total_in = 0;
int device_total_out = 0;
extern subnet_t mymac;
/*
open the local ethertap device
*/
int setup_device(void)
{
if(!get_config_string(lookup_config(config_tree, "Device"), &device_fname)))
device_fname = 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 = netname;
cp
if((device_fd = open(device_fname, O_RDWR | O_NONBLOCK)) < 0)
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
{
syslog(LOG_ERR, _("Could not open %s: %m"), device_fname);
syslog(LOG_ERR, _("Could not open %s: %m"), device);
return -1;
}
cp
@ -60,28 +86,35 @@ cp
device_info = _("OpenBSD tun device");
syslog(LOG_INFO, _("%s is a %s"), device_fname, device_info);
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp
return 0;
}
void close_device(void)
{
cp
close(device_fd);
cp
}
int read_packet(vpn_packet_t *packet)
{
int lenin;
u_int32_t type;
cp
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: %m"), device_info, device_fname);
syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device);
return -1;
}
memcpy(vp->data, mymac.net.mac.address.x, 6);
memcpy(vp->data + 6, mymac.net.mac.address.x, 6);
vp->data[12] = 0x08;
vp->data[13] = 0x00;
memcpy(packet->data, mymac.net.mac.address.x, 6);
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
packet->data[12] = 0x08;
packet->data[13] = 0x00;
packet->len = lenin + 10;
@ -89,7 +122,7 @@ cp
if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), device_info, packet.len);
syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
}
return 0;
@ -99,20 +132,32 @@ cp
int write_packet(vpn_packet_t *packet)
{
u_int32_t type = htonl(AF_INET);
struct iovec vector[2];
cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, 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: %m"), device_info, packet.len);
syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device);
return -1;
}
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
}