aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bzrignore9
-rw-r--r--Makefile8
-rw-r--r--bitlbee.c3
-rw-r--r--bitlbee.h7
-rwxr-xr-xconfigure4
-rw-r--r--doc/BUILD.win3235
-rw-r--r--protocols/nogaim.h19
-rw-r--r--protocols/ssl_sspi.c210
-rw-r--r--sock.h5
-rw-r--r--storage_text.c8
-rw-r--r--unix.c6
-rw-r--r--win32.c316
-rw-r--r--win32.mk136
13 files changed, 751 insertions, 15 deletions
diff --git a/.bzrignore b/.bzrignore
index 802cb1a0..a5c25a72 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -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
diff --git a/Makefile b/Makefile
index 51ffc83f..721e4101 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,16 @@
-include Makefile.settings
# 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
+objects = account.o bitlbee.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o storage_text.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
+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
diff --git a/bitlbee.c b/bitlbee.c
index 3aca30c5..cca14916 100644
--- a/bitlbee.c
+++ b/bitlbee.c
@@ -140,9 +140,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 );
}
diff --git a/bitlbee.h b/bitlbee.h
index 4da87ec6..07ac54bc 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -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>
@@ -75,10 +76,6 @@
#undef strncasecmp
#define strncasecmp __PLEASE_USE_G_STRNCASECMP_INSTEAD__
-#ifndef F_OK
-#define F_OK 0
-#endif
-
#define _( x ) x
#define ROOT_NICK "root"
diff --git a/configure b/configure
index a602fe3a..8a54c009 100755
--- a/configure
+++ b/configure
@@ -63,7 +63,7 @@ Option Description Default
--ipv6=0/1 IPv6 socket support $ipv6
---ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto)
+--ssl=... SSL library to use (gnutls, nss, openssl, sspi, bogus, auto)
$ssl
EOF
exit;
@@ -230,6 +230,8 @@ if [ "$msn" = 1 -o "$jabber" = 1 ]; 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'
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).
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 282a2455..3721361c 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -138,6 +138,25 @@ struct aim_user {
irc_t *irc;
};
+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;
const char *name;
diff --git a/protocols/ssl_sspi.c b/protocols/ssl_sspi.c
new file mode 100644
index 00000000..2129f07b
--- /dev/null
+++ b/protocols/ssl_sspi.c
@@ -0,0 +1,210 @@
+ /********************************************************************\
+ * 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>
+
+static gboolean initialized = FALSE;
+int ssl_errno;
+
+struct scd
+{
+ int fd;
+ SslInputFunction func;
+ gpointer data;
+ gboolean established;
+ int inpa;
+ CredHandle cred; /* SSL credentials */
+ CtxtHandle context; /* SSL context */
+ SecPkgContext_StreamSizes sizes;
+};
+
+static void ssl_connected( gpointer data, gint source, GaimInputCondition cond );
+
+void sspi_global_init( void )
+{
+ /* FIXME */
+}
+
+void sspi_global_deinit( void )
+{
+ /* FIXME */
+}
+
+void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+{
+ struct scd *conn = g_new0( struct scd, 1 );
+ SCHANNEL_CRED ssl_cred;
+ TimeStamp timestamp;
+
+ conn->fd = proxy_connect( host, port, ssl_connected, conn );
+ conn->func = func;
+ conn->data = data;
+ conn->inpa = -1;
+
+ if( conn->fd < 0 )
+ {
+ g_free( conn );
+ return( NULL );
+ }
+
+ if( !initialized )
+ {
+ sspi_global_init();
+ initialized = TRUE;
+ atexit( sspi_global_deinit );
+ }
+
+ conn->context = 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, &timestamp);
+
+ InitializeSecurityContext(&conn->cred, &conn->context, host, FIXME, 1, FIXME);
+
+ QueryContextAttributes(&conn->context, SECPKG_ATTR_STREAM_SIZES, &conn->sizes);
+
+
+ return( conn );
+}
+
+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);
+
+ 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);
+
+ closesocket( scd->fd );
+ g_free(scd);
+}
+
+int ssl_getfd( void *conn )
+{
+ return( ((struct scd*)conn)->fd );
+}
diff --git a/sock.h b/sock.h
index 28d31de9..a005bb5a 100644
--- a/sock.h
+++ b/sock.h
@@ -20,17 +20,12 @@
#define closesocket(a) close(a)
#else
# include <winsock2.h>
-# ifndef _MSC_VER
-# 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 f807cb3e..d6920c64 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
/* DO NOT USE THIS FUNCTION IN NEW CODE. This
* function is here merely because the save/load code still uses
diff --git a/unix.c b/unix.c
index 89bd65bf..e879a4d4 100644
--- a/unix.c
+++ b/unix.c
@@ -63,12 +63,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/win32.c b/win32.c
new file mode 100644
index 00000000..cf36e772
--- /dev/null
+++ b/win32.c
@@ -0,0 +1,316 @@
+ /********************************************************************\
+ * 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]);
+}
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)