Changeset f1c2b21 for ipc.c

Timestamp:

2010-07-10T15:08:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e92c4f4

Parents:

534e406

Message:

Cleanup. Move some code to a more appropriate location, and show the old
connection a quit message instead of just breaking the connection.

File:

• ipc.c (modified) (3 diffs)

ipc.c

@@ -333 +333 @@
                     strcmp( irc->password, cmd[3] ) == 0 )
                 {
-                        GSList *l;
-                        
-                        /* TODO: Move this all into irc_switch_fd() or so and
-                           irc_sync() */
-                        b_event_remove( irc->r_watch_source_id );
-                        closesocket( irc->fd );
-                        irc->fd = ipc_child_recv_fd;
-                        irc->r_watch_source_id = b_input_add( irc->fd, B_EV_IO_READ, bitlbee_io_current_client_read, irc );
+                        irc_switch_fd( irc, ipc_child_recv_fd );
+                        irc_sync( irc );
+                        irc_usermsg( irc, "You've successfully taken over your old session" );
                         ipc_child_recv_fd = -1;
-                        
-                        irc_write( irc, ":%s!%s@%s MODE %s :+%s", irc->user->nick,
-                                   irc->user->user, irc->user->host, irc->user->nick,
-                                   irc->umode );
-                        
-                        for( l = irc->channels; l; l = l->next )
-                        {
-                                irc_channel_t *ic = l->data;
-                                if( ic->flags & IRC_CHANNEL_JOINED )
-                                        irc_send_join( ic, irc->user );
-                        }
-                        irc_usermsg( irc, "You've successfully taken over your old session" );
                         
                         ipc_to_master_str( "TAKEOVER DONE\r\n" );
@@ -377 +360 @@
 {
         irc_t *irc = data;
-        GSList *l;
         
         /* Master->New connection */
@@ -392 +374 @@
         irc_umode_set( irc, "-R", 1 );
         
-        for( l = irc->channels; l; l = l->next )
-                irc_channel_del_user( l->data, irc->user, IRC_CDU_KICK,
-                                      "Switching to old session" );
-        
-        irc_write( irc, ":%s!%s@%s MODE %s :-%s", irc->user->nick,
-                   irc->user->user, irc->user->host, irc->user->nick,
-                   irc->umode );
+        irc_desync( irc );
 }