From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 16 Dec 2012 14:36:06 +0000 (+0100)
Subject: Fix support for tunemu on iOS devices.
X-Git-Tag: release-1.1pre5~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17a0b3a8907d7e618eb94ee2792d10c7cb8d3f30;p=oweals%2Ftinc.git

Fix support for tunemu on iOS devices.

The actual code was fine but the #ifdefs tested for the wrong preprocessor
variable.

Conflicts:
	src/bsd/device.c
	src/process.c
---

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 3e64ba9..dd35145 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -29,7 +29,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 #include "bsd/tunemu.h"
 #endif
 
@@ -44,7 +44,7 @@ typedef enum device_type {
 	DEVICE_TYPE_TUN,
 	DEVICE_TYPE_TUNIFHEAD,
 	DEVICE_TYPE_TAP,
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 	DEVICE_TYPE_TUNEMU,
 #endif
 } device_type_t;
@@ -55,7 +55,7 @@ char *iface = NULL;
 static char *device_info = NULL;
 static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
-#if defined(TUNEMU)
+#if defined(ENABLE_TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
 #elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
 static device_type_t device_type = DEVICE_TYPE_TUNIFHEAD;
@@ -79,7 +79,7 @@ static bool setup_device(void) {
 	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
 		if(!strcasecmp(type, "tun"))
 			/* use default */;
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		else if(!strcasecmp(type, "tunemu"))
 			device_type = DEVICE_TYPE_TUNEMU;
 #endif
@@ -99,7 +99,7 @@ static bool setup_device(void) {
 	}
 
 	switch(device_type) {
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		case DEVICE_TYPE_TUNEMU: {
 			char dynamic_name[256] = "";
 			device_fd = tunemu_open(dynamic_name);
@@ -176,7 +176,7 @@ static bool setup_device(void) {
 
 #endif
 			break;
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			device_info = "BSD tunemu device";
 			break;
@@ -190,7 +190,7 @@ static bool setup_device(void) {
 
 static void close_device(void) {
 	switch(device_type) {
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			tunemu_close(device_fd);
 			break;
@@ -208,7 +208,7 @@ static bool read_packet(vpn_packet_t *packet) {
 
 	switch(device_type) {
 		case DEVICE_TYPE_TUN:
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			if(device_type == DEVICE_TYPE_TUNEMU)
 				inlen = tunemu_read(device_fd, packet->data + 14, MTU - 14);
@@ -347,7 +347,7 @@ static bool write_packet(vpn_packet_t *packet) {
 			}
 			break;
 
-#ifdef HAVE_TUNEMU
+#ifdef ENABLE_TUNEMU
 		case DEVICE_TYPE_TUNEMU:
 			if(tunemu_write(device_fd, packet->data + 14, packet->len - 14) < 0) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Error while writing to %s %s: %s", device_info,