Changeset 6dff9d4

Timestamp:

2006-03-01T21:08:03Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

8a56e52

Parents:

7cf85e7

Message:

Also listen for admin connections on a unix domain socket at /var/run/bitlbee

Files:

• bitlbee.c (modified) (1 diff)
• configure (modified) (5 diffs)
• ipc.c (modified) (2 diffs)
• ipc.h (modified) (1 diff)

bitlbee.c

@@ -118 +118 @@
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
                 ipc_master_load_state();
+
+        if( global.conf->runmode == RUNMODE_DAEMON || 
+                global.conf->runmode == RUNMODE_FORKDAEMON )
+                ipc_master_listen_socket();
         
         if( ( fp = fopen( global.conf->pidfile, "w" ) ) )

configure

@@ -15 +15 @@
 config='/var/lib/bitlbee/'
 pidfile='/var/run/bitlbee.pid'
+ipcsocket='/var/run/bitlbee'
 plugindir='$prefix/lib/bitlbee'
 
@@ -49 +50 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
+--ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -76 +78 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
-pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
+pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
+ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -86 +89 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
-PIDFILE=$pidfile
 CONFIG=$config
+IPCSOCKET=$ipcsocket
 
 ARCH=$arch
@@ -109 +112 @@
 #define PLUGINDIR "$plugindir"
 #define PIDFILE "$pidfile"
+#define IPCSOCKET "$ipcsocket"
 #define ARCH "$arch"
 #define CPU "$cpu"

ipc.c

@@ -28 +28 @@
 #include "ipc.h"
 #include "commands.h"
+#ifndef _WIN32
+#include <sys/un.h>
+#endif
 
 GSList *child_list = NULL;
@@ -457 +460 @@
 }
 
+
+static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
+{
+        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);
+                
+        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;
+}
+
+#ifndef _WIN32
+int ipc_master_listen_socket()
+{
+        struct sockaddr_un un_addr;
+        int serversock;
+        GIOChannel *gio;
+
+        /* Clean up old socket files that were hanging around.. */
+        unlink(IPCSOCKET);
+
+        un_addr.sun_family = AF_UNIX;
+        strcpy(un_addr.sun_path, IPCSOCKET);
+
+        serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+
+        bind(serversock, &un_addr, sizeof(un_addr));
+
+        listen(serversock, 5);
+        
+        gio = g_io_channel_unix_new(serversock);
+
+        g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
+        return 1;
+}
+#else
+        /* FIXME: Open named pipe \\.\BITLBEE */
+#endif
+
 int ipc_master_load_state()
 {

ipc.h

@@ -57 +57 @@
 void ipc_master_set_statefile( char *fn );
 int ipc_master_load_state();
-
+int ipc_master_listen_socket();
 
 extern GSList *child_list;