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.18 2003/07/17 15:06:27 guus Exp $
+ $Id: device.c,v 1.1.2.21 2003/08/28 21:05:11 guus Exp $
*/
#include "system.h"
#include "route.h"
#include "utils.h"
-enum {
+typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
DEVICE_TYPE_TUN,
DEVICE_TYPE_TAP,
-};
+} device_type_t;
int device_fd = -1;
-int device_type;
+device_type_t device_type;
char *device;
-char *interface;
+char *iface;
char ifrname[IFNAMSIZ];
char *device_info;
int device_total_in = 0;
int device_total_out = 0;
-int setup_device(void)
+bool setup_device(void)
{
struct ifreq ifr;
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = DEFAULT_DEVICE;
- if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
#ifdef HAVE_TUNTAP
- interface = netname;
+ iface = netname;
#else
- interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+ iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
#endif
device_fd = open(device, O_RDWR | O_NONBLOCK);
if(device_fd < 0) {
logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
- return -1;
+ return false;
}
#ifdef HAVE_TUNTAP
device_info = _("Linux tun/tap device (tap mode)");
}
- if(interface)
- strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+ if(iface)
+ strncpy(ifr.ifr_name, iface, IFNAMSIZ);
- if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
+ if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- interface = ifrname;
- } else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
+ iface = ifrname;
+ } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- interface = ifrname;
+ iface = ifrname;
} else
#endif
{
if(routing_mode == RMODE_ROUTER)
- overwrite_mac = 1;
+ overwrite_mac = true;
device_info = _("Linux ethertap device");
device_type = DEVICE_TYPE_ETHERTAP;
- interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+ iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
}
logger(LOG_INFO, _("%s is a %s"), device, device_info);
- return 0;
+ return true;
}
void close_device(void)
close(device_fd);
}
-int read_packet(vpn_packet_t *packet)
+bool read_packet(vpn_packet_t *packet)
{
int lenin;
if(lenin <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
- return -1;
+ return false;
}
packet->len = lenin + 10;
if(lenin <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
- return -1;
+ return false;
}
packet->len = lenin;
if(lenin <= 0) {
logger(LOG_ERR, _("Error while reading from %s %s: %s"),
device_info, device, strerror(errno));
- return -1;
+ return false;
}
packet->len = lenin - 2;
ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
device_info);
- return 0;
+ return true;
}
-int write_packet(vpn_packet_t *packet)
+bool write_packet(vpn_packet_t *packet)
{
cp();
if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
strerror(errno));
- return -1;
+ return false;
}
break;
case DEVICE_TYPE_TAP:
if(write(device_fd, packet->data, packet->len) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
strerror(errno));
- return -1;
+ return false;
}
break;
case DEVICE_TYPE_ETHERTAP:
if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
logger(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
strerror(errno));
- return -1;
+ return false;
}
break;
}
device_total_out += packet->len;
- return 0;
+ return true;
}
void dump_device_stats(void)