Changes in ipc.c [8a56e52:87de505]

File:

• ipc.c (modified) (9 diffs)

ipc.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -28 +28 @@
 #include "ipc.h"
 #include "commands.h"
-#ifndef _WIN32
-#include <sys/un.h>
-#endif
 
 GSList *child_list = NULL;
-static char *statefile = NULL;
+
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -39 +36 @@
         struct bitlbee_child *child = (void*) data;
         
-        if( child && cmd[1] )
+        if( child )
         {
                 child->host = g_strdup( cmd[1] );
@@ -46 +43 @@
         }
         
-        if( g_strcasecmp( cmd[0], "CLIENT" ) == 0 )
-                ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
-                                     child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
+        ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
+                             child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
 }
 
@@ -78 +74 @@
 }
 
-void ipc_master_cmd_restart( irc_t *data, char **cmd )
-{
-        struct bitlbee_child *child = (void*) data;
-        
-        if( global.conf->runmode != RUNMODE_FORKDAEMON )
-        {
-                /* Tell child that this is unsupported. */
-                return;
-        }
-        
-        global.restart = -1;
-        bitlbee_shutdown( NULL );
-}
-
 static const command_t ipc_master_commands[] = {
         { "client",     3, ipc_master_cmd_client,     0 },
-        { "hello",      0, ipc_master_cmd_client,     0 },
         { "die",        0, ipc_master_cmd_die,        0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
@@ -101 +82 @@
         { "rehash",     0, ipc_master_cmd_rehash,     0 },
         { "kill",       2, NULL,                      IPC_CMD_TO_CHILDREN },
-        { "restart",    0, ipc_master_cmd_restart,    0 },
         { NULL }
 };
@@ -160 +140 @@
         irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->mynick, irc->mynick, irc->myhost, irc->nick, cmd[2] );
         irc_abort( irc, 0, "Killed by operator: %s", cmd[2] );
-}
-
-static void ipc_child_cmd_hello( irc_t *irc, char **cmd )
-{
-        if( irc->status < USTATUS_LOGGED_IN )
-                ipc_to_master_str( "HELLO\r\n" );
-        else
-                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
 }
 
@@ -177 +149 @@
         { "rehash",     0, ipc_child_cmd_rehash,      0 },
         { "kill",       2, ipc_child_cmd_kill,        0 },
-        { "hello",      0, ipc_child_cmd_hello,       0 },
         { NULL }
 };
@@ -414 +385 @@
         child_list = NULL;
 }
-
-char *ipc_master_save_state()
-{
-        char *fn = g_strdup( "/tmp/bee-restart.XXXXXX" );
-        int fd = mkstemp( fn );
-        GSList *l;
-        FILE *fp;
-        int i;
-        
-        if( fd == -1 )
-        {
-                log_message( LOGLVL_ERROR, "Could not create temporary file: %s", strerror( errno ) );
-                g_free( fn );
-                return NULL;
-        }
-        
-        /* This is more convenient now. */
-        fp = fdopen( fd, "w" );
-        
-        for( l = child_list, i = 0; l; l = l->next )
-                i ++;
-        
-        /* Number of client processes. */
-        fprintf( fp, "%d\n", i );
-        
-        for( l = child_list; l; l = l->next )
-                fprintf( fp, "%d %d\n", ((struct bitlbee_child*)l->data)->pid,
-                                        ((struct bitlbee_child*)l->data)->ipc_fd );
-        
-        if( fclose( fp ) == 0 )
-        {
-                return fn;
-        }
-        else
-        {
-                unlink( fn );
-                g_free( fn );
-                return NULL;
-        }
-}
-
-void ipc_master_set_statefile( char *fn )
-{
-        statefile = g_strdup( fn );
-}
-
-
-static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
-{
-        struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
-        int serversock;
-
-        serversock = g_io_channel_unix_get_fd(gio);
-
-        child->ipc_fd = accept(serversock, NULL, 0);
-
-        if (child->ipc_fd == -1) {
-                log_message( LOGLVL_WARNING, "Unable to accept connection on UNIX domain socket: %s", strerror(errno) );
-                return TRUE;
-        }
-                
-        child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
-                
-        child_list = g_slist_append( child_list, child );
-
-        return TRUE;
-}
-
-#ifndef _WIN32
-int ipc_master_listen_socket()
-{
-        struct sockaddr_un un_addr;
-        int serversock;
-        GIOChannel *gio;
-
-        /* Clean up old socket files that were hanging around.. */
-        if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {
-                log_message( LOGLVL_ERROR, "Could not remove old IPC socket at %s: %s", IPCSOCKET, strerror(errno) );
-                return 0;
-        }
-
-        un_addr.sun_family = AF_UNIX;
-        strcpy(un_addr.sun_path, IPCSOCKET);
-
-        serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
-
-        if (serversock == -1) {
-                log_message( LOGLVL_WARNING, "Unable to create UNIX socket: %s", strerror(errno) );
-                return 0;
-        }
-
-        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
-                log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
-                return 0;
-        }
-
-        if (listen(serversock, 5) == -1) {
-                log_message( LOGLVL_WARNING, "Unable to listen on UNIX socket: %s", strerror(errno) );
-                return 0;
-        }
-        
-        gio = g_io_channel_unix_new(serversock);
-        
-        if (gio == NULL) {
-                log_message( LOGLVL_WARNING, "Unable to create IO channel for unix socket" );
-                return 0;
-        }
-
-        g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
-        return 1;
-}
-#else
-        /* FIXME: Open named pipe \\.\BITLBEE */
-#endif
-
-int ipc_master_load_state()
-{
-        struct bitlbee_child *child;
-        FILE *fp;
-        int i, n;
-        
-        if( statefile == NULL )
-                return 0;
-        fp = fopen( statefile, "r" );
-        unlink( statefile );    /* Why do it later? :-) */
-        if( fp == NULL )
-                return 0;
-        
-        if( fscanf( fp, "%d", &n ) != 1 )
-        {
-                log_message( LOGLVL_WARNING, "Could not import state information for child processes." );
-                fclose( fp );
-                return 0;
-        }
-        
-        log_message( LOGLVL_INFO, "Importing information for %d child processes.", n );
-        for( i = 0; i < n; i ++ )
-        {
-                child = g_new0( struct bitlbee_child, 1 );
-                
-                if( fscanf( fp, "%d %d", &child->pid, &child->ipc_fd ) != 2 )
-                {
-                        log_message( LOGLVL_WARNING, "Unexpected end of file: Only processed %d clients.", i );
-                        g_free( child );
-                        fclose( fp );
-                        return 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 );
-        }
-        
-        ipc_to_children_str( "HELLO\r\n" );
-        ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
-        
-        return 1;
-}