Changes in ipc.c [ba9edaa:dd89a55]

File:

• ipc.c (modified) (12 diffs)

ipc.c

@@ -60 +60 @@
                 ipc_to_children_str( "DIE\r\n" );
         
-        bitlbee_shutdown( NULL, -1, 0 );
+        bitlbee_shutdown( NULL );
 }
 
@@ -91 +91 @@
         
         global.restart = -1;
-        bitlbee_shutdown( NULL, -1, 0 );
+        bitlbee_shutdown( NULL );
 }
 
@@ -246 +246 @@
 }
 
-gboolean ipc_master_read( gpointer data, gint source, b_input_condition cond )
+void ipc_master_read( gpointer data, gint source, GaimInputCondition cond )
 {
         char *buf, **cmd;
@@ -272 +272 @@
                 }
         }
-        
-        return TRUE;
-}
-
-gboolean ipc_child_read( gpointer data, gint source, b_input_condition cond )
+}
+
+void ipc_child_read( gpointer data, gint source, GaimInputCondition cond )
 {
         char *buf, **cmd;
@@ -288 +286 @@
         else
         {
-                b_event_remove( global.listen_watch_source_id );
+                gaim_input_remove( global.listen_watch_source_id );
                 close( global.listen_socket );
                 
                 global.listen_socket = -1;
         }
-        
-        return TRUE;
 }
 
@@ -401 +397 @@
 void ipc_master_free_one( struct bitlbee_child *c )
 {
-        b_event_remove( c->ipc_inpa );
+        gaim_input_remove( c->ipc_inpa );
         closesocket( c->ipc_fd );
         
@@ -467 +463 @@
 
 
-static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
+static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
 {
         struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
-        
-        child->ipc_fd = accept( serversock, NULL, 0 );
-        
-        if( child->ipc_fd == -1 )
-        {
+        int serversock;
+
+        serversock = g_io_channel_unix_get_fd(gio);
+
+        child->ipc_fd = accept(serversock, NULL, 0);
+
+        if (child->ipc_fd == -1) {
                 log_message( LOGLVL_WARNING, "Unable to accept connection on UNIX domain socket: %s", strerror(errno) );
                 return TRUE;
         }
                 
-        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
-        
+        child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                
         child_list = g_slist_append( child_list, child );
-        
+
         return TRUE;
 }
@@ -491 +489 @@
         struct sockaddr_un un_addr;
         int serversock;
+        GIOChannel *gio;
 
         /* Clean up old socket files that were hanging around.. */
@@ -508 +507 @@
         }
 
-        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
+        if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) {
                 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
                 return 0;
@@ -518 +517 @@
         }
         
-        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
-        
+        gio = g_io_channel_unix_new(serversock);
+        
+        if (gio == NULL) {
+                log_message( LOGLVL_WARNING, "Unable to create IO channel for unix socket" );
+                return 0;
+        }
+
+        g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
         return 1;
 }
@@ -558 +563 @@
                         return 0;
                 }
-                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );
@@ -566 +571 @@
         ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
         
+        fclose( fp );
         return 1;
 }