From 3e6ca7909da371c3ec25d25c89c637618d05c0ab Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 2 Jul 2005 13:45:08 +0000
Subject: * ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64
 and   IA64.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/socket.c | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'ext/socket')

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 867088f08..4fb2ea899 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1779,9 +1779,9 @@ unix_send_io(sock, val)
 
 #if FD_PASSING_BY_MSG_CONTROL
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
+    msg.msg_controllen = CMSG_SPACE(sizeof(int));
     msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
+    cmsg.hdr.cmsg_len = CMSG_SPACE(0) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     cmsg.fd = fd;
@@ -1841,9 +1841,9 @@ unix_recv_io(argc, argv, sock)
 
 #if FD_PASSING_BY_MSG_CONTROL
     msg.msg_control = (caddr_t)&cmsg;
-    msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
+    msg.msg_controllen = CMSG_SPACE(sizeof(int));
     msg.msg_flags = 0;
-    cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
+    cmsg.hdr.cmsg_len = CMSG_SPACE(0) + sizeof(int);
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     cmsg.fd = -1;
@@ -1856,18 +1856,34 @@ unix_recv_io(argc, argv, sock)
     if (recvmsg(fptr->fd, &msg, 0) == -1)
 	rb_sys_fail("recvmsg(2)");
 
-    if (
 #if FD_PASSING_BY_MSG_CONTROL
-	msg.msg_controllen != sizeof(struct cmsghdr) + sizeof(int) ||
-        cmsg.hdr.cmsg_len != sizeof(struct cmsghdr) + sizeof(int) ||
-	cmsg.hdr.cmsg_level != SOL_SOCKET ||
-	cmsg.hdr.cmsg_type != SCM_RIGHTS
+    if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (msg_controllen : %d != %d)",
+          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
+    }
+    if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_len : %d != %d)",
+          cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
+    }
+    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_level : %d != %d)",
+          cmsg.hdr.cmsg_level, SOL_SOCKET);
+    }
+    if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_type : %d != %d)",
+          cmsg.hdr.cmsg_type, SCM_RIGHTS);
+    }
 #else
-        msg.msg_accrightslen != sizeof(fd)
-#endif
-	) {
-	rb_raise(rb_eSocket, "file descriptor was not passed");
+    if (msg.msg_accrightslen != sizeof(fd)) {
+	rb_raise(rb_eSocket,
+            "file descriptor was not passed (accrightslen) : %d != %d",
+            msg.msg_accrightslen, sizeof(fd));
     }
+#endif
 
 #if FD_PASSING_BY_MSG_CONTROL
     fd = cmsg.fd;
-- 
cgit