Changeset bd9b00f

Timestamp:

2006-01-19T17:07:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5424c76

Parents:

2face62

Message:

Fixes for single-process daemon mode, changed value of USTATUS_SHUTDOWN. If
this still causes problems, shutting down should be an extra flag instead of
a status code.

Files:

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

ipc.c

@@ -36 +36 @@
         struct bitlbee_child *child = (void*) data;
         
-        child->host = g_strdup( cmd[1] );
-        child->nick = g_strdup( cmd[2] );
-        child->realname = g_strdup( cmd[3] );
+        if( child )
+        {
+                child->host = g_strdup( cmd[1] );
+                child->nick = g_strdup( cmd[2] );
+                child->realname = g_strdup( cmd[3] );
+        }
         
         ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
-                             child->pid, child->nick, child->host, child->realname );
+                             child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
         
         return 1;
@@ -308 +311 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
-                char **cmd;
+                char **cmd, *s;
+                
+                if( ( s = strchr( msg_buf, '\r' ) ) )
+                        *s = 0;
                 
                 cmd = irc_parse_line( msg_buf );
@@ -361 +367 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
-                char **cmd;
+                char **cmd, *s;
+                
+                if( ( s = strchr( msg_buf, '\r' ) ) )
+                        *s = 0;
                 
                 cmd = irc_parse_line( msg_buf );

irc.c

@@ -188 +188 @@
                         irc_usermsg( irc, "Error while saving settings!" );
         
+        closesocket( irc->fd );
+        
         if( irc->ping_source_id > 0 )
                 g_source_remove( irc->ping_source_id );
@@ -694 +696 @@
         irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." );
         
-        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
                 ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
         

irc.h

@@ -41 +41 @@
 typedef enum
 {
-        USTATUS_OFFLINE,
+        USTATUS_OFFLINE = 0,
         USTATUS_AUTHORIZED,
         USTATUS_LOGGED_IN,
         USTATUS_IDENTIFIED,
-        USTATUS_SHUTDOWN
+        USTATUS_SHUTDOWN = -1
 } irc_status_t;