/*
device.c -- Interaction with Linux ethertap and tun/tap device
- Copyright (C) 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2001-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 2001-2002 Ivo Timmermans <ivo@o2w.nl>,
+ 2001-2002 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
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.5 2002/02/10 21:57:54 guus Exp $
+ $Id: device.c,v 1.1.2.10 2002/09/09 19:40:12 guus Exp $
*/
#include "config.h"
#include <stdio.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+#ifdef HAVE_TUNTAP
interface = netname;
+#else
+ interface = rindex(device, '/')?rindex(device, '/')+1:device;
+#endif
cp
- if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
+ device_fd = open(device, O_RDWR | O_NONBLOCK);
+
+ if(device_fd < 0)
{
- syslog(LOG_ERR, _("Could not open %s: %m"), device);
+ syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
return -1;
}
cp
{
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
+ interface = rindex(device, '/')?rindex(device, '/')+1:device;
}
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
cp
if(device_type == DEVICE_TYPE_TUNTAP)
{
- if((lenin = read(device_fd, packet->data, MTU)) <= 0)
+ lenin = read(device_fd, packet->data, MTU);
+
+ if(lenin <= 0)
{
- syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device);
+ syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
return -1;
}
}
else /* ethertap */
{
- if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
+ lenin = read(device_fd, packet->data - 2, MTU + 2);
+
+ if(lenin <= 0)
{
- syslog(LOG_ERR, _("Error while reading from %s %s: %m"), device_info, device);
+ syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
return -1;
}
{
if(write(device_fd, packet->data, packet->len) < 0)
{
- syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device);
+ syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
return -1;
}
}
*(short int *)(packet->data - 2) = packet->len;
if(write(device_fd, packet->data - 2, packet->len + 2) < 0)
{
- syslog(LOG_ERR, _("Can't write to %s %s: %m"), device_info, device);
+ syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
return -1;
}
}