Changes in ipc.c [cd63d58:3ddb7477]

File:

• ipc.c (modified) (8 diffs)

ipc.c

@@ -138 +138 @@
         
         if( strchr( irc->umode, 'w' ) )
-                irc_write( irc, ":%s WALLOPS :%s", irc->myhost, cmd[1] );
+                irc_write( irc, ":%s WALLOPS :%s", irc->root->host, cmd[1] );
 }
 
@@ -147 +147 @@
         
         if( strchr( irc->umode, 's' ) )
-                irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :%s", irc->root->host, irc->user->nick, cmd[1] );
 }
 
@@ -156 +156 @@
         
         if( strchr( irc->umode, 'o' ) )
-                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->myhost, irc->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->root->host, irc->user->nick, cmd[1] );
 }
 
@@ -176 +176 @@
                 return;
         
-        if( nick_cmp( cmd[1], irc->nick ) != 0 )
+        if( nick_cmp( cmd[1], irc->user->nick ) != 0 )
                 return;         /* It's not for us. */
         
-        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->mynick, irc->mynick, irc->myhost, irc->nick, cmd[2] );
+        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->root->nick, irc->root->nick, irc->root->host, irc->user->nick, cmd[2] );
         irc_abort( irc, 0, "Killed by operator: %s", cmd[2] );
 }
@@ -188 +188 @@
                 ipc_to_master_str( "HELLO\r\n" );
         else
-                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
+                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
 }
 
@@ -460 +460 @@
 }
 
+#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -520 +521 @@
 }
 
-#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -557 +557 @@
 }
 #else
+int ipc_master_listen_socket()
+{
         /* FIXME: Open named pipe \\.\BITLBEE */
+        return 0;
+}
 #endif