Changeset 5424c76

Timestamp:

2006-01-19T17:52:19Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b8c2ace

Parents:

bd9b00f

Message:

Rehash command now also works in inetd mode. Other "IPC" commands only make
sense in daemon mode.

Files:

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

ipc.c

@@ -59 +59 @@
 }
 
-static int ipc_master_cmd_rehash( irc_t *data, char **cmd )
+int ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
         runmode_t oldmode;

ipc.h

@@ -27 +27 @@
 #include "bitlbee.h"
 
+
 struct bitlbee_child
 {
@@ -37 +38 @@
         char *realname;
 };
+
 
 void ipc_master_read( gpointer data, gint source, GaimInputCondition cond );
@@ -49 +51 @@
 void ipc_to_children_str( char *format, ... );
 
+/* We need this function in inetd mode, so let's just make it non-static. */
+int ipc_master_cmd_rehash( irc_t *data, char **cmd );
+
+
 extern GSList *child_list;

irc_commands.c

@@ -580 +580 @@
 static int irc_cmd_rehash( irc_t *irc, char **cmd )
 {
-        ipc_to_master( cmd );
+        if( global.conf->runmode == RUNMODE_INETD )
+                ipc_master_cmd_rehash( NULL, NULL );
+        else
+                ipc_to_master( cmd );
         
         irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
@@ -656 +659 @@
                         
                         if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+                                /* IPC doesn't make sense in inetd mode,
+                                    but the function will catch that. */
                                 ipc_to_master( cmd );
                         else