Changeset 70d7795

Timestamp:

2010-11-12T22:51:39Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ed0589c

Parents:

6da18ac

Message:

Don't use the fd passing code in ipc.c on SunOS since it doesn't seem to be
supported there.

Files:

• configure (modified) (1 diff)
• ipc.c (modified) (6 diffs)

configure

@@ -682 +682 @@
         echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
         echo 'STRIP=\# skip strip' >> Makefile.settings
+        echo '#define NO_FD_PASSING' >> config.h
 ;;
 AIX )

ipc.c

@@ -38 +38 @@
 static void ipc_master_takeover_fail( struct bitlbee_child *child, gboolean both );
 static gboolean ipc_send_fd( int fd, int send_fd );
+
+/* On Solaris and possibly other systems passing FDs between processes is
+ * not possible (or at least not using the method used in this file.
+ * Just disable that code, the functionality is not that important. */
+#if defined(NO_FD_PASSING) && !defined(CMSG_SPACE)
+#define CMSG_SPACE(len) 1
+#endif
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -446 +453 @@
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
+#ifndef NO_FD_PASSING
                 if( !ipc_send_fd( global.listen_socket, irc->fd ) )
                         ipc_child_disable();
         
                 ipc_to_master_str( "IDENTIFY %s :%s\r\n", irc->user->nick, irc->password );
+#endif
                 
                 return TRUE;
@@ -566 +575 @@
         msg.msg_iov = &iov;
         msg.msg_iovlen = 1;
+#ifndef NO_FD_PASSING
         msg.msg_control = ccmsg;
         msg.msg_controllen = sizeof( ccmsg );
+#endif
         
         if( recvmsg( fd, &msg, 0 ) != size )
                 return NULL;
         
+#ifndef NO_FD_PASSING
         if( recv_fd )
                 for( cmsg = CMSG_FIRSTHDR( &msg ); cmsg; cmsg = CMSG_NXTHDR( &msg, cmsg ) )
@@ -586 +598 @@
                                 */
                         }
+#endif
         
         /*
@@ -758 +771 @@
         msg.msg_iovlen = 1;
         
+#ifndef NO_FD_PASSING
         msg.msg_control = ccmsg;
         msg.msg_controllen = sizeof( ccmsg );
@@ -766 +780 @@
         *(int*)CMSG_DATA( cmsg ) = send_fd;
         msg.msg_controllen = cmsg->cmsg_len;
+#endif
         
         return sendmsg( fd, &msg, 0 ) == 6;