From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 7 Dec 2013 21:54:02 +0000 (+0100)
Subject: Use hardcoded value for TUNNEWPPA if net/if_tun.h is missing on Solaris.
X-Git-Tag: 1.0.23-android-1~9
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=09afff80023f8fbde29d6664475962ece3d1e95d;p=tinc

Use hardcoded value for TUNNEWPPA if net/if_tun.h is missing on Solaris.

Conflicts:
	src/solaris/device.c
---

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 111fac8f..09d90e2c 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -33,6 +33,11 @@
 #include "../utils.h"
 #include "../xalloc.h"
 
+#ifndef TUNNEWPPA
+#warning Missing net/if_tun.h, using hardcoded value for TUNNEWPPA
+#define TUNNEWPPA       (('T'<<16) | 0x0001)
+#endif
+
 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
 
@@ -44,7 +49,6 @@ static enum {
 int device_fd = -1;
 static int if_fd = -1;
 static int ip_fd = -1;
-static int arp_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;