From d5f140805bf5ee6e0c1a4a3dd774f308e29e0d99 Mon Sep 17 00:00:00 2001
From: Simon Arlott <simon@arlott.org>
Date: Wed, 17 Oct 2012 17:32:56 +0200
Subject: [PATCH] core: fix sendmsg/recvmsg on BSD/OSX by sending 1 byte of
 data (in hook_connect)

---
 src/core/wee-hook.h    |  2 +-
 src/core/wee-network.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/wee-hook.h b/src/core/wee-hook.h
index 8db315ea4..1ad0b6e1e 100644
--- a/src/core/wee-hook.h
+++ b/src/core/wee-hook.h
@@ -27,7 +27,7 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#if defined(__CYGWIN__) || defined(__APPLE__) || defined(__MACH__)
+#ifdef __CYGWIN__
 /*
  * For the connect hook, when this is defined an array of sockets will
  * be passed from the parent process to the child process instead of using
diff --git a/src/core/wee-network.c b/src/core/wee-network.c
index 0f2a98739..184bd5ea2 100644
--- a/src/core/wee-network.c
+++ b/src/core/wee-network.c
@@ -661,6 +661,8 @@ network_connect_child (struct t_hook *hook_connect)
     struct msghdr msg;
     struct cmsghdr *cmsg;
     char msg_buf[CMSG_SPACE(sizeof (sock))];
+    struct iovec iov[1];
+    char iov_data[1] = { 0 };
 #endif
     /*
      * indicates that something is wrong with whichever group of
@@ -1090,6 +1092,14 @@ network_connect_child (struct t_hook *hook_connect)
         memset (&msg, 0, sizeof (msg));
         msg.msg_control = msg_buf;
         msg.msg_controllen = sizeof (msg_buf);
+
+        /* send 1 byte of data (not required on Linux, required by BSD/OSX) */
+        memset (iov, 0, sizeof (iov));
+        iov[0].iov_base = iov_data;
+        iov[0].iov_len = 1;
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+
         cmsg = CMSG_FIRSTHDR(&msg);
         cmsg->cmsg_level = SOL_SOCKET;
         cmsg->cmsg_type = SCM_RIGHTS;
@@ -1278,6 +1288,8 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
     struct msghdr msg;
     struct cmsghdr *cmsg;
     char msg_buf[CMSG_SPACE(sizeof (sock))];
+    struct iovec iov[1];
+    char iov_data[1];
 #endif
 
     /* make C compiler happy */
@@ -1327,6 +1339,13 @@ network_connect_child_read_cb (void *arg_hook_connect, int fd)
             msg.msg_control = msg_buf;
             msg.msg_controllen = sizeof (msg_buf);
 
+            /* recv 1 byte of data (not required on Linux, required by BSD/OSX) */
+            memset (iov, 0, sizeof (iov));
+            iov[0].iov_base = iov_data;
+            iov[0].iov_len = 1;
+            msg.msg_iov = iov;
+            msg.msg_iovlen = 1;
+
             if (recvmsg (HOOK_CONNECT(hook_connect, child_recv), &msg, 0) >= 0)
             {
                 cmsg = CMSG_FIRSTHDR(&msg);