/*
device.c -- Interaction with Linux ethertap and tun/tap device
Copyright (C) 2001-2005 Ivo Timmermans,
- 2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+ 2001-2013 Guus Sliepen <guus@tinc-vpn.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
#include "conf.h"
#include "device.h"
#include "logger.h"
+#include "names.h"
#include "net.h"
#include "route.h"
#include "utils.h"
device = xstrdup(DEFAULT_DEVICE);
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_LINUX_IF_TUN_H
- if (netname != NULL)
+ if(netname)
iface = xstrdup(netname);
-#else
- iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
-#endif
+
device_fd = open(device, O_RDWR | O_NONBLOCK);
if(device_fd < 0) {
if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- if(iface) free(iface);
- iface = xstrdup(ifrname);
- } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
- logger(DEBUG_ALWAYS, LOG_WARNING, "Old ioctl() request was needed for %s", device);
- strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
- if(iface) free(iface);
+ free(iface);
iface = xstrdup(ifrname);
}
static bool read_packet(vpn_packet_t *packet) {
int inlen;
-
+
switch(device_type) {
case DEVICE_TYPE_TUN:
inlen = read(device_fd, packet->data + 10, MTU - 10);
return false;
}
+ memset(packet->data, 0, 12);
packet->len = inlen + 10;
break;
case DEVICE_TYPE_TAP: