Commit 8ec6efa06d48810822b3dedf6a26cca3576f5363 to FooBarWidget's passenger

FooBarWidget / passenger

Description:	Phusion Passenger (mod_rails)
Homepage:	http://www.modrails.com/
Clone URL:	git://github.com/FooBarWidget/passenger.git Give this clone URL to anyone. `git clone git://github.com/FooBarWidget/passenger.git`
Search Repo:

Click here to lend your support to: passenger and make a donation at www.pledgie.com !

Attempt to fix file descriptor passing in OS X (again).

Hongli Lai (Phusion) (author)

Tue May 06 11:52:33 -0700 2008

commit 8ec6efa06d48810822b3dedf6a26cca3576f5363
tree 323f6d1cfa149a8b566b0b5a1e2a363db2d65dd9
parent a5abd879c20bfef2ae97c15ca349fec23ec2d857

Rakefile
ext/apache2/MessageChannel.h
ext/passenger/native_support.c

Rakefile

0
@@ -186,17 +186,20 @@
0
     'MessageChannelTest.o' => %w(MessageChannelTest.cpp ../ext/apache2/MessageChannel.h),
0
     'SpawnManagerTest.o' => %w(SpawnManagerTest.cpp
0
       ../ext/apache2/SpawnManager.h
0
-			../ext/apache2/Application.h),
0
+			../ext/apache2/Application.h
0
+			../ext/apache2/MessageChannel.h),
0
     'ApplicationPoolServerTest.o' => %w(ApplicationPoolServerTest.cpp
0
       ../ext/apache2/StandardApplicationPool.h
0
-			../ext/apache2/ApplicationPoolClientServer.h),
0
+			../ext/apache2/ApplicationPoolClientServer.h
0
+			../ext/apache2/MessageChannel.h),
0
     'ApplicationPoolServer_ApplicationPoolTest.o' => %w(ApplicationPoolServer_ApplicationPoolTest.cpp
0
       ApplicationPoolTest.cpp
0
       ../ext/apache2/ApplicationPoolClientServer.h
0
       ../ext/apache2/ApplicationPool.h
0
       ../ext/apache2/StandardApplicationPool.h
0
       ../ext/apache2/SpawnManager.h
0
-			../ext/apache2/Application.h),
0
+			../ext/apache2/Application.h
0
+			../ext/apache2/MessageChannel.h),
0
     'StandardApplicationPoolTest.o' => %w(StandardApplicationPoolTest.cpp
0
       ApplicationPoolTest.cpp
0
       ../ext/apache2/ApplicationPool.h

ext/apache2/MessageChannel.h

0
@@ -259,7 +259,14 @@
0
     struct msghdr msg;
0
     struct iovec vec;
0
     char dummy[1];
0
-		char control_data[CMSG_SPACE(sizeof(int))];
0
+		#ifdef __APPLE__
0
+			struct {
0
+				struct cmsghdr header;
0
+				int fd;
0
+			} control_data;
0
+		#else
0
+			char control_data[CMSG_SPACE(sizeof(int))];
0
+		#endif
0
     struct cmsghdr *control_header;
0
   
0
     msg.msg_name = NULL;
0
0
0
0
@@ -272,18 +279,21 @@
0
     msg.msg_iov    = &vec;
0
     msg.msg_iovlen = 1;
0
   
0
-		msg.msg_control    = (caddr_t) control_data;
0
+		msg.msg_control    = (caddr_t) &control_data;
0
     msg.msg_controllen = sizeof(control_data);
0
     msg.msg_flags      = 0;
0
-	
0
-		control_header             = CMSG_FIRSTHDR(&msg);
0
-		control_header->cmsg_len   = CMSG_LEN(sizeof(int));
0
+		
0
+		control_header = CMSG_FIRSTHDR(&msg);
0
     control_header->cmsg_level = SOL_SOCKET;
0
     control_header->cmsg_type  = SCM_RIGHTS;
0
-		memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
0
+		#ifdef __APPLE__
0
+			control_header->cmsg_len = sizeof(control_data);
0
+			control_data.fd = fileDescriptor;
0
+		#else
0
+			control_header->cmsg_len = CMSG_LEN(sizeof(int));
0
+			memcpy(CMSG_DATA(control_header), &fileDescriptor, sizeof(int));
0
+		#endif
0
     
0
-		msg.msg_controllen = control_header->cmsg_len;
0
-		
0
     if (sendmsg(fd, &msg, 0) == -1) {
0
       throw SystemException("Cannot send file descriptor with sendmsg()", errno);
0
     }
0
@@ -425,7 +435,14 @@
0
     struct msghdr msg;
0
     struct iovec vec;
0
     char dummy[1];
0
-		char control_data[CMSG_SPACE(sizeof(int))];
0
+		#ifdef __APPLE__
0
+			struct {
0
+				struct cmsghdr header;
0
+				int fd;
0
+			} control_data;
0
+		#else
0
+			char control_data[CMSG_SPACE(sizeof(int))];
0
+		#endif
0
     struct cmsghdr *control_header;
0
 
0
     msg.msg_name    = NULL;
0
@@ -437,7 +454,7 @@
0
     msg.msg_iov    = &vec;
0
     msg.msg_iovlen = 1;
0
 
0
-		msg.msg_control    = (caddr_t) control_data;
0
+		msg.msg_control    = (caddr_t) &control_data;
0
     msg.msg_controllen = sizeof(control_data);
0
     msg.msg_flags      = 0;
0
     
0
0
@@ -446,13 +463,16 @@
0
     }
0
     
0
     control_header = CMSG_FIRSTHDR(&msg);
0
-		if (msg.msg_controllen         != sizeof(control_data)
0
-		 || control_header->cmsg_len   != CMSG_LEN(sizeof(int))
0
+		if (control_header->cmsg_len   != CMSG_LEN(sizeof(int))
0
      || control_header->cmsg_level != SOL_SOCKET
0
      || control_header->cmsg_type  != SCM_RIGHTS) {
0
       throw IOException("No valid file descriptor received.");
0
     }
0
-		return *((int *) CMSG_DATA(control_header));
0
+		#ifdef __APPLE__
0
+			return control_data.fd;
0
+		#else
0
+			return *((int *) CMSG_DATA(control_header));
0
+		#endif
0
   }
0
 };
0

ext/passenger/native_support.c

0
@@ -57,19 +57,22 @@
0
   msg.msg_iov    = &vec;
0
   msg.msg_iovlen = 1;
0
   
0
-	msg.msg_control    = (caddr_t) control_data;
0
+	msg.msg_control    = (caddr_t) &control_data;
0
   msg.msg_controllen = sizeof(control_data);
0
   msg.msg_flags      = 0;
0
   
0
-	control_header             = CMSG_FIRSTHDR(&msg);
0
-	control_header->cmsg_len   = CMSG_LEN(sizeof(int));
0
+	control_header = CMSG_FIRSTHDR(&msg);
0
   control_header->cmsg_level = SOL_SOCKET;
0
   control_header->cmsg_type  = SCM_RIGHTS;
0
   control_payload = NUM2INT(fd_to_send);
0
-	memcpy(CMSG_DATA(control_header), &control_payload, sizeof(int));
0
+	#ifdef __APPLE__
0
+		control_header->cmsg_len = sizeof(control_data);
0
+		control_data.fd = control_payload;
0
+	#else
0
+		control_header->cmsg_len = CMSG_LEN(sizeof(int));
0
+		memcpy(CMSG_DATA(control_header), &control_payload, sizeof(int));
0
+	#endif
0
   
0
-	msg.msg_controllen = control_header->cmsg_len;
0
-	
0
   if (sendmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
0
     rb_sys_fail("sendmsg(2)");
0
     return Qnil;
0
@@ -93,7 +96,14 @@
0
   struct msghdr msg;
0
   struct iovec vec;
0
   char dummy[1];
0
-	char control_data[CMSG_SPACE(sizeof(int))];
0
+	#ifdef __APPLE__
0
+		struct {
0
+			struct cmsghdr header;
0
+			int fd;
0
+		} control_data;
0
+	#else
0
+		char control_data[CMSG_SPACE(sizeof(int))];
0
+	#endif
0
   struct cmsghdr *control_header;
0
 
0
   msg.msg_name    = NULL;
0
@@ -105,7 +115,7 @@
0
   msg.msg_iov    = &vec;
0
   msg.msg_iovlen = 1;
0
 
0
-	msg.msg_control    = (caddr_t) control_data;
0
+	msg.msg_control    = (caddr_t) &control_data;
0
   msg.msg_controllen = sizeof(control_data);
0
   msg.msg_flags      = 0;
0
   
0
0
@@ -115,14 +125,17 @@
0
   }
0
   
0
   control_header = CMSG_FIRSTHDR(&msg);
0
-	if (msg.msg_controllen         != sizeof(control_data)
0
-	 || control_header->cmsg_len   != CMSG_LEN(sizeof(int))
0
+	if (control_header->cmsg_len   != CMSG_LEN(sizeof(int))
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(*((int *) CMSG_DATA(control_header)));
0
+	#ifdef __APPLE__
0
+		return INT2NUM(control_data.fd);
0
+	#else
0
+		return INT2NUM(*((int *) CMSG_DATA(control_header)));
0
+	#endif
0
 }
0
 
0
 /*

Comments

No one has commented yet.