Changes in / [96ace1b:f665dab]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (3 diffs)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (1 diff)
• configure (modified) (6 diffs)
• doc/example_plugin.c (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• ipc.h (modified) (1 diff)
• utils/bitlbee-ctl.pl (deleted)

.bzrignore

@@ -10 +10 @@
 decode
 encode
-bitlbee.pc

Makefile

@@ -11 +11 @@
 # Program variables
 objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
 subdirs = protocols
 
@@ -23 +22 @@
         $(MAKE) -C doc
 
-uninstall: uninstall-bin uninstall-doc 
+uninstall: uninstall-bin uninstall-doc
         @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
@@ -59 +58 @@
 uninstall-bin:
         rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
-
-install-dev:
-        mkdir -p $(DESTDIR)$(INCLUDEDIR)
-        install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
-        mkdir -p $(DESTDIR)$(PCDIR)
-        install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
-
-uninstall-dev:
-        rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
-        -rmdir $(DESTDIR)$(INCLUDEDIR)
-        rm -f $(DESTDIR)$(PCDIR)/bitlbee.pc
 
 install-etc:

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" ) ) )

bitlbee.h

@@ -102 +102 @@
 #include "storage.h"
 #include "set.h"
-#include "nogaim.h"
+#include "protocols/nogaim.h"
 #include "commands.h"
 #include "account.h"

conf.c

@@ -139 +139 @@
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
-                                "  -P  Specify PID-file (not for inetd mode)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"

configure

@@ -15 +15 @@
 config='/var/lib/bitlbee/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee'
 plugindir='$prefix/lib/bitlbee'
-pcdir='$prefix/lib/pkgconfig'
-includedir='$prefix/include/bitlbee'
 
 msn=1
@@ -53 +50 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
---ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -83 +79 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
-pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
-ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
-includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
-pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
+pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -96 +89 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+PIDFILE=$pidfile
 CONFIG=$config
-IPCSOCKET=$ipcsocket
-INCLUDEDIR=$includedir
-PCDIR=$pcdir
 
 ARCH=$arch
@@ -121 +112 @@
 #define PLUGINDIR "$plugindir"
 #define PIDFILE "$pidfile"
-#define IPCSOCKET "$ipcsocket"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -346 +336 @@
 fi
 
-cat <<EOF>bitlbee.pc
-prefix=$prefix
-includedir=$includedir
-
-Name: bitlbee
-Description: IRC to IM gateway
-Requires: glib-2.0
-Version: $BITLBEE_VERSION
-Libs:
-Cflags: -I\${includedir}
-
-EOF
-
 protocols=''
 protoobjs=''

doc/example_plugin.c

@@ -3 +3 @@
  * a shared library and place it in the plugin directory: 
  *
- * gcc -o example.so -shared example.c `pkg-config --cflags bitlbee`
+ * gcc -o example.so -shared example.c
  * cp example.so /usr/local/lib/bitlbee
  */
 #include <stdio.h>
-#include <bitlbee.h>
 
 void init_plugin(void)

ipc.c

@@ -28 +28 @@
 #include "ipc.h"
 #include "commands.h"
-#ifndef _WIN32
-#include <sys/un.h>
-#endif
 
 GSList *child_list = NULL;
@@ -37 +34 @@
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
 {
-        /* Normally data points at an irc_t block, but for the IPC master
-           this is different. We think this scary cast is better than
-           creating a new command_t structure, just to make the compiler
-           happy. */
         struct bitlbee_child *child = (void*) data;
         
@@ -464 +457 @@
 }
 
-
-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);
-
-        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_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.. */
-        if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {
-                log_message( LOGLVL_ERROR, "Could not remove old IPC socket at %s: %s", IPCSOCKET, strerror(errno) );
-                return 0;
-        }
-
-        un_addr.sun_family = AF_UNIX;
-        strcpy(un_addr.sun_path, IPCSOCKET);
-
-        serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
-
-        if (serversock == -1) {
-                log_message( LOGLVL_WARNING, "Unable to create UNIX socket: %s", strerror(errno) );
-                return 0;
-        }
-
-        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
-                log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
-                return 0;
-        }
-
-        if (listen(serversock, 5) == -1) {
-                log_message( LOGLVL_WARNING, "Unable to listen on UNIX socket: %s", strerror(errno) );
-                return 0;
-        }
-        
-        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;
-}
-#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;