Changes in / [27ac72d:5e713f6]


Ignore:
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    r27ac72d r5e713f6  
    1010decode
    1111encode
    12 bitlbee.pc

  • Makefile

    r27ac72d r5e713f6  
    1111# Program variables
    1212objects = 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
    13 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
    1413subdirs = protocols
    1514
    … …  
    2120        $(MAKE) -C doc
    2221
    23 uninstall: uninstall-bin uninstall-doc 
     22uninstall: uninstall-bin uninstall-doc
    2423        @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
    2524
    … …  
    5756uninstall-bin:
    5857        rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
    59 
    60 install-dev:
    61         mkdir -p $(DESTDIR)$(INCLUDEDIR)
    62         install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
    63         mkdir -p $(DESTDIR)$(PCDIR)
    64         install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
    65 
    66 uninstall-dev:
    67         rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
    68         -rmdir $(DESTDIR)$(INCLUDEDIR)
    69         rm -f $(DESTDIR)$(PCDIR)/bitlbee.pc
    7058
    7159install-etc:

  • bitlbee.c

    r27ac72d r5e713f6  
    118118        if( global.conf->runmode == RUNMODE_FORKDAEMON )
    119119                ipc_master_load_state();
    120 
    121         if( global.conf->runmode == RUNMODE_DAEMON ||
    122                 global.conf->runmode == RUNMODE_FORKDAEMON )
    123                 ipc_master_listen_socket();
    124120       
    125121        if( ( fp = fopen( global.conf->pidfile, "w" ) ) )

  • bitlbee.h

    r27ac72d r5e713f6  
    102102#include "storage.h"
    103103#include "set.h"
    104 #include "nogaim.h"
     104#include "protocols/nogaim.h"
    105105#include "commands.h"
    106106#include "account.h"

  • configure

    r27ac72d r5e713f6  
    1515config='/var/lib/bitlbee/'
    1616pidfile='/var/run/bitlbee.pid'
    17 ipcsocket='/var/run/bitlbee'
    1817plugindir='$prefix/lib/bitlbee'
    19 pcdir='$prefix/lib/pkgconfig'
    20 includedir='$prefix/include/bitlbee'
    2118
    2219msn=1
    … …  
    5249--pidfile=...                                           $pidfile
    5350--config=...                                            $config
    54 --ipcsocket=...                                         $ipcsocket
    5551
    5652--msn=0/1       Disable/enable MSN part                 $msn
    … …  
    8076config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    8177plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
    82 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
    83 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
    84 includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
    85 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
     78pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
    8679
    8780cat<<EOF>Makefile.settings
    … …  
    9386DATADIR=$datadir
    9487PLUGINDIR=$plugindir
     88PIDFILE=$pidfile
    9589CONFIG=$config
    96 IPCSOCKET=$ipcsocket
    97 INCLUDEDIR=$includedir
    98 PCDIR=$pcdir
    9990
    10091ARCH=$arch
    … …  
    118109#define PLUGINDIR "$plugindir"
    119110#define PIDFILE "$pidfile"
    120 #define IPCSOCKET "$ipcsocket"
    121111#define ARCH "$arch"
    122112#define CPU "$cpu"
    … …  
    317307fi
    318308
    319 cat <<EOF>bitlbee.pc
    320 prefix=$prefix
    321 includedir=$includedir
    322 
    323 Name: bitlbee
    324 Description: IRC to IM gateway
    325 Requires: glib-2.0
    326 Version: $BITLBEE_VERSION
    327 Libs:
    328 Cflags: -I\${includedir}
    329 
    330 EOF
    331 
    332309protocols=''
    333310protoobjs=''

  • doc/example_plugin.c

    r27ac72d r5e713f6  
    33 * a shared library and place it in the plugin directory:
    44 *
    5  * gcc -o example.so -shared example.c `pkg-config --cflags bitlbee`
     5 * gcc -o example.so -shared example.c
    66 * cp example.so /usr/local/lib/bitlbee
    77 */
    88#include <stdio.h>
    9 #include <bitlbee.h>
    109
    1110void init_plugin(void)

  • ipc.c

    r27ac72d r5e713f6  
    2828#include "ipc.h"
    2929#include "commands.h"
    30 #ifndef _WIN32
    31 #include <sys/un.h>
    32 #endif
    3330
    3431GSList *child_list = NULL;
    … …  
    464461}
    465462
    466 
    467 static gboolean new_ipc_client (GIOChannel *gio, GIOCondition cond, gpointer data)
    468 {
    469         struct bitlbee_child *child = g_new0( struct bitlbee_child, 1 );
    470         int serversock;
    471 
    472         serversock = g_io_channel_unix_get_fd(gio);
    473 
    474         child->ipc_fd = accept(serversock, NULL, 0);
    475 
    476         if (child->ipc_fd == -1) {
    477                 log_message( LOGLVL_WARNING, "Unable to accept connection on UNIX domain socket: %s", strerror(errno) );
    478                 return TRUE;
    479         }
    480                
    481         child->ipc_inpa = gaim_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
    482                
    483         child_list = g_slist_append( child_list, child );
    484 
    485         return TRUE;
    486 }
    487 
    488 #ifndef _WIN32
    489 int ipc_master_listen_socket()
    490 {
    491         struct sockaddr_un un_addr;
    492         int serversock;
    493         GIOChannel *gio;
    494 
    495         /* Clean up old socket files that were hanging around.. */
    496         if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {
    497                 log_message( LOGLVL_ERROR, "Could not remove old IPC socket at %s: %s", IPCSOCKET, strerror(errno) );
    498                 return 0;
    499         }
    500 
    501         un_addr.sun_family = AF_UNIX;
    502         strcpy(un_addr.sun_path, IPCSOCKET);
    503 
    504         serversock = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
    505 
    506         if (serversock == -1) {
    507                 log_message( LOGLVL_WARNING, "Unable to create UNIX socket: %s", strerror(errno) );
    508                 return 0;
    509         }
    510 
    511         if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
    512                 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
    513                 return 0;
    514         }
    515 
    516         if (listen(serversock, 5) == -1) {
    517                 log_message( LOGLVL_WARNING, "Unable to listen on UNIX socket: %s", strerror(errno) );
    518                 return 0;
    519         }
    520        
    521         gio = g_io_channel_unix_new(serversock);
    522        
    523         if (gio == NULL) {
    524                 log_message( LOGLVL_WARNING, "Unable to create IO channel for unix socket" );
    525                 return 0;
    526         }
    527 
    528         g_io_add_watch(gio, G_IO_IN, new_ipc_client, NULL);
    529         return 1;
    530 }
    531 #else
    532         /* FIXME: Open named pipe \\.\BITLBEE */
    533 #endif
    534 
    535463int ipc_master_load_state()
    536464{

  • ipc.h

    r27ac72d r5e713f6  
    5757void ipc_master_set_statefile( char *fn );
    5858int ipc_master_load_state();
    59 int ipc_master_listen_socket();
     59
    6060
    6161extern GSList *child_list;
Note: See TracChangeset for help on using the changeset viewer.