Changes in / [277674c:9d6b229]

Files:

• bitlbee.c (modified) (3 diffs)
• bitlbee.h (modified) (1 diff)
• irc.c (modified) (1 diff)

bitlbee.c

@@ -33 +33 @@
 #include <errno.h>
 
-gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
-{
-        size_t size = sizeof( struct sockaddr_in );
-        struct sockaddr_in conn_info;
-        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
-        pid_t client_pid = 0;
-        
-        if( global.conf->runmode == RUNMODE_FORKDAEMON )
-                client_pid = fork();
-        
-        if( client_pid == 0 )
-        {
-                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
-                irc_new( new_socket );
-                
-                if( global.conf->runmode == RUNMODE_FORKDAEMON )
-                {
-                        /* Close the listening socket, we're a client. */
-                        close( global.listen_socket );
-                        g_source_remove( global.listen_watch_source_id );
-                }
-        }
-        else
-        {
-                /* We don't need this one, only the client does. */
-                close( new_socket );
-                
-                /* Or maybe we didn't even get a child process... */
-                if( client_pid == -1 )
-                        log_message( LOGLVL_ERROR, "Failed to fork() subprocess for client: %s", strerror( errno ) );
-        }
-        
-        return TRUE;
-}
+struct bitlbee_child
+{
+        pid_t pid;
+        int ipc_fd;
+        gint ipc_inpa;
+};
+
+static GSList *child_list = NULL;
+
+gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data );
  
-
-
 int bitlbee_daemon_init()
 {
@@ -258 +232 @@
 }
 
+gboolean bitlbee_io_master_ipc_read( gpointer data, gint source, GaimInputCondition cond );
+gboolean bitlbee_io_child_ipc_read( gpointer data, gint source, GaimInputCondition cond );
+
+gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data )
+{
+        size_t size = sizeof( struct sockaddr_in );
+        struct sockaddr_in conn_info;
+        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
+        pid_t client_pid = 0;
+        
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        {
+                int fds[2];
+                
+                if( socketpair( AF_UNIX, SOCK_STREAM, 0, fds ) == -1 )
+                {
+                        log_message( LOGLVL_WARNING, "Could not create IPC socket for client: %s", strerror( errno ) );
+                        fds[0] = fds[1] = -1;
+                }
+                
+                sock_make_nonblocking( fds[0] );
+                sock_make_nonblocking( fds[1] );
+                
+                client_pid = fork();
+                
+                if( client_pid > 0 && fds[0] != -1 )
+                {
+                        struct bitlbee_child *child;
+                        
+                        child = g_new0( struct bitlbee_child, 1 );
+                        child->pid = client_pid;
+                        child->ipc_fd = fds[0];
+                        child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, bitlbee_io_master_ipc_read, child );
+                        child_list = g_slist_append( child_list, child );
+                        
+                        close( fds[1] );
+                }
+                else if( client_pid == 0 )
+                {
+                        /* Close the listening socket, we're a client. */
+                        close( global.listen_socket );
+                        g_source_remove( global.listen_watch_source_id );
+                        
+                        /* We can store the IPC fd there now. */
+                        global.listen_socket = fds[1];
+                        global.listen_watch_source_id = gaim_input_add( fds[1], GAIM_INPUT_READ, bitlbee_io_child_ipc_read, NULL );
+                        
+                        close( fds[0] );
+                }
+        }
+        
+        if( client_pid == 0 )
+        {
+                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
+                irc_new( new_socket );
+        }
+        else
+        {
+                /* We don't need this one, only the client does. */
+                close( new_socket );
+        }
+        
+        return TRUE;
+}
+
 void bitlbee_shutdown( gpointer data )
 {
@@ -267 +306 @@
         g_main_quit( global.loop );
 }
+
+gboolean bitlbee_io_master_ipc_read( gpointer data, gint source, GaimInputCondition cond )
+{
+        struct bitlbee_child *child = data;
+        char buf[513], *eol;
+        int size;
+        
+        size = recv( child->ipc_fd, buf, sizeof( buf ) - 1, MSG_PEEK );
+        
+        if( size < 0 || ( size < 0 && !sockerr_again() ) )
+                goto error_abort;
+        else
+                buf[size] = 0;
+        
+        eol = strstr( buf, "\r\n" );
+        if( eol == NULL )
+                goto error_abort;
+        
+        size = recv( child->ipc_fd, buf, eol - buf + 2, 0 );
+        buf[size] = 0;
+        
+        if( strcmp( buf, "DIE\r\n" ) == 0 )
+        {
+                printf( "Bye...\n" );
+                exit( 0 );
+        }
+        
+        return TRUE;
+        
+error_abort:
+        {
+                GSList *l;
+                struct bitlbee_child *c;
+                
+                for( l = child_list; l; l = l->next )
+                {
+                        c = l->data;
+                        if( c->ipc_fd == source )
+                        {
+                                close( c->ipc_fd );
+                                gaim_input_remove( c->ipc_inpa );
+                                g_free( c );
+                                
+                                child_list = g_slist_remove( child_list, l );
+                                
+                                break;
+                        }
+                }
+                
+                return FALSE;
+        }
+}
+
+gboolean bitlbee_io_child_ipc_read( gpointer data, gint source, GaimInputCondition cond )
+{
+        return TRUE;
+}

bitlbee.h

@@ -112 +112 @@
 #include "sock.h"
 
-typedef struct global_t {
+typedef struct global {
+        /* In forked mode, child processes store the fd of the IPC socket here. */
         int listen_socket;
         gint listen_watch_source_id;

irc.c

@@ -874 +874 @@
                 irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
         }
+        else if( g_strcasecmp( cmd[0], "DIE" ) == 0 )
+        {
+                printf( "%d %d\n", global.listen_socket, write( global.listen_socket, "DIE\r\n", 5 ) );
+        }
         else if( set_getint( irc, "debug" ) )
         {