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

Remove support for the Ethertap device.

Browse source
This commit is contained in:
Guus Sliepen 2011-06-02 18:07:50 +02:00
parent af2e0c9a32
commit 809dfd2f5b
1 changed files with 7 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/linux/device.c
View file

@ -20,12 +20,8 @@
#include "system.h" #include "system.h"
#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h> #include <linux/if_tun.h>
#define DEFAULT_DEVICE "/dev/net/tun" #define DEFAULT_DEVICE "/dev/net/tun"
#else
#define DEFAULT_DEVICE "/dev/tap0"
#endif
#include "conf.h" #include "conf.h"
#include "logger.h" #include "logger.h"
@ -36,7 +32,6 @@
#include "device.h" #include "device.h"
typedef enum device_type_t { typedef enum device_type_t {
DEVICE_TYPE_ETHERTAP,
DEVICE_TYPE_TUN, DEVICE_TYPE_TUN,
DEVICE_TYPE_TAP, DEVICE_TYPE_TAP,
} device_type_t; } device_type_t;
@ -54,9 +49,6 @@ uint64_t device_out_packets = 0;
uint64_t device_out_bytes = 0; uint64_t device_out_bytes = 0;
bool setup_device(void) { bool setup_device(void) {
struct ifreq ifr;
bool t1q = false;
if(!get_config_string(lookup_config(config_tree, "Device"), &device)) if(!get_config_string(lookup_config(config_tree, "Device"), &device))
device = xstrdup(DEFAULT_DEVICE); device = xstrdup(DEFAULT_DEVICE);
@ -74,10 +66,8 @@ bool setup_device(void) {
return false; return false;
} }
#ifdef HAVE_LINUX_IF_TUN_H struct ifreq ifr = {{{0}}};
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof ifr);
if(routing_mode == RMODE_ROUTER) { if(routing_mode == RMODE_ROUTER) {
ifr.ifr_flags = IFF_TUN; ifr.ifr_flags = IFF_TUN;
device_type = DEVICE_TYPE_TUN; device_type = DEVICE_TYPE_TUN;
@ -90,6 +80,8 @@ bool setup_device(void) {
#ifdef IFF_ONE_QUEUE #ifdef IFF_ONE_QUEUE
/* Set IFF_ONE_QUEUE flag... */ /* Set IFF_ONE_QUEUE flag... */
bool t1q = false;
if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q) if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
ifr.ifr_flags |= IFF_ONE_QUEUE; ifr.ifr_flags |= IFF_ONE_QUEUE;
#endif #endif
@ -106,16 +98,6 @@ bool setup_device(void) {
strncpy(ifrname, ifr.ifr_name, IFNAMSIZ); strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
if(iface) free(iface); if(iface) free(iface);
iface = xstrdup(ifrname); iface = xstrdup(ifrname);
} else
#endif
{
if(routing_mode == RMODE_ROUTER)
overwrite_mac = true;
device_info = "Linux ethertap device";
device_type = DEVICE_TYPE_ETHERTAP;
if(iface)
free(iface);
iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
} }
logger(LOG_INFO, "%s is a %s", device, device_info); logger(LOG_INFO, "%s is a %s", device, device_info);
@ -156,17 +138,8 @@ bool read_packet(vpn_packet_t *packet) {
packet->len = inlen; packet->len = inlen;
break; break;
case DEVICE_TYPE_ETHERTAP: default:
inlen = read(device_fd, packet->data - 2, MTU + 2); abort();
if(inlen <= 0) {
logger(LOG_ERR, "Error while reading from %s %s: %s",
device_info, device, strerror(errno));
return false;
}
packet->len = inlen - 2;
break;
} }
device_in_packets++; device_in_packets++;
@ -198,15 +171,8 @@ bool write_packet(vpn_packet_t *packet) {
return false; return false;
} }
break; break;
case DEVICE_TYPE_ETHERTAP: default:
*(short int *)(packet->data - 2) = packet->len; abort();
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 false;
}
break;
} }
device_out_packets++; device_out_packets++;