diff options
| -rw-r--r-- | .bzrignore | 9 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | bitlbee.c | 9 | ||||
| -rw-r--r-- | bitlbee.h | 3 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | doc/BUILD.win32 | 35 | ||||
| -rw-r--r-- | ipc.c | 6 | ||||
| -rw-r--r-- | protocols/nogaim.h | 19 | ||||
| -rw-r--r-- | protocols/oscar/AUTHORS | 2 | ||||
| -rw-r--r-- | protocols/ssl_sspi.c | 278 | ||||
| -rw-r--r-- | protocols/yahoo/libyahoo2.c | 2 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo_httplib.c | 2 | ||||
| -rw-r--r-- | sock.h | 6 | ||||
| -rw-r--r-- | storage_text.c | 8 | ||||
| -rw-r--r-- | unix.c | 6 | ||||
| -rwxr-xr-x | utils/cross-compile.win32 | 21 | ||||
| -rw-r--r-- | win32.c | 683 | ||||
| -rw-r--r-- | win32.mk | 136 |
18 files changed, 1224 insertions, 18 deletions
@@ -1,6 +1,15 @@ Makefile.settings config.h bitlbee +Debug +Debugx +deps +admin/Debug +admin/admin.plg +bitlbee.plg +*.plg +*.aps +*.clw user-guide.txt user-guide.html help.txt @@ -9,10 +9,16 @@ -include Makefile.settings # Program variables -objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o +objects = account.o bitlbee.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h subdirs = lib protocols +ifeq ($(ARCH),Windows) +objects += win32.o +else +objects += unix.o conf.o log.o +endif + # Expansion of variables subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o) CFLAGS += -Wall @@ -122,6 +122,7 @@ int bitlbee_daemon_init() if( global.conf->runmode == RUNMODE_DAEMON || global.conf->runmode == RUNMODE_FORKDAEMON ) ipc_master_listen_socket(); +#ifndef _WIN32 if( ( fp = fopen( global.conf->pidfile, "w" ) ) ) { fprintf( fp, "%d\n", (int) getpid() ); @@ -131,6 +132,7 @@ int bitlbee_daemon_init() { log_message( LOGLVL_WARNING, "Warning: Couldn't write PID to `%s'", global.conf->pidfile ); } +#endif return( 0 ); } @@ -140,9 +142,6 @@ int bitlbee_inetd_init() if( !irc_new( 0 ) ) return( 1 ); - log_link( LOGLVL_ERROR, LOGOUTPUT_IRC ); - log_link( LOGLVL_WARNING, LOGOUTPUT_IRC ); - return( 0 ); } @@ -249,7 +248,6 @@ static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition socklen_t size = sizeof( struct sockaddr_in ); struct sockaddr_in conn_info; int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size ); - pid_t client_pid = 0; if( new_socket == -1 ) { @@ -257,8 +255,10 @@ static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition return TRUE; } +#ifndef _WIN32 if( global.conf->runmode == RUNMODE_FORKDAEMON ) { + pid_t client_pid = 0; int fds[2]; if( socketpair( AF_UNIX, SOCK_STREAM, 0, fds ) == -1 ) @@ -315,6 +315,7 @@ static gboolean bitlbee_io_new_client( gpointer data, gint fd, b_input_condition } } else +#endif { log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket ); irc_new( new_socket ); @@ -47,9 +47,10 @@ #include <stdarg.h> #include <stdio.h> #include <ctype.h> +#include <errno.h> + #ifndef _WIN32 #include <syslog.h> -#include <errno.h> #endif #include <glib.h> @@ -73,6 +73,8 @@ Option Description Default --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) $ssl +--arch=... Override target architecture $arch + EOF exit; fi @@ -266,6 +268,8 @@ elif [ "$ssl" = "gnutls" ]; then detect_gnutls elif [ "$ssl" = "nss" ]; then detect_nss +elif [ "$ssl" = "sspi" ]; then + echo elif [ "$ssl" = "openssl" ]; then echo echo 'No detection code exists for OpenSSL. Make sure that you have a complete' @@ -482,6 +486,11 @@ AIX ) CYGWIN* ) echo 'Cygwin is not officially supported.' ;; +Windows ) + echo OUTFILE=bitlbee.exe >> Makefile.settings + echo LFLAGS+=-lwsock32 >> Makefile.settings + echo EFLAGS+=-lsecur32 >> Makefile.settings +;; * ) echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' echo 'Please report any problems at http://bugs.bitlbee.org/.' diff --git a/doc/BUILD.win32 b/doc/BUILD.win32 new file mode 100644 index 00000000..e00cfdda --- /dev/null +++ b/doc/BUILD.win32 @@ -0,0 +1,35 @@ +Instructions for building BitlBee on Windows
+================================================
+
+1. Download the latest version using bzr (http://www.bazaar-ng.org/):
+
+ H:\> bzr branch http://win32.bitlbee.org/bzr bitlbee-win32
+ ...
+
+2. Download and install the required development files:
+ from ftp://ftp.gtk.org/pub/gtk/v2.8/win32/
+ - glib
+ - glib-dev
+ - libiconv (in dependencies/)
+ - gettext (in dependencies/)
+ from http://ftp.mozilla.org/pub/mozilla.org/
+ - nss (in security/nss/)
+ - nspr (in nspr/)
+
+ glib and gettext are only required for actually running BitlBee - building
+ should work fine without them.
+
+3. Set the following variables in Makefile.settings, if you don't have the
+ libraries above installed in the default directories searched by MSVC:
+
+ - GLIB_DIR
+ - NSS_DIR
+ - NSPR_DIR
+
+4. Build:
+
+ H:\BitlBee> nmake /f win32.mk
+ ...
+
+5. To build setup files, compile the bitlbee.iss file using the Inno Setup
+ program (available from www.jrsoftware.org).
@@ -438,6 +438,7 @@ void ipc_child_disable() global.listen_socket = -1; } +#ifndef _WIN32 char *ipc_master_save_state() { char *fn = g_strdup( "/tmp/bee-restart.XXXXXX" ); @@ -503,7 +504,6 @@ static gboolean new_ipc_client( gpointer data, gint serversock, b_input_conditio return TRUE; } -#ifndef _WIN32 int ipc_master_listen_socket() { struct sockaddr_un un_addr; @@ -540,7 +540,11 @@ int ipc_master_listen_socket() return 1; } #else +int ipc_master_listen_socket() +{ /* FIXME: Open named pipe \\.\BITLBEE */ + return 0; +} #endif int ipc_master_load_state() diff --git a/protocols/nogaim.h b/protocols/nogaim.h index 7d391edd..dde0dd2f 100644 --- a/protocols/nogaim.h +++ b/protocols/nogaim.h @@ -130,6 +130,25 @@ struct buddy { struct im_connection *ic; /* the connection it belongs to */ }; +struct ft +{ + const char *filename; + + /* Total number of bytes in file */ + size_t total_bytes; + + /* Current number of bytes received */ + size_t cur_bytes; +}; + +struct ft_request +{ + const char *filename; + struct gaim_connection *gc; +}; + +typedef void (*ft_recv_handler) (struct ft *, void *data, size_t len); + struct prpl { int options; /* You should set this to the name of your protocol. diff --git a/protocols/oscar/AUTHORS b/protocols/oscar/AUTHORS index 5ca13988..51e8768d 100644 --- a/protocols/oscar/AUTHORS +++ b/protocols/oscar/AUTHORS @@ -27,5 +27,3 @@ N: Brock Wilcox H: awwaiid E: awwaiid@auk.cx D: Figured out original password roasting - - diff --git a/protocols/ssl_sspi.c b/protocols/ssl_sspi.c new file mode 100644 index 00000000..a16423b1 --- /dev/null +++ b/protocols/ssl_sspi.c @@ -0,0 +1,278 @@ + /********************************************************************\ + * BitlBee -- An IRC to other IM-networks gateway * + * * + * Copyright 2002-2004 Wilmer van der Gaast and others * + \********************************************************************/ + +/* SSL module - SSPI backend */ + +/* Copyright (C) 2005 Jelmer Vernooij <jelmer@samba.org> */ + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "ssl_client.h" +#include <windows.h> +#define SECURITY_WIN32 +#include <security.h> +#include <sspi.h> +#include <schannel.h> +#include "sock.h" + +static gboolean initialized = FALSE; +int ssl_errno; + +struct scd +{ + int fd; + ssl_input_function func; + gpointer data; + gboolean established; + CredHandle cred; /* SSL credentials */ + CtxtHandle context; /* SSL context */ + SecPkgContext_StreamSizes sizes; + + char *host; + + char *pending_raw_data; + gsize pending_raw_data_len; + char *pending_data; + gsize pending_data_len; +}; + +static void ssl_connected(gpointer, gint, GaimInputCondition); + +void sspi_global_init(void) +{ + /* FIXME */ +} + +void sspi_global_deinit(void) +{ + /* FIXME */ +} + +void *ssl_connect(char *host, int port, ssl_input_function func, gpointer data) +{ + struct scd *conn = g_new0(struct scd, 1); + + conn->fd = proxy_connect(host, port, ssl_connected, conn); + sock_make_nonblocking(conn->fd); + conn->func = func; + conn->data = data; + conn->host = g_strdup(host); + + if (conn->fd < 0) + { + g_free(conn); + return NULL; + } + + if (!initialized) + { + sspi_global_init(); + initialized = TRUE; + atexit(sspi_global_deinit); + } + + return conn; +} + +static void ssl_connected(gpointer _conn, gint fd, GaimInputCondition cond) +{ + struct scd *conn = _conn; + SCHANNEL_CRED ssl_cred; + TimeStamp timestamp; + SecBuffer ibuf[2],obuf[1]; + SecBufferDesc ibufs,obufs; + ULONG req = ISC_REQ_REPLAY_DETECT | ISC_REQ_SEQUENCE_DETECT | + ISC_REQ_CONFIDENTIALITY | ISC_REQ_USE_SESSION_KEY | + ISC_REQ_ALLOCATE_MEMORY | ISC_REQ_STREAM | ISC_REQ_EXTENDED_ERROR | + ISC_REQ_MANUAL_CRED_VALIDATION; + ULONG a; + gsize size = 0; + gchar *data = NULL; + + memset(&ssl_cred, 0, sizeof(SCHANNEL_CRED)); + ssl_cred.dwVersion = SCHANNEL_CRED_VERSION; + ssl_cred.grbitEnabledProtocols = SP_PROT_SSL3_CLIENT; + + SECURITY_STATUS st = AcquireCredentialsHandle(NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, &ssl_cred, NULL, NULL, &conn->cred, ×tamp); + + if (st != SEC_E_OK) { + conn->func(conn->data, NULL, cond); + return; + } + + do { + /* initialize buffers */ + ibuf[0].cbBuffer = size; ibuf[0].pvBuffer = data; + ibuf[1].cbBuffer = 0; ibuf[1].pvBuffer = NULL; + obuf[0].cbBuffer = 0; obuf[0].pvBuffer = NULL; + ibuf[0].BufferType = obuf[0].BufferType = SECBUFFER_TOKEN; + ibuf[1].BufferType = SECBUFFER_EMPTY; + + /* initialize buffer descriptors */ + ibufs.ulVersion = obufs.ulVersion = SECBUFFER_VERSION; + ibufs.cBuffers = 2; obufs.cBuffers = 1; + ibufs.pBuffers = ibuf; obufs.pBuffers = obuf; + + st = InitializeSecurityContext(&conn->cred, size?&conn->context:NULL, conn->host, req, 0, SECURITY_NETWORK_DREP, size?&ibufs:NULL, 0, &conn->context, &obufs, &a, ×tamp); + if (obuf[0].pvBuffer && obuf[0].cbBuffer) { + /* FIXME: Check return value */ + send(conn->fd, obuf[0].pvBuffer, obuf[0].cbBuffer, 0); + } + + switch (st) { + case SEC_I_INCOMPLETE_CREDENTIALS: + break; + case SEC_I_CONTINUE_NEEDED: + break; + case SEC_E_INCOMPLETE_MESSAGE: + break; + case SEC_E_OK: + break; + } + + QueryContextAttributes(&conn->context, SECPKG_ATTR_STREAM_SIZES, &conn->sizes); + } while (1); + + conn->func(conn->data, conn, cond); +} + +int ssl_read(void *conn, char *retdata, int len) +{ + struct scd *scd = conn; + SecBufferDesc msg; + SecBuffer buf[4]; + int ret = -1, i; + char *data = g_malloc(scd->sizes.cbHeader + scd->sizes.cbMaximumMessage + scd->sizes.cbTrailer); + + /* FIXME: Try to read some data */ + + msg.ulVersion = SECBUFFER_VERSION; + msg.cBuffers = 4; + msg.pBuffers = buf; + + buf[0].BufferType = SECBUFFER_DATA; + buf[0].cbBuffer = len; + buf[0].pvBuffer = data; + + buf[1].BufferType = SECBUFFER_EMPTY; + buf[2].BufferType = SECBUFFER_EMPTY; + buf[3].BufferType = SECBUFFER_EMPTY; + + SECURITY_STATUS st = DecryptMessage(&scd->context, &msg, 0, NULL); + + if (st != SEC_E_OK) { + /* FIXME */ + return -1; + } + + for (i = 0; i < 4; i++) { + if (buf[i].BufferType == SECBUFFER_DATA) { + memcpy(retdata, buf[i].pvBuffer, len); + ret = len; + } + } + + g_free(data); + return -1; +} + +int ssl_write(void *conn, const char *userdata, int len) +{ + struct scd *scd = conn; + SecBuffer buf[4]; + SecBufferDesc msg; + char *data; + int ret; + + msg.ulVersion = SECBUFFER_VERSION; + msg.cBuffers = 4; + msg.pBuffers = buf; + + data = g_malloc(scd->sizes.cbHeader + scd->sizes.cbMaximumMessage + scd->sizes.cbTrailer); + memcpy(data + scd->sizes.cbHeader, userdata, len); + + buf[0].BufferType = SECBUFFER_STREAM_HEADER; + buf[0].cbBuffer = scd->sizes.cbHeader; + buf[0].pvBuffer = data; + + buf[1].BufferType = SECBUFFER_DATA; + buf[1].cbBuffer = len; + buf[1].pvBuffer = data + scd->sizes.cbHeader; + + buf[2].BufferType = SECBUFFER_STREAM_TRAILER; + buf[2].cbBuffer = scd->sizes.cbTrailer; + buf[2].pvBuffer = data + scd->sizes.cbHeader + len; + buf[3].BufferType = SECBUFFER_EMPTY; + + SECURITY_STATUS st = EncryptMessage(&scd->context, 0, &msg, 0); + + ret = send(scd->fd, data, + buf[0].cbBuffer + buf[1].cbBuffer + buf[2].cbBuffer, 0); + + g_free(data); + + return ret; +} + +void ssl_disconnect(void *conn) +{ + struct scd *scd = conn; + + SecBufferDesc msg; + SecBuffer buf; + DWORD dw; + + dw = SCHANNEL_SHUTDOWN; + buf.cbBuffer = sizeof(dw); + buf.BufferType = SECBUFFER_TOKEN; + buf.pvBuffer = &dw; + + msg.ulVersion = SECBUFFER_VERSION; + msg.cBuffers = 1; + msg.pBuffers = &buf; + + SECURITY_STATUS st = ApplyControlToken(&scd->context, &msg); + + if (st != SEC_E_OK) { + /* FIXME */ + } + + /* FIXME: call InitializeSecurityContext(Schannel), passing + * in empty buffers*/ + + DeleteSecurityContext(&scd->context); + + FreeCredentialsHandle(&scd->cred); + + closesocket(scd->fd); + g_free(scd->host); + g_free(scd); +} + +int ssl_getfd(void *conn) +{ + return ((struct scd*)conn)->fd; +} + +GaimInputCondition ssl_getdirection( void *conn ) +{ + return GAIM_INPUT_WRITE; /* FIXME: or GAIM_INPUT_READ */ +} diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c index 80d88a85..4e33d0ab 100644 --- a/protocols/yahoo/libyahoo2.c +++ b/protocols/yahoo/libyahoo2.c @@ -68,8 +68,6 @@ char *strchr (), *strrchr (); #ifdef __MINGW32__ # include <winsock2.h> -# define write(a,b,c) send(a,b,c,0) -# define read(a,b,c) recv(a,b,c,0) #endif #include <stdlib.h> diff --git a/protocols/yahoo/yahoo_httplib.c b/protocols/yahoo/yahoo_httplib.c index dbbe2a84..1b084992 100644 --- a/protocols/yahoo/yahoo_httplib.c +++ b/protocols/yahoo/yahoo_httplib.c @@ -50,8 +50,6 @@ char *strchr (), *strrchr (); #include "yahoo_debug.h" #ifdef __MINGW32__ # include <winsock2.h> -# define write(a,b,c) send(a,b,c,0) -# define read(a,b,c) recv(a,b,c,0) # define snprintf _snprintf #endif @@ -15,17 +15,13 @@ #endif #else # include <winsock2.h> -# ifndef _MSC_VER +# ifdef IPV6 # include <ws2tcpip.h> # endif # if !defined(BITLBEE_CORE) && defined(_MSC_VER) # pragma comment(lib,"bitlbee.lib") # endif # include <io.h> -# define read(a,b,c) recv(a,b,c,0) -# define write(a,b,c) send(a,b,c,0) -# define umask _umask -# define mode_t int # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); } # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); } # define sockerr_again() (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK) diff --git a/storage_text.c b/storage_text.c index 5ee6438d..78f7e3bd 100644 --- a/storage_text.c +++ b/storage_text.c @@ -26,6 +26,14 @@ #define BITLBEE_CORE #include "bitlbee.h" #include "crypting.h" +#ifdef _WIN32 +# define umask _umask +# define mode_t int +#endif + +#ifndef F_OK +#define F_OK 0 +#endif static void text_init (void) { @@ -59,12 +59,18 @@ int main( int argc, char *argv[], char **envp ) if( global.conf->runmode == RUNMODE_INETD ) { + log_link( LOGLVL_ERROR, LOGOUTPUT_IRC ); + log_link( LOGLVL_WARNING, LOGOUTPUT_IRC ); + i = bitlbee_inetd_init(); log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION ); } else if( global.conf->runmode == RUNMODE_DAEMON ) { + log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG ); + log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG ); + i = bitlbee_daemon_init(); log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION ); } diff --git a/utils/cross-compile.win32 b/utils/cross-compile.win32 new file mode 100755 index 00000000..c90ebc1b --- /dev/null +++ b/utils/cross-compile.win32 @@ -0,0 +1,21 @@ +#!/bin/sh +# Simple cross compilation script for BitlBee using mingw32 +# (C) Jelmer Vernooij <jelmer@samba.org> 2005-2006 + +GTK_SITE=ftp://ftp.gtk.org/pub/gtk/v2.8/win32 + +GLIB_VERSION=2.10.1 +LIBICONV_VERSION=1.9.1 +GETTEXT_VERSION=0.14.5 + +wget -c $GTK_SITE/glib-dev-$GLIB_VERSION.zip +wget -c $GTK_SITE/dependencies/libiconv-$LIBICONV_VERSION.bin.woe32.zip +wget -c $GTK_SITE/dependencies/gettext-dev-$GETTEXT_VERSION.zip + +DEPSDIR=`mktemp -d` + +unzip -d $DEPSDIR -o libiconv-$LIBICONV_VERSION.bin.woe32.zip +unzip -d $DEPSDIR -o glib-dev-$GLIB_VERSION.zip +unzip -d $DEPSDIR -o gettext-dev-$GETTEXT_VERSION.zip + +LD=i586-mingw32msvc-ld CC=i586-mingw32msvc-gcc STRIP=i586-mingw32msvc-strip PKG_CONFIG_PATH="$DEPSDIR/lib/pkgconfig" PKG_CONFIG="pkg-config --define-variable=prefix=\"$DEPSDIR\"" ./configure --ssl=sspi --arch=Windows diff --git a/win32.c b/win32.c new file mode 100644 index 00000000..511deb23 --- /dev/null +++ b/win32.c @@ -0,0 +1,683 @@ + /********************************************************************\ + * BitlBee -- An IRC to other IM-networks gateway * + * * + * Copyright 2002-2004 Wilmer van der Gaast and others * + \********************************************************************/ + +/* Main file (Windows specific part) */ + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA +*/ + +#define BITLBEE_CORE +#include "bitlbee.h" +#include "commands.h" +#include "crypting.h" +#include "protocols/nogaim.h" +#include "help.h" +#include <signal.h> +#include <windows.h> + +global_t global; /* Against global namespace pollution */ + +static void WINAPI service_ctrl (DWORD dwControl) +{ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + /* FIXME */ + break; + + case SERVICE_CONTROL_INTERROGATE: + break; + + default: + break; + + } +} + +static void bitlbee_init(int argc, char **argv) +{ + int i = -1; + memset( &global, 0, sizeof( global_t ) ); + + global.loop = g_main_new( FALSE ); + + global.conf = conf_load( argc, argv ); + if( global.conf == NULL ) + return; + + if( global.conf->runmode == RUNMODE_INETD ) + { + i = bitlbee_inetd_init(); + log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION ); + + } + else if( global.conf->runmode == RUNMODE_DAEMON ) + { + i = bitlbee_daemon_init(); + log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION ); + } + else + { + log_message( LOGLVL_INFO, "No bitlbee mode specified..."); + } + + if( i != 0 ) + return; + + if( access( global.conf->configdir, F_OK ) != 0 ) + log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir ); + else if( access( global.conf->configdir, 06 ) != 0 ) + log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir ); + if( help_init( &(global.help) ) == NULL ) + log_message( LOGLVL_WARNING, "Error opening helpfile %s.", global.helpfile ); +} + +void service_main (DWORD argc, LPTSTR *argv) +{ + SERVICE_STATUS_HANDLE handle; + SERVICE_STATUS status; + + handle = RegisterServiceCtrlHandler("bitlbee", service_ctrl); + + if (!handle) + return; + + status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + status.dwServiceSpecificExitCode = 0; + + bitlbee_init(argc, argv); + + SetServiceStatus(handle, &status); + + g_main_run( global.loop ); +} + +SERVICE_TABLE_ENTRY dispatch_table[] = +{ + { TEXT("bitlbee"), (LPSERVICE_MAIN_FUNCTION)service_main }, + { NULL, NULL } +}; + +static int debug = 0; + +static void usage() +{ + printf("Options:\n"); + printf("-h Show this help message\n"); + printf("-d Debug mode (simple console program)\n"); +} + +int main( int argc, char **argv) +{ + int i; + WSADATA WSAData; + + nogaim_init( ); + + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-d")) debug = 1; + if (!strcmp(argv[i], "-h")) { + usage(); + return 0; + } + } + + WSAStartup(MAKEWORD(1,1), &WSAData); + + if (!debug) { + if (!StartServiceCtrlDispatcher(dispatch_table)) + log_message( LOGLVL_ERROR, "StartServiceCtrlDispatcher failed."); + } else { + bitlbee_init(argc, argv); + g_main_run( global.loop ); + } + + return 0; +} + +double gettime() +{ + return (GetTickCount() / 1000); +} + +void conf_get_string(HKEY section, const char *name, const char *def, char **dest) +{ + char buf[4096]; + long x; + if (RegQueryValue(section, name, buf, &x) == ERROR_SUCCESS) { + *dest = g_strdup(buf); + } else if (!def) { + *dest = NULL; + } else { + *dest = g_strdup(def); + } +} + + +void conf_get_int(HKEY section, const char *name, int def, int *dest) +{ + char buf[20]; + long x; + DWORD y; + if (RegQueryValue(section, name, buf, &x) == ERROR_SUCCESS) { + memcpy(&y, buf, sizeof(DWORD)); + *dest = y; + } else { + *dest = def; + } +} + +conf_t *conf_load( int argc, char *argv[] ) +{ + conf_t *conf; + HKEY key, key_main, key_proxy; + char *tmp; + + RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Bitlbee", &key); + RegOpenKey(key, "main", &key_main); + RegOpenKey(key, "proxy", &key_proxy); + + memset( &global, 0, sizeof( global_t ) ); + global.loop = g_main_new(FALSE); + + conf = g_new0( conf_t,1 ); + global.conf = conf; + conf_get_string(key_main, "interface", "0.0.0.0", &global.conf->iface); + conf_get_int(key_main, "port", 6667, &global.conf->port); + conf_get_int(key_main, "verbose", 0, &global.conf->verbose); + conf_get_string(key_main, "auth_pass", "", &global.conf->auth_pass); + conf_get_string(key_main, "oper_pass", "", &global.conf->oper_pass); + conf_get_int(key_main, "ping_interval_timeout", 60, &global.conf->ping_interval); + conf_get_string(key_main, "hostname", "localhost", &global.conf->hostname); + conf_get_string(key_main, "configdir", NULL, &global.conf->configdir); + conf_get_string(key_main, "motdfile", NULL, &global.conf->motdfile); + conf_get_string(key_main, "helpfile", NULL, &global.helpfile); + global.conf->runmode = RUNMODE_DAEMON; + conf_get_int(key_main, "AuthMode", AUTHMODE_OPEN, &global.conf->authmode); + conf_get_string(key_proxy, "host", "", &tmp); strcpy(proxyhost, tmp); + conf_get_string(key_proxy, "user", "", &tmp); strcpy(proxyuser, tmp); + conf_get_string(key_proxy, "password", "", &tmp); strcpy(proxypass, tmp); + conf_get_int(key_proxy, "type", PROXY_NONE, &proxytype); + conf_get_int(key_proxy, "port", 3128, &proxyport); + + RegCloseKey(key); + RegCloseKey(key_main); + RegCloseKey(key_proxy); + + return conf; +} + +void conf_loaddefaults( irc_t *irc ) +{ + HKEY key_defaults; + int i; + char name[4096], data[4096]; + DWORD namelen = sizeof(name), datalen = sizeof(data); + DWORD type; + if (RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Bitlbee\\defaults", &key_defaults) != ERROR_SUCCESS) { + return; + } + + for (i = 0; RegEnumValue(key_defaults, i, name, &namelen, NULL, &type, data, &datalen) == ERROR_SUCCESS; i++) { + set_t *s = set_find( irc, name ); + + if( s ) + { + if( s->def ) g_free( s->def ); + s->def = g_strdup( data ); + } + + namelen = sizeof(name); + datalen = sizeof(data); + } + + RegCloseKey(key_defaults); +} + +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + +int +inet_aton(const char *cp, struct in_addr *addr) +{ + addr->s_addr = inet_addr(cp); + return (addr->s_addr == INADDR_NONE) ? 0 : 1; +} + +void log_error(char *msg) +{ + log_message(LOGLVL_ERROR, "%s", msg); +} + +void log_message(int level, char *message, ...) +{ + HANDLE hEventSource; + LPTSTR lpszStrings[2]; + WORD elevel; + va_list ap; + + va_start(ap, message); + + if (debug) { + vprintf(message, ap); + putchar('\n'); + va_end(ap); + return; + } + + hEventSource = RegisterEventSource(NULL, TEXT("bitlbee")); + + lpszStrings[0] = TEXT("bitlbee"); + lpszStrings[1] = g_strdup_vprintf(message, ap); + va_end(ap); + + switch (level) { + case LOGLVL_ERROR: elevel = EVENTLOG_ERROR_TYPE; break; + case LOGLVL_WARNING: elevel = EVENTLOG_WARNING_TYPE; break; + case LOGLVL_INFO: elevel = EVENTLOG_INFORMATION_TYPE; break; +#ifdef DEBUG + case LOGLVL_DEBUG: elevel = EVENTLOG_AUDIT_SUCCESS; break; +#endif + } + + if (hEventSource != NULL) { + ReportEvent(hEventSource, + elevel, + 0, + 0, + NULL, + 2, + 0, + lpszStrings, + NULL); + + DeregisterEventSource(hEventSource); + } + + g_free(lpszStrings[1]); +} + +void log_link(int level, int output) { /* FIXME */ } + +#ifndef NS_INADDRSZ +#define NS_INADDRSZ 4 +#endif +#ifndef NS_IN6ADDRSZ +#define NS_IN6ADDRSZ 16 +#endif +#ifndef NS_INT16SZ +#define NS_INT16SZ 2 +#endif + +static const char *inet_ntop4(const guchar *src, char *dst, size_t size); +static const char *inet_ntop6(const guchar *src, char *dst, size_t size); + +/* char * + * inet_ntop(af, src, dst, size) + * convert a network format address to presentation format. + * return: + * pointer to presentation format address (`dst'), or NULL (see errno). + * author: + * Paul Vixie, 1996. + */ +const char * +inet_ntop(af, src, dst, size) + int af; + const void *src; + char *dst; + size_t size; +{ + switch (af) { + case AF_INET: + return (inet_ntop4(src, dst, size)); + case AF_INET6: + return (inet_ntop6(src, dst, size)); + default: + errno = WSAEAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address + * return: + * `dst' (as a const) + * notes: + * (1) uses no statics + * (2) takes a u_char* not an in_addr as input + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop4(src, dst, size) + const u_char *src; + char *dst; + size_t size; +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; + int nprinted; + + nprinted = g_snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); + if (nprinted < 0) + return (NULL); /* we assume "errno" was set by "g_snprintf()" */ + if ((size_t)nprinted > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} + +/* const char * + * inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop6(src, dst, size) + const u_char *src; + char *dst; + size_t size; +{ + /* + * Note that int32_t and int16_t need only be "at least" large enough + * to contain a value of the specified size. On some systems, like + * Crays, there is no such thing as an integer variable with 16 bits. + * Keep this in mind if you think this function should have been coded + * to use pointer overlays. All the world's not a VAX. + */ + char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; + struct { int base, len; } best, cur; + guint words[NS_IN6ADDRSZ / NS_INT16SZ]; + int i; + + /* + * Preprocess: + * Copy the input (bytewise) array into a wordwise array. + * Find the longest run of 0x00's in src[] for :: shorthanding. + */ + memset(words, '\0', sizeof words); + for (i = 0; i < NS_IN6ADDRSZ; i++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; + cur.base = -1; + for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { + if (words[i] == 0) { + if (cur.base == -1) + cur.base = i, cur.len = 1; + else + cur.len++; + } else { + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + cur.base = -1; + } + } + } + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + } + if (best.base != -1 && best.len < 2) + best.base = -1; + + /* + * Format the result. + */ + tp = tmp; + for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && + i < (best.base + best.len)) { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 && + (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { + if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) + return (NULL); + tp += strlen(tp); + break; + } + tp += g_snprintf(tp, sizeof tmp - (tp - tmp), "%x", words[i]); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == + (NS_IN6ADDRSZ / NS_INT16SZ)) + *tp++ = ':'; + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((size_t)(tp - tmp) > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} + +#ifdef AF_INET +static int inet_pton4(const char *src, u_char *dst); +#endif +#ifdef AF_INET6 +static int inet_pton6(const char *src, u_char *dst); +#endif + +/* int + * inet_pton(af, src, dst) + * convert from presentation format (which usually means ASCII printable) + * to network format (which is usually some kind of binary format). + * return: + * 1 if the address was valid for the specified address family + * 0 if the address wasn't valid (`dst' is untouched in this case) + * -1 if some other error occurred (`dst' is untouched in this case, too) + * author: + * Paul Vixie, 1996. + */ +int +inet_pton(af, src, dst) + int af; + const char *src; + void *dst; +{ + switch (af) { +#ifdef AF_INET + case AF_INET: + return (inet_pton4(src, dst)); +#endif +#ifdef AF_INET6 + case AF_INET6: + return (inet_pton6(src, dst)); +#endif + default: + errno = WSAEAFNOSUPPORT; + return (-1); + } + /* NOTREACHED */ +} + +#ifdef AF_INET +/* int + * inet_pton4(src, dst) + * like inet_aton() but without all the hexadecimal and shorthand. + * return: + * 1 if `src' is a valid dotted quad, else 0. + * notice: + * does not touch `dst' unless it's returning 1. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton4(src, dst) + const char *src; + u_char *dst; +{ + static const char digits[] = "0123456789"; + int saw_digit, octets, ch; + u_char tmp[NS_INADDRSZ], *tp; + + saw_digit = 0; + octets = 0; + *(tp = tmp) = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr(digits, ch)) != NULL) { + u_int new = *tp * 10 + (pch - digits); + + if (new > 255) + return (0); + *tp = new; + if (! saw_digit) { + if (++octets > 4) + return (0); + saw_digit = 1; + } + } else if (ch == '.' && saw_digit) { + if (octets == 4) + return (0); + *++tp = 0; + saw_digit = 0; + } else + return (0); + } + if (octets < 4) + return (0); + memcpy(dst, tmp, NS_INADDRSZ); + return (1); +} +#endif + +#ifdef AF_INET6 +/* int + * inet_pton6(src, dst) + * convert presentation level address to network order binary form. + * return: + * 1 if `src' is a valid [RFC1884 2.2] address, else 0. + * notice: + * (1) does not touch `dst' unless it's returning 1. + * (2) :: in a full address is silently ignored. + * credit: + * inspired by Mark Andrews. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton6(src, dst) + const char *src; + u_char *dst; +{ + static const char xdigits_l[] = "0123456789abcdef", + xdigits_u[] = "0123456789ABCDEF"; + u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp; + const char *xdigits, *curtok; + int ch, saw_xdigit; + u_int val; + + memset((tp = tmp), '\0', NS_IN6ADDRSZ); + endp = tp + NS_IN6ADDRSZ; + colonp = NULL; + /* Leading :: requires some special handling. */ + if (*src == ':') + if (*++src != ':') + return (0); + curtok = src; + saw_xdigit = 0; + val = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) + pch = strchr((xdigits = xdigits_u), ch); + if (pch != NULL) { + val <<= 4; + val |= (pch - xdigits); + if (val > 0xffff) + return (0); + saw_xdigit = 1; + continue; + } + if (ch == ':') { + curtok = src; + if (!saw_xdigit) { + if (colonp) + return (0); + colonp = tp; + continue; + } else if (*src == '\0') { + return (0); + } + if (tp + NS_INT16SZ > endp) + return (0); + *tp++ = (u_char) (val >> 8) & 0xff; + *tp++ = (u_char) val & 0xff; + saw_xdigit = 0; + val = 0; + continue; + } + if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) && + inet_pton4(curtok, tp) > 0) { + tp += NS_INADDRSZ; + saw_xdigit = 0; + break; /* '\0' was seen by inet_pton4(). */ + } + return (0); + } + if (saw_xdigit) { + if (tp + NS_INT16SZ > endp) + return (0); + *tp++ = (u_char) (val >> 8) & 0xff; + *tp++ = (u_char) val & 0xff; + } + if (colonp != NULL) { + /* + * Since some memmove()'s erroneously fail to handle + * overlapping regions, we'll do the shift by hand. + */ + const int n = tp - colonp; + int i; + + if (tp == endp) + return (0); + for (i = 1; i <= n; i++) { + endp[- i] = colonp[n - i]; + colonp[n - i] = 0; + } + tp = endp; + } + if (tp != endp) + return (0); + memcpy(dst, tmp, NS_IN6ADDRSZ); + return (1); +} +#endif diff --git a/win32.mk b/win32.mk new file mode 100644 index 00000000..59ca7a81 --- /dev/null +++ b/win32.mk @@ -0,0 +1,136 @@ +!INCLUDE Makefile.settings + +GLIB_CFLAGS = /I "$(GLIB_DIR)\include" \ + /I "$(GLIB_DIR)\include\glib-2.0" \ + /I "$(GLIB_DIR)\lib\glib-2.0\include" + +GLIB_LFLAGS = /libpath:"$(GLIB_DIR)\lib" + +NSS_CFLAGS = /I "$(NSS_DIR)\include" /I "$(NSPR_DIR)\include" +NSS_LFLAGS = /libpath:"$(NSS_DIR)\lib" /libpath:"$(NSPR_DIR)\lib" +NSS_LIBS = nss3.lib ssl3.lib libnspr4.lib + +COMMON_LIBS = kernel32.lib user32.lib advapi32.lib shell32.lib iconv.lib \ + glib-2.0.lib gmodule-2.0.lib wsock32.lib advapi32.lib + + +MAIN_OBJS = account.obj bitlbee.obj commands.obj crypting.obj \ + help.obj irc.obj protocols\md5.obj protocols\nogaim.obj \ + protocols\sha.obj protocols\proxy.obj query.obj nick.obj set.obj \ + user.obj protocols\util.obj win32.obj + +MAIN_LIBS = $(COMMON_LIBS) + +SSL_OBJS = protocols\ssl_nss.obj +SSL_LIBS = $(NSS_LFLAGS) $(NSS_LIBS) + +MSN_OBJS = \ + protocols\msn\msn.obj \ + protocols\msn\msn_util.obj \ + protocols\msn\ns.obj \ + protocols\msn\passport.obj \ + protocols\msn\sb.obj \ + protocols\msn\tables.obj \ + $(SSL_OBJS) + +MSN_LIBS = $(COMMON_LIBS) $(SSL_LIBS) + +OSCAR_OBJS = \ + protocols\oscar\admin.obj \ + protocols\oscar\auth.obj \ + protocols\oscar\bos.obj \ + protocols\oscar\buddylist.obj \ + protocols\oscar\chat.obj \ + protocols\oscar\chatnav.obj \ + protocols\oscar\conn.obj \ + protocols\oscar\icq.obj \ + protocols\oscar\im.obj \ + protocols\oscar\info.obj \ + protocols\oscar\misc.obj \ + protocols\oscar\msgcookie.obj \ + protocols\oscar\oscar.obj \ + protocols\oscar\oscar_util.obj \ + protocols\oscar\rxhandlers.obj \ + protocols\oscar\rxqueue.obj \ + protocols\oscar\search.obj \ + protocols\oscar\service.obj \ + protocols\oscar\snac.obj \ + protocols\oscar\ssi.obj \ + protocols\oscar\stats.obj \ + protocols\oscar\tlv.obj \ + protocols\oscar\txqueue.obj + +OSCAR_LIBS = $(COMMON_LIBS) + +JABBER_OBJS = \ + protocols\jabber\expat.obj \ + protocols\jabber\genhash.obj \ + protocols\jabber\hashtable.obj \ + protocols\jabber\jabber.obj \ + protocols\jabber\jconn.obj \ + protocols\jabber\jid.obj \ + protocols\jabber\jpacket.obj \ + protocols\jabber\jutil.obj \ + protocols\jabber\karma.obj \ + protocols\jabber\log.obj \ + protocols\jabber\pool.obj \ + protocols\jabber\pproxy.obj \ + protocols\jabber\rate.obj \ + protocols\jabber\str.obj \ + protocols\jabber\xhash.obj \ + protocols\jabber\xmlnode.obj \ + protocols\jabber\xmlparse.obj \ + protocols\jabber\xmlrole.obj \ + protocols\jabber\xmltok.obj \ + protocols\jabber\xstream.obj \ + $(SSL_OBJS) + +JABBER_LIBS = $(COMMON_LIBS) $(SSL_LIBS) + +YAHOO_OBJS = \ + protocols\yahoo\crypt.obj \ + protocols\yahoo\libyahoo2.obj \ + protocols\yahoo\vc50.idb \ + protocols\yahoo\yahoo.obj \ + protocols\yahoo\yahoo_fn.obj \ + protocols\yahoo\yahoo_httplib.obj \ + protocols\yahoo\yahoo_list.obj \ + protocols\yahoo\yahoo_util.obj + +YAHOO_LIBS = $(COMMON_LIBS) + +CC=cl.exe +CFLAGS=$(GLIB_CFLAGS) $(NSS_CFLAGS) /D NDEBUG /D WIN32 /D _WINDOWS \ + /I . /I protocols /I protocols\oscar /nologo \ + /D GLIB2 /D ARCH="\"Windows\"" /D CPU="\"x86\"" \ + /D PLUGINDIR="plugins" + +.c.obj: + $(CC) $(CFLAGS) /c /Fo$@ $< + +ALL: bitlbee.exe libmsn.dll liboscar.dll libjabber.dll libyahoo.dll + +LINK32=link.exe +LINK32_FLAGS=/nologo $(GLIB_LFLAGS) + +bitlbee.exe: $(DEF_FILE) $(MAIN_OBJS) + $(LINK32) $(MAIN_LIBS) $(LINK32_FLAGS) /out:bitlbee.exe $(MAIN_OBJS) + +libmsn.dll: $(MSN_OBJS) + $(LINK32) /DLL /SUBSYSTEM:WINDOWS /ENTRY:msn_init $(MSN_LIBS) $(LINK32_FLAGS) /out:libmsn.dll $(MSN_OBJS) + +libyahoo.dll: $(YAHOO_OBJS) + $(LINK32) /DLL /SUBSYSTEM:WINDOWS /ENTRY:yahoo_init $(YAHOO_LIBS) $(LINK32_FLAGS) /out:libyahoo.dll $(YAHOO_OBJS) + +liboscar.dll: $(OSCAR_OBJS) + $(LINK32) /DLL /SUBSYSTEM:WINDOWS /ENTRY:oscar_init $(OSCAR_LIBS) $(LINK32_FLAGS) /out:liboscar.dll $(OSCAR_OBJS) + +libjabber.dll: $(JABBER_OBJS) + $(LINK32) /DLL /SUBSYSTEM:WINDOWS /ENTRY:jabber_init $(JABBER_LIBS) $(LINK32_FLAGS) /out:libjabber.dll $(JABBER_OBJS) + +clean: + @-erase $(MAIN_OBJS) + @-erase $(MSN_OBJS) + @-erase $(JABBER_OBJS) + @-erase $(OSCAR_OBJS) + @-erase $(YAHOO_OBJS) |