0
@@ -41,32 +41,32 @@ static VALUE mNativeSupport;
0
 static VALUE
0
 send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
0
   int fd;
0
-	struct msghdr msg;
0
-	struct iovec vec[1];
0
-	char buf[1];
0
-
0
   struct {
0
-		struct cmsghdr hdr;
0
+		struct cmsghdr header;
0
     int fd;
0
-	} cmsg;
0
+	} control;
0
+	struct msghdr msg;
0
+	struct iovec vec;
0
+	char dummy[1];
0
+
0
+	control.header.cmsg_len   = sizeof(control);
0
+	control.header.cmsg_level = SOL_SOCKET;
0
+	control.header.cmsg_type  = SCM_RIGHTS;
0
+	control.fd = NUM2INT(fd_to_send);
0
 
0
   msg.msg_name = NULL;
0
   msg.msg_namelen = 0;
0
-
0
-	/* Linux and Solaris doesn't work if msg_iov is NULL. */
0
-	buf[0] = '\0';
0
-	vec[0].iov_base = buf;
0
-	vec[0].iov_len = 1;
0
-	msg.msg_iov = vec;
0
+	
0
+	/* Linux and Solaris require msg_iov to be non-NULL.. */
0
+	dummy[0]       = '\0';
0
+	vec.iov_base   = dummy;
0
+	vec.iov_len    = sizeof(dummy);
0
+	msg.msg_iov    = &vec;
0
   msg.msg_iovlen = 1;
0
-
0
-	msg.msg_control = (caddr_t)&cmsg;
0
-	msg.msg_controllen = CMSG_SPACE(sizeof(int));
0
-	msg.msg_flags = 0;
0
-	cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
0
-	cmsg.hdr.cmsg_level = SOL_SOCKET;
0
-	cmsg.hdr.cmsg_type = SCM_RIGHTS;
0
-	cmsg.fd = NUM2INT(fd_to_send);
0
+	
0
+	msg.msg_control    = (caddr_t) &control;
0
+	msg.msg_controllen = sizeof(control);
0
+	msg.msg_flags      = 0;
0
   
0
   if (sendmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
0
     rb_sys_fail("sendmsg(2)");
0
@@ -88,43 +88,46 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
0
  */
0
 static VALUE
0
 recv_fd(VALUE self, VALUE socket_fd) {
0
-	struct msghdr msg;
0
-	struct iovec vec[2];
0
-	char buf[1];
0
   struct {
0
-		struct cmsghdr hdr;
0
+		struct cmsghdr header;
0
     int fd;
0
-	} cmsg;
0
+	} control;
0
 
0
-	msg.msg_name = NULL;
0
-	msg.msg_namelen = 0;
0
+	control.header.cmsg_len   = sizeof(control);
0
+	control.header.cmsg_level = SOL_SOCKET;
0
+	control.header.cmsg_type  = SCM_RIGHTS;
0
+	control.fd = -1;
0
+
0
+	struct msghdr msg;
0
+	struct iovec vec;
0
+	char dummy[1];
0
 
0
-	vec[0].iov_base = buf;
0
-	vec[0].iov_len = sizeof(buf);
0
-	msg.msg_iov = vec;
0
+	msg.msg_name    = NULL;
0
+	msg.msg_namelen = 0;
0
+	
0
+	dummy[0]       = '\0';
0
+	vec.iov_base   = dummy;
0
+	vec.iov_len    = sizeof(dummy);
0
+	msg.msg_iov    = &vec;
0
   msg.msg_iovlen = 1;
0
 
0
-	msg.msg_control = (caddr_t)&cmsg;
0
-	msg.msg_controllen = CMSG_SPACE(sizeof(int));
0
-	msg.msg_flags = 0;
0
-	cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
0
-	cmsg.hdr.cmsg_level = SOL_SOCKET;
0
-	cmsg.hdr.cmsg_type = SCM_RIGHTS;
0
-	cmsg.fd = -1;
0
+	msg.msg_control    = (caddr_t) &control;
0
+	msg.msg_controllen = sizeof(control);
0
+	msg.msg_flags      = 0;
0
 
0
   if (recvmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
0
     rb_sys_fail("Cannot read file descriptor with recvmsg()");
0
     return Qnil;
0
   }
0
-
0
-	if (msg.msg_controllen != CMSG_SPACE(sizeof(int))
0
-	 || cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)
0
-	 || cmsg.hdr.cmsg_level != SOL_SOCKET
0
-	 || cmsg.hdr.cmsg_type != SCM_RIGHTS) {
0
+	
0
+	if (msg.msg_controllen        != sizeof(control)
0
+	 || control.header.cmsg_len   != sizeof(control)
0
+	 || control.header.cmsg_level != SOL_SOCKET
0
+	 || control.header.cmsg_type  != SCM_RIGHTS) {
0
     rb_sys_fail("No valid file descriptor received.");
0
     return Qnil;
0
   }
0
-	return INT2NUM(cmsg.fd);
0
+	return INT2NUM(control.fd);
0
 }
0
 
0
 /*