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

This fixes a problem where read() returns packets from the IP layer before
fragmentation is done.

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 2f1972a..3ff2f54 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -24,6 +24,7 @@
 
 #include <sys/stropts.h>
 #include <sys/sockio.h>
 
 #include <sys/stropts.h>
 #include <sys/sockio.h>

+#include <stropts.h>

 
 #include "../conf.h"
 #include "../device.h"
 
 #include "../conf.h"
 #include "../device.h"


@@ -298,11 +299,16 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
 }
 
 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:
 
        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;
                        }
                                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }


@@ -322,16 +328,19 @@ static bool read_packet(vpn_packet_t *packet) {
                        }
 
                        memset(packet->data, 0, 12);
                        }
 
                        memset(packet->data, 0, 12);

-                       packet->len = inlen + 14;
+                       packet->len = sbuf.len + 14;

                        break;
 
                case DEVICE_TYPE_TAP:
                        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;
                        }
 
                                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:
                        break;
 
                default:


@@ -348,16 +357,24 @@ static bool read_packet(vpn_packet_t *packet) {
 static bool write_packet(vpn_packet_t *packet) {
        ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s", packet->len, device_info);
 
 static bool write_packet(vpn_packet_t *packet) {
        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:
        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:
                                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;
                        }
                                logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device, strerror(errno));
                                return false;
                        }