From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 8 Apr 2017 11:31:04 +0000 (+0200)
Subject: Use /dev/udp instead of /dev/ip on Solaris.
X-Git-Tag: release-1.1pre15~28
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=6011197be5cdb18aa79713990d6a1887b9261d12

Use /dev/udp instead of /dev/ip on Solaris.

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

diff --git a/src/solaris/device.c b/src/solaris/device.c
index fadae573..53d3d63c 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -41,6 +41,7 @@
 
 #define DEFAULT_TUN_DEVICE "/dev/tun"
 #define DEFAULT_TAP_DEVICE "/dev/tap"
+#define IP_DEVICE "/dev/udp"
 
 static enum {
 	DEVICE_TYPE_TUN,
@@ -84,8 +85,8 @@ static bool setup_device(void) {
 
 	/* The following is black magic copied from OpenVPN. */
 
-	if((ip_fd = open("/dev/ip", O_RDWR, 0)) < 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", "/dev/ip", strerror(errno));
+	if((ip_fd = open(IP_DEVICE, O_RDWR, 0)) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s\n", IP_DEVICE, strerror(errno));
 		return false;
 	}
 
@@ -203,7 +204,7 @@ static bool setup_device(void) {
 
 		/* Push arp module to ip_fd */
 		if(ioctl(ip_fd, I_PUSH, "arp") < 0) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Could not push ARP module onto %s!", "/dev/ip");
+			logger(DEBUG_ALWAYS, LOG_ERR, "Could not push ARP module onto %s!", IP_DEVICE);
 			return false;
 		}