Changeset 565a1ea

Timestamp:

2008-06-29T09:35:41Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1145964

Parents:

e0f9170

Message:

Added the DEAF command, which makes the daemon stop listening for new
connections. This makes it easier to upgrade a BitlBee without having
to disconnect all current users immediately. Closes #428.

Files:

• ipc.c (modified) (2 diffs)
• irc.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)

ipc.c

@@ -63 +63 @@
 }
 
+static void ipc_master_cmd_deaf( irc_t *data, char **cmd )
+{
+        if( global.conf->runmode == RUNMODE_DAEMON )
+        {
+                b_event_remove( global.listen_watch_source_id );
+                close( global.listen_socket );
+                
+                global.listen_socket = global.listen_watch_source_id = -1;
+        
+                ipc_to_children_str( "OPERMSG :Closed listening socket, waiting "
+                                     "for all users to disconnect." );
+        }
+        else
+        {
+                ipc_to_children_str( "OPERMSG :The DEAF command only works in "
+                                     "normal daemon mode. Try DIE instead." );
+        }
+}
+
 void ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
@@ -98 +117 @@
         { "hello",      0, ipc_master_cmd_client,     0 },
         { "die",        0, ipc_master_cmd_die,        0 },
+        { "deaf",       0, ipc_master_cmd_deaf,       0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "wall",       1, NULL,                      IPC_CMD_TO_CHILDREN },

irc.c

@@ -314 +314 @@
         g_free( irc );
         
-        if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
+        if( global.conf->runmode == RUNMODE_INETD ||
+            global.conf->runmode == RUNMODE_FORKDAEMON ||
+            ( global.conf->runmode == RUNMODE_DAEMON &&
+              global.listen_socket == -1 &&
+              irc_connection_list == NULL ) )
                 b_main_quit();
 }

irc_commands.c

@@ -626 +626 @@
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+        { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wall",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },