Changeset b72caac for ipc.c

Timestamp:

2006-06-21T16:34:33Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

59f5c42a

Parents:

3af70b0 (diff), df417ca (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:

Merging libevent branch: Events can now be handles by both glib and libevent.

File:

• ipc.c (modified) (10 diffs)

ipc.c

@@ -60 +60 @@
                 ipc_to_children_str( "DIE\r\n" );
         
-        bitlbee_shutdown( NULL );
+        bitlbee_shutdown( NULL, -1, 0 );
 }
 
@@ -91 +91 @@
         
         global.restart = -1;
-        bitlbee_shutdown( NULL );
+        bitlbee_shutdown( NULL, -1, 0 );
 }
 
@@ -246 +246 @@
 }
 
-void ipc_master_read( gpointer data, gint source, GaimInputCondition cond )
+gboolean ipc_master_read( gpointer data, gint source, b_input_condition cond )
 {
         char *buf, **cmd;
@@ -272 +272 @@
                 }
         }
-}
-
-void ipc_child_read( gpointer data, gint source, GaimInputCondition cond )
+        
+        return TRUE;
+}
+
+gboolean ipc_child_read( gpointer data, gint source, b_input_condition cond )
 {
         char *buf, **cmd;
@@ -286 +288 @@
         else
         {
-                gaim_input_remove( global.listen_watch_source_id );
+                b_event_remove( global.listen_watch_source_id );
                 close( global.listen_socket );
                 
                 global.listen_socket = -1;
         }
+        
+        return TRUE;
 }
 
@@ -397 +401 @@
 void ipc_master_free_one( struct bitlbee_child *c )
 {
-        gaim_input_remove( c->ipc_inpa );
+        b_event_remove( c->ipc_inpa );
         closesocket( c->ipc_fd );
         
@@ -463 +467 @@
 
 
-static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
+static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
 {
         struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
-        int serversock;
-
-        serversock = g_io_channel_unix_get_fd(gio);
-
-        child->ipc_fd = accept(serversock, NULL, 0);
-
-        if (child->ipc_fd == -1) {
+        
+        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 = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
-                
+        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+        
         child_list = g_slist_append( child_list, child );
-
+        
         return TRUE;
 }
@@ -489 +491 @@
         struct sockaddr_un un_addr;
         int serversock;
-        GIOChannel *gio;
 
         /* Clean up old socket files that were hanging around.. */
@@ -517 +518 @@
         }
         
-        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);
+        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        
         return 1;
 }
@@ -563 +558 @@
                         return 0;
                 }
-                child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );