Use getmsg()/putmsg() instead of read()/write() on Solaris.

[tinc] / src / solaris / device.c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 111fac8..3ff2f54 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -2,7 +2,7 @@
     device.c -- Interaction with Solaris tun device
     Copyright (C) 2001-2005 Ivo Timmermans,
                   2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
-                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 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
@@ -24,6 +24,7 @@
 
 #include <sys/stropts.h>
 #include <sys/sockio.h>
+#include <stropts.h>
 
 #include "../conf.h"
 #include "../device.h"
@@ -33,8 +34,14 @@
 #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"
+#define IP_DEVICE "/dev/udp"
 
 static enum {
        DEVICE_TYPE_TUN,
@@ -44,7 +51,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;
@@ -83,8 +89,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(LOG_ERR, "Could not open %s: %s\n", "/dev/ip", strerror(errno));
+       if((ip_fd = open(IP_DEVICE, O_RDWR, 0)) < 0) {
+               logger(LOG_ERR, "Could not open %s: %s\n", IP_DEVICE, strerror(errno));
                return false;
        }
 
@@ -201,7 +207,7 @@ static bool setup_device(void) {
 
                /* Push arp module to ip_fd */
                if(ioctl(ip_fd, I_PUSH, "arp") < 0) {
-                       logger(LOG_ERR, "Could not push ARP module onto %s!", "/dev/ip");
+                       logger(LOG_ERR, "Could not push ARP module onto %s!", IP_DEVICE);
                        return false;
                }
 
@@ -293,11 +299,16 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-       int inlen;
+       int result;
+       struct strbuf sbuf;
+       int f = 0;
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
-                       if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+                       sbuf.maxlen = MTU - 14;
+                       sbuf.buf = (char *)packet->data + 14;
+
+                       if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
                                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }
@@ -312,21 +323,24 @@ static bool read_packet(vpn_packet_t *packet) {
                                        packet->data[13] = 0xDD;
                                        break;
                                default:
-                                       logger(DEBUG_TRAFFIC, LOG_ERR, "Unknown IP version %d while reading packet from %s %s", packet->data[14] >> 4, device_info, device);
+                                       ifdebug(TRAFFIC) logger(LOG_ERR, "Unknown IP version %d while reading packet from %s %s", packet->data[14] >> 4, device_info, device);
                                        return false;
                        }
 
                        memset(packet->data, 0, 12);
-                       packet->len = inlen + 14;
+                       packet->len = sbuf.len + 14;
                        break;
 
                case DEVICE_TYPE_TAP:
-                       if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
+                       sbuf.maxlen = MTU;
+                       sbuf.buf = (char *)packet->data;
+
+                       if((result = getmsg(device_fd, NULL, &sbuf, &f)) < 0) {
                                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }
 
-                       packet->len = inlen + 14;
+                       packet->len = sbuf.len;
                        break;
 
                default:
@@ -335,24 +349,32 @@ static bool read_packet(vpn_packet_t *packet) {
 
        device_total_in += packet->len;
 
-       logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len, device_info);
 
        return true;
 }
 
 static bool write_packet(vpn_packet_t *packet) {
-       logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s", packet->len, device_info);
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s", packet->len, device_info);
+
+       struct strbuf sbuf;
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
-                       if(write(device_fd, packet->data + 14, packet->len - 14) < 0) {
+                       sbuf.len = packet->len - 14;
+                       sbuf.buf = (char *)packet->data + 14;
+
+                       if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
                                logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }
                        break;
 
                case DEVICE_TYPE_TAP:
-                       if(write(device_fd, packet->data, packet->len) < 0) {
+                       sbuf.len = packet->len;
+                       sbuf.buf = (char *)packet->data;
+
+                       if(putmsg(device_fd, NULL, &sbuf, 0) < 0) {
                                logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }