Changeset 74c119d

Timestamp:

2006-01-15T15:42:20Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6fda350

Parents:

13caf0a

Message:

Better DIE implementation, added SO_REUSEADDR to listening socket.

Files:

• bitlbee.c (modified) (1 diff)
• conf.c (modified) (2 diffs)
• ipc.c (modified) (5 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)

bitlbee.c

@@ -56 +56 @@
         }
         
+        /* TIME_WAIT (?) sucks.. */
+        i = 1;
+        setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
+        
 #ifdef IPV6
         listen_addr.sin6_family = AF_INETx;

conf.c

@@ -92 +92 @@
                 }
                 else if( opt == 'n' )
-                        conf->nofork=1;
+                        conf->nofork = 1;
                 else if( opt == 'v' )
-                        conf->verbose=1;
+                        conf->verbose = 1;
                 else if( opt == 'I' )
-                        conf->runmode=RUNMODE_INETD;
+                        conf->runmode = RUNMODE_INETD;
                 else if( opt == 'D' )
-                        conf->runmode=RUNMODE_DAEMON;
+                        conf->runmode = RUNMODE_DAEMON;
                 else if( opt == 'F' )
-                        conf->runmode=RUNMODE_FORKDAEMON;
+                        conf->runmode = RUNMODE_FORKDAEMON;
                 else if( opt == 'c' )
                 {
@@ -108 +108 @@
                                 CONF_FILE = g_strdup( optarg );
                                 g_free( conf );
+                                /* Re-evaluate arguments. */
+                                optind = 1;
                                 return( conf_load( argc, argv ) );
                         }

ipc.c

@@ -31 +31 @@
 GSList *child_list = NULL;
 
+
 static int ipc_master_cmd_die( irc_t *data, char **cmd )
 {
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+                ipc_to_children_str( "DIE\r\n" );
+        
         bitlbee_shutdown( NULL );
+        
+        return 1;
 }
 
 static int ipc_master_cmd_wallops( irc_t *data, char **cmd )
 {
-        GSList *l;
-        char msg_buf[513];
-        int msg_len;
-        
-        if( ( msg_len = g_snprintf( msg_buf, sizeof( msg_buf ) - 1, "%s :%s\r\n", cmd[0], cmd[1] ) ) > ( sizeof( msg_buf ) - 1 ) )
-                return 0;
-        
-        for( l = child_list; l; l = l->next )
-        {
-                struct bitlbee_child *c = l->data;
-                write( c->ipc_fd, msg_buf, msg_len );
-        }
+        ipc_to_children( cmd );
         
         return 1;
@@ -56 +51 @@
 static const command_t ipc_master_commands[] = {
         { "die",        0, ipc_master_cmd_die,        0 },
-        { "wallops",    1, ipc_master_cmd_wallops,    1 },
-        { "lilo",       1, ipc_master_cmd_wallops,    1 },
+        { "wallops",    1, ipc_master_cmd_wallops,    0 },
+        { "lilo",       1, ipc_master_cmd_wallops,    0 },
         { NULL }
 };
 
+
+static int ipc_child_cmd_die( irc_t *data, char **cmd )
+{
+        bitlbee_shutdown( NULL );
+        
+        return 1;
+}
+
 static int ipc_child_cmd_wallops( irc_t *data, char **cmd )
 {
@@ -75 +78 @@
         irc_t *irc = data;
         
-        irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
+        if( strchr( irc->umode, 's' ) )
+                irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
         
         return 1;
@@ -81 +85 @@
 
 static const command_t ipc_child_commands[] = {
-        { "wallops",    1, ipc_child_cmd_wallops,     1 },
-        { "lilo",       1, ipc_child_cmd_lilo,        1 },
+        { "die",        0, ipc_child_cmd_die,         0 },
+        { "wallops",    1, ipc_child_cmd_wallops,     0 },
+        { "lilo",       1, ipc_child_cmd_lilo,        0 },
         { NULL }
 };
+
 
 static void ipc_command_exec( void *data, char **cmd, const command_t *commands )
@@ -191 +197 @@
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
-                int i, len;
-                char *s;
+                char *s = irc_build_line( cmd );
+                write( global.listen_socket, s, strlen( s ) );
+                g_free( s );
+        }
+}
+
+void ipc_to_children( char **cmd )
+{
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        {
+                char *msg_buf = irc_build_line( cmd );
+                ipc_to_children_str( msg_buf );
+                g_free( msg_buf );
+        }
+}
+
+void ipc_to_children_str( char *msg_buf )
+{
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        {
+                int msg_len = strlen( msg_buf );
+                GSList *l;
                 
-                len = 1;
-                for( i = 0; cmd[i]; i ++ )
-                        len += strlen( cmd[i] ) + 1;
-                
-                if( strchr( cmd[i-1], ' ' ) != NULL )
-                        len ++;
-                
-                s = g_new0( char, len + 1 );
-                for( i = 0; cmd[i]; i ++ )
+                for( l = child_list; l; l = l->next )
                 {
-                        if( cmd[i+1] == NULL && strchr( cmd[i], ' ' ) != NULL )
-                                strcat( s, ":" );
-                        
-                        strcat( s, cmd[i] );
-                        
-                        if( cmd[i+1] )
-                                strcat( s, " " );
+                        struct bitlbee_child *c = l->data;
+                        write( c->ipc_fd, msg_buf, msg_len );
                 }
-                strcat( s, "\r\n" );
-                
-                write( global.listen_socket, s, len );
-        }
-}
+        }
+}

ipc.h

@@ -30 +30 @@
 void ipc_child_read( gpointer data, gint source, GaimInputCondition cond );
 void ipc_to_master( char **cmd );
+void ipc_to_children( char **cmd );
+void ipc_to_children_str( char *msg_buf );
 
 struct bitlbee_child

irc.c

@@ -432 +432 @@
         
         return cmd;
+}
+
+char *irc_build_line( char **cmd )
+{
+        int i, len;
+        char *s;
+        
+        if( cmd[0] == NULL )
+                return NULL;
+        
+        len = 1;
+        for( i = 0; cmd[i]; i ++ )
+                len += strlen( cmd[i] ) + 1;
+        
+        if( strchr( cmd[i-1], ' ' ) != NULL )
+                len ++;
+        
+        s = g_new0( char, len + 1 );
+        for( i = 0; cmd[i]; i ++ )
+        {
+                if( cmd[i+1] == NULL && strchr( cmd[i], ' ' ) != NULL )
+                        strcat( s, ":" );
+                
+                strcat( s, cmd[i] );
+                
+                if( cmd[i+1] )
+                        strcat( s, " " );
+        }
+        strcat( s, "\r\n" );
+        
+        return s;
 }
 

irc.h

@@ -109 +109 @@
 int irc_process( irc_t *irc );
 char **irc_parse_line( char *line );
+char *irc_build_line( char **cmd );
 
 void irc_vawrite( irc_t *irc, char *format, va_list params );