Changeset 8661caa for ipc.c

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (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:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• ipc.c (modified) (13 diffs)

ipc.c

@@ -33 +33 @@
 
 GSList *child_list = NULL;
-static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -63 +62 @@
 }
 
+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 +116 @@
         { "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 },
@@ -209 +228 @@
 }
 
+/* Return just one line. Returns NULL if something broke, an empty string
+   on temporary "errors" (EAGAIN and friends). */
 static char *ipc_readline( int fd )
 {
-        char *buf, *eol;
+        char buf[513], *eol;
         int size;
-        
-        buf = g_new0( char, 513 );
         
         /* Because this is internal communication, it should be pretty safe
@@ -221 +240 @@
            sockets and limites message length, messages should always be
            complete. Saves us quite a lot of code and buffering. */
-        size = recv( fd, buf, 512, MSG_PEEK );
+        size = recv( fd, buf, sizeof( buf ) - 1, MSG_PEEK );
         if( size == 0 || ( size < 0 && !sockerr_again() ) )
                 return NULL;
@@ -229 +248 @@
                 buf[size] = 0;
         
-        eol = strstr( buf, "\r\n" );
-        if( eol == NULL )
+        if( ( eol = strstr( buf, "\r\n" ) ) == NULL )
                 return NULL;
         else
                 size = eol - buf + 2;
-        
-        g_free( buf );
-        buf = g_new0( char, size + 1 );
         
         if( recv( fd, buf, size, 0 ) != size )
                 return NULL;
         else
-                buf[size-2] = 0;
-        
-        return buf;
+                return g_strndup( buf, size - 2 );
 }
 
@@ -254 +267 @@
                 cmd = irc_parse_line( buf );
                 if( cmd )
+                {
                         ipc_command_exec( data, cmd, ipc_master_commands );
+                        g_free( cmd );
+                }
+                g_free( buf );
         }
         else
@@ -272 +289 @@
                 cmd = irc_parse_line( buf );
                 if( cmd )
+                {
                         ipc_command_exec( data, cmd, ipc_child_commands );
+                        g_free( cmd );
+                }
+                g_free( buf );
         }
         else
@@ -439 +460 @@
 }
 
+#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -479 +501 @@
 }
 
-void ipc_master_set_statefile( char *fn )
-{
-        statefile = g_strdup( fn );
-}
-
 
 static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
@@ -504 +521 @@
 }
 
-#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -541 +557 @@
 }
 #else
+int ipc_master_listen_socket()
+{
         /* FIXME: Open named pipe \\.\BITLBEE */
+        return 0;
+}
 #endif
 
-int ipc_master_load_state()
+int ipc_master_load_state( char *statefile )
 {
         struct bitlbee_child *child;
@@ -552 +572 @@
         if( statefile == NULL )
                 return 0;
+        
         fp = fopen( statefile, "r" );
         unlink( statefile );    /* Why do it later? :-) */