Changeset ec3e411

Timestamp:

2006-02-12T07:20:49Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

58bc4e6

Parents:

9fae35c (diff), 1d2e3c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

Files:

• bitlbee.c (modified) (3 diffs)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (6 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (5 diffs)
• ipc.c (modified) (9 diffs)
• ipc.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)
• unix.c (modified) (4 diffs)

bitlbee.c

@@ -45 +45 @@
         int i;
         GIOChannel *ch;
+        FILE *fp;
         
         log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
@@ -104 +105 @@
                 else if( i != 0 ) 
                         exit( 0 );
-                close( 0 );
-                close( 1 );
-                close( 2 );
+                
                 chdir( "/" );
+                
+                /* Sometimes std* are already closed (for example when we're in a RESTARTed
+                   BitlBee process. So let's only close TTY-fds. */
+                if( isatty( 0 ) ) close( 0 );
+                if( isatty( 0 ) ) close( 1 );
+                if( isatty( 0 ) ) close( 2 );
         }
 #endif
+        
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+                ipc_master_load_state();
+        
+        if( ( fp = fopen( global.conf->pidfile, "w" ) ) )
+        {
+                fprintf( fp, "%d\n", (int) getpid() );
+                fclose( fp );
+        }
+        else
+        {
+                log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile );
+        }
         
         return( 0 );
@@ -235 +253 @@
         int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
         pid_t client_pid = 0;
+        
+        if( new_socket == -1 )
+        {
+                log_message( LOGLVL_WARNING, "Could not accept new connection: %s", strerror( errno ) );
+                return TRUE;
+        }
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON )

bitlbee.h

@@ -121 +121 @@
         char *helpfile;
         GMainLoop *loop;
+        int restart;
 } global_t;
 

conf.c

@@ -32 +32 @@
 #include "ini.h"
 #include "url.h"
+#include "ipc.h"
 
 #include "protocols/proxy.h"
@@ -61 +62 @@
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
+        conf->pidfile = g_strdup( "/var/run/bitlbee.pid" );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;
@@ -77 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -92 +94 @@
                         }
                         conf->port = i;
+                }
+                else if( opt == 'p' )
+                {
+                        g_free( conf->pidfile );
+                        conf->pidfile = g_strdup( optarg );
                 }
                 else if( opt == 'n' )
@@ -142 +149 @@
                         return( NULL );
                 }
+                else if( opt == 'R' )
+                {
+                        /* We can't load the statefile yet (and should make very sure we do this
+                           only once), so set the filename here and load the state information
+                           when initializing ForkDaemon. (This option only makes sense in that
+                           mode anyway!) */
+                        ipc_master_set_statefile( optarg );
+                }
         }
         
@@ -175 +190 @@
                                 else
                                         conf->runmode = RUNMODE_INETD;
+                        }
+                        else if( g_strcasecmp( ini->key, "pidfile" ) == 0 )
+                        {
+                                g_free( conf->pidfile );
+                                conf->pidfile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )

conf.h

@@ -43 +43 @@
         char *configdir;
         char *plugindir;
+        char *pidfile;
         char *motdfile;
         char *primary_storage;

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+pidfile='/var/run/bitlbee.pid'
 plugindir='$prefix/lib/bitlbee'
 
@@ -46 +47 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--pidfile=...                                           $pidfile
 --config=...                                            $config
 
@@ -74 +76 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -83 +86 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+PIDFILE=$pidfile
 CONFIG=$config
 
@@ -104 +108 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
+#define PIDFILE "$pidfile"
 #define ARCH "$arch"
 #define CPU "$cpu"

ipc.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -30 +30 @@
 
 GSList *child_list = NULL;
-
+static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -36 +36 @@
         struct bitlbee_child *child = (void*) data;
         
-        if( child )
+        if( child && cmd[1] )
         {
                 child->host = g_strdup( cmd[1] );
@@ -43 +43 @@
         }
         
-        ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
-                             child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
+        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] );
 }
 
@@ -74 +75 @@
 }
 
+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 },
@@ -82 +98 @@
         { "rehash",     0, ipc_master_cmd_rehash,     0 },
         { "kill",       2, NULL,                      IPC_CMD_TO_CHILDREN },
+        { "restart",    0, ipc_master_cmd_restart,    0 },
         { NULL }
 };
@@ -140 +157 @@
         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 );
 }
 
@@ -149 +174 @@
         { "rehash",     0, ipc_child_cmd_rehash,      0 },
         { "kill",       2, ipc_child_cmd_kill,        0 },
+        { "hello",      0, ipc_child_cmd_hello,       0 },
         { NULL }
 };
@@ -385 +411 @@
         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 );
+}
+
+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;
+}

ipc.h

@@ -54 +54 @@
 void ipc_master_cmd_rehash( irc_t *data, char **cmd );
 
+char *ipc_master_save_state();
+void ipc_master_set_statefile( char *fn );
+int ipc_master_load_state();
+
 
 extern GSList *child_list;

irc_commands.c

@@ -573 +573 @@
         { "lilo",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "rehash",      0, irc_cmd_rehash,      IRC_CMD_OPER_ONLY },
+        { "restart",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "kill",        2, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { NULL }

protocols/msn/msn.c

@@ -84 +84 @@
                 {
                         m = l->data;
+                
+                        serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
                         g_free( m->who );
                         g_free( m->text );
@@ -89 +91 @@
                 }
                 g_slist_free( md->msgq );
-                
-                serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message(s), you'll have to resend them." );
         }
         

protocols/msn/sb.c

@@ -213 +213 @@
                 {
                         m = l->data;
+
                         g_free( m->who );
                         g_free( m->text );
@@ -219 +220 @@
                 g_slist_free( sb->msgq );
                 
-                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with unsent message(s), you'll have to resend them." );
+                serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
+                                   "unsent message to %s, you'll have to resend it.",
+                                   m->who ? m->who : "(unknown)" );
         }
         

root_commands.c

@@ -601 +601 @@
         {
                 set_setstr( irc, cmd[1], cmd[2] );
+                
+                if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
+                        irc_usermsg( irc, "Warning: Correct syntax: \002set <variable> <value>\002 (without =)" );
         }
         if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */

unix.c

@@ -29 +29 @@
 #include "protocols/nogaim.h"
 #include "help.h"
+#include "ipc.h"
 #include <signal.h>
 #include <unistd.h>
@@ -38 +39 @@
 static void sighandler( int signal );
 
-int main( int argc, char *argv[] )
+int main( int argc, char *argv[], char **envp )
 {
         int i = 0;
+        char *old_cwd;
         struct sigaction sig, old;
         
@@ -73 +75 @@
         else if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
+                /* In case the operator requests a restart, we need this. */
+                old_cwd = g_malloc( 256 );
+                if( getcwd( old_cwd, 255 ) == NULL )
+                {
+                        log_message( LOGLVL_WARNING, "Could not save current directory: %s", strerror( errno ) );
+                        g_free( old_cwd );
+                        old_cwd = NULL;
+                }
+                
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
@@ -108 +119 @@
         g_main_run( global.loop );
         
+        if( global.restart )
+        {
+                char *fn = ipc_master_save_state();
+                char **args;
+                int n, i;
+                
+                chdir( old_cwd );
+                
+                n = 0;
+                args = g_new0( char *, argc + 3 );
+                args[n++] = argv[0];
+                if( fn )
+                {
+                        args[n++] = "-R";
+                        args[n++] = fn;
+                }
+                for( i = 1; argv[i] && i < argc; i ++ )
+                {
+                        if( strcmp( argv[i], "-R" ) == 0 )
+                                i += 2;
+                        
+                        args[n++] = argv[i];
+                }
+                
+                close( global.listen_socket );
+                
+                execve( args[0], args, envp );
+        }
+        
         return( 0 );
 }