Changes in / [de3e100:0431ea1]

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (2 diffs)
• bitlbee.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• ipc.c (added)
• ipc.h (added)
• irc.c (modified) (3 diffs)
• irc.h (modified) (2 diffs)
• irc_commands.c (modified) (3 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o irc_commands.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o util.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o util.o
 subdirs = protocols
 

bitlbee.c

@@ -29 +29 @@
 #include "protocols/nogaim.h"
 #include "help.h"
+#include "ipc.h"
 #include <signal.h>
 #include <stdio.h>
 #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;
-}
- 
-
+gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data );
 
 int bitlbee_daemon_init()
@@ -258 +224 @@
 }
 
+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, ipc_master_read, child );
+                        child_list = g_slist_append( child_list, child );
+                        
+                        log_message( LOGLVL_INFO, "Creating new subprocess with pid %d.", client_pid );
+                        
+                        /* Close some things we don't need in the parent process. */
+                        close( new_socket );
+                        close( fds[1] );
+                }
+                else if( client_pid == 0 )
+                {
+                        irc_t *irc;
+                        
+                        /* Close the listening socket, we're a client. */
+                        close( global.listen_socket );
+                        g_source_remove( global.listen_watch_source_id );
+                        
+                        /* Make the connection. */
+                        irc = irc_new( new_socket );
+                        
+                        /* 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, ipc_child_read, irc );
+                        
+                        close( fds[0] );
+                }
+        }
+        else
+        {
+                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
+                irc_new( new_socket );
+        }
+        
+        return TRUE;
+}
+
 void bitlbee_shutdown( gpointer data )
 {

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;

commands.h

@@ -42 +42 @@
 #define IRC_CMD_LOGGED_IN       2
 #define IRC_CMD_OPER_ONLY       4
+#define IRC_CMD_TO_MASTER       8
 
 #endif

irc.c

@@ -311 +311 @@
                         }                       
                         
-                        if( ( cmd = irc_parse_line( irc, lines[i] ) ) == NULL )
+                        if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
                                 continue;
                         if( !irc_exec( irc, cmd ) )
@@ -326 +326 @@
                 {
                         g_free( irc->readbuffer );
-                        irc->readbuffer = NULL; 
+                        irc->readbuffer = NULL;
                 }
                 
@@ -375 +375 @@
 }
 
-char **irc_parse_line( irc_t *irc, char *line )
+char **irc_parse_line( char *line )
 {
         int i, j;

irc.h

@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "ias"
+#define UMODES "iasw"
 #define UMODES_PRIV "Ro"
 #define CMODES "nt"
@@ -108 +108 @@
 int irc_exec( irc_t *irc, char **cmd );
 int irc_process( irc_t *irc );
-char **irc_parse_line( irc_t *irc, char *line );
+char **irc_parse_line( char *line );
 
 void irc_vawrite( irc_t *irc, char *format, va_list params );

irc_commands.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "ipc.h"
 
 static int irc_cmd_pass( irc_t *irc, char **cmd )
@@ -606 +607 @@
         { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
+        { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+        { "wallop",      0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { NULL }
 };
@@ -642 +645 @@
                                 }
                         
-                        return irc_commands[i].execute( irc, cmd );
-                }
-        
-        return( 1 );
-}
+                        if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+                                ipc_to_master( cmd );
+                        else
+                                return irc_commands[i].execute( irc, cmd );
+                }
+        
+        return( 1 );
+}