Fix bug #185 - Args of !commands lost/damaged.

All string arguments were incorrectly freed after being added to the argument list for a command.
Instead this fix makes sure it is properly copied into a new string, and by doing so this requires
a new API for dealing with hub command arguments in a type safe manner, and also allows for each
argument to be cleaned up properly when the command is no longer needed.

This also fixes issues with parse errors for certain types, and optional arguments (previously it was impossible
to tell the difference for an integer with value 0 or if no integer was given).

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "thirdparty/sqlite"]
+	path = thirdparty/sqlite
+	url = git://github.com/janvidar/sqlite.git

AUTHORS

@@ -1,6 +1,9 @@
-Authors of uHub
+Authors of uhub
 ===============
 
 Jan Vidar Krey, Design and implementation
 E_zombie, Centos/RedHat customization scripts and heavy load testing
+FleetCommand, Hub topic
+MiMic, Implemented user commands
+tehnick, Debian and Ubuntu packaging.
 

GNUmakefile

@@ -10,12 +10,14 @@ LD            := $(CC)
 MV            := mv
 RANLIB        := ranlib
 CFLAGS        += -pipe -Wall
-USE_SSL       ?= NO
+USE_SSL       ?= YES
+USE_PLUGINS   ?= YES
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES
 TERSE         ?= NO
 STACK_PROTECT ?= NO
+NEED_LIBDL    ?= NO
 
 ifeq ($(OS), Windows_NT)
 WINDOWS       ?= YES
@@ -32,6 +34,10 @@ ifeq ($(OPSYS),Haiku)
 LDLIBS        += -lnetwork
 endif
 
+ifeq ($(OPSYS),Linux)
+NEED_LIBDL = YES
+endif
+
 CFLAGS        += -I./src/
 
 ifeq ($(OPSYS),Windows)
@@ -116,10 +122,12 @@ endif
 
 ifeq ($(USE_SSL),YES)
 CFLAGS        += -DSSL_SUPPORT
-LDLIBS        += -lssl
+LDLIBS        += -lssl -lcrypto
 endif
 
+ifeq ($(NEED_LIBDL),YES)
 LDLIBS        += -ldl
+endif
 
 GIT_VERSION=$(shell git describe --tags 2>/dev/null || echo "")
 GIT_REVISION=$(shell git show --abbrev-commit  2>/dev/null | head -n 1 | cut -f 2 -d " " || echo "")
@@ -140,13 +148,13 @@ libuhub_SOURCES := \
 		src/core/route.c \
 		src/core/user.c \
 		src/core/usermanager.c \
+		src/core/plugincallback.c \
 		src/core/plugininvoke.c \
 		src/core/pluginloader.c \
 		src/network/backend.c \
 		src/network/connection.c \
 		src/network/epoll.c \
 		src/network/kqueue.c \
-		src/network/network.c \
 		src/network/select.c \
 		src/network/timeout.c \
 		src/network/timer.c
@@ -157,6 +165,7 @@ libadc_common_SOURCES := \
 		src/adc/sid.c
 
 libutils_SOURCES := \
+		src/util/cbuffer.c \
 		src/util/config_token.c \
 		src/util/credentials.c \
 		src/util/floodctl.c \
@@ -165,6 +174,7 @@ libutils_SOURCES := \
 		src/util/log.c \
 		src/util/memory.c \
 		src/util/misc.c \
+		src/network/network.c \
 		src/util/rbtree.c \
 		src/util/tiger.c
 
@@ -173,11 +183,15 @@ libadc_client_SOURCES := \
 
 uhub_SOURCES := src/core/main.c
 
+uhub-passwd_SOURCES := src/tools/uhub-passwd.c
+uhub-passwd_LIBS    := -lsqlite3
+
 adcrush_SOURCES := src/tools/adcrush.c
 
 admin_SOURCES := src/tools/admin.c
 
 autotest_SOURCES := \
+		autotest/test_commands.tcc \
 		autotest/test_credentials.tcc \
 		autotest/test_eventqueue.tcc \
 		autotest/test_hub.tcc \
@@ -199,6 +213,9 @@ autotest_OBJECTS = autotest.o
 plugin_example_SOURCES := src/plugins/mod_example.c
 plugin_example_TARGET  := mod_example.so
 
+plugin_welcome_SOURCES := src/plugins/mod_welcome.c
+plugin_welcome_TARGET  := mod_welcome.so
+
 plugin_logging_SOURCES := src/plugins/mod_logging.c
 plugin_logging_TARGET  := mod_logging.so
 
@@ -209,6 +226,11 @@ plugin_auth_sqlite_SOURCES := src/plugins/mod_auth_sqlite.c
 plugin_auth_sqlite_TARGET  := mod_auth_sqlite.so
 plugin_auth_sqlite_LIBS    := -lsqlite3
 
+plugin_chat_history_SOURCE := src/plugins/mod_chat_history.c
+plugin_chat_history_TARGET := mod_chat_history.so
+
+plugin_chat_only_SOURCE := src/plugins/mod_chat_only.c
+plugin_chat_only_TARGET := mod_chat_only.so
 
 # Source to objects
 libuhub_OBJECTS       := $(libuhub_SOURCES:.c=.o)
@@ -217,27 +239,32 @@ libadc_client_OBJECTS := $(libadc_client_SOURCES:.c=.o)
 libadc_common_OBJECTS := $(libadc_common_SOURCES:.c=.o)
 
 uhub_OBJECTS          := $(uhub_SOURCES:.c=.o)
+uhub-passwd_OBJECTS   := $(uhub-passwd_SOURCES:.c=.o)
 adcrush_OBJECTS       := $(adcrush_SOURCES:.c=.o)
 admin_OBJECTS         := $(admin_SOURCES:.c=.o)
 
+all_plugins     := $(plugin_example_TARGET) $(plugin_logging_TARGET) $(plugin_auth_TARGET) $(plugin_auth_sqlite_TARGET) $(plugin_welcome_TARGET) $(plugin_chat_history_TARGET) $(plugin_chat_only_TARGET)
 all_OBJECTS     := $(libuhub_OBJECTS) $(uhub_OBJECTS) $(libutils_OBJECTS) $(adcrush_OBJECTS) $(autotest_OBJECTS) $(admin_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
-all_plugins     := $(plugin_example_TARGET) $(plugin_logging_TARGET) $(plugin_auth_TARGET) $(plugin_auth_sqlite_TARGET)
+all_OBJECTS     += $(all_plugins)
 
 uhub_BINARY=uhub$(BIN_EXT)
+uhub-passwd_BINARY=uhub-passwd$(BIN_EXT)
 adcrush_BINARY=adcrush$(BIN_EXT)
 admin_BINARY=uhub-admin$(BIN_EXT)
 autotest_BINARY=autotest/test$(BIN_EXT)
 
-ifeq ($(USE_PLUGINS),YES)
-all_OBJECTS     += $(plugins)
-endif
 
 .PHONY: revision.h.tmp all plugins
 
 %.o: %.c version.h revision.h
 	$(MSG_CC) $(CC) -fPIC -c $(CFLAGS) -o $@ $<
 
-all: $(uhub_BINARY)
+
+#%.so: %.c
+#	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
+
+
+all: $(uhub_BINARY) $(uhub-passwd_BINARY) plugins
 
 plugins: $(uhub_BINARY) $(all_plugins)
 
@@ -245,14 +272,23 @@ $(plugin_auth_TARGET): $(plugin_auth_SOURCES) $(libutils_OBJECTS)
 	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
 
 $(plugin_auth_sqlite_TARGET): $(plugin_auth_sqlite_SOURCES) $(libutils_OBJECTS) 
-	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS) $(plugin_auth_sqlite_LIBS)
+	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS) $(LDFLAGS) $(plugin_auth_sqlite_LIBS)
 
-$(plugin_example_TARGET): $(plugin_example_SOURCES)
+$(plugin_example_TARGET): $(plugin_example_SOURCES) $(libutils_OBJECTS)
 	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
 
 $(plugin_logging_TARGET): $(plugin_logging_SOURCES) $(libutils_OBJECTS) $(libadc_common_OBJECTS) src/network/network.o
 	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
 
+$(plugin_chat_history_TARGET): $(plugin_chat_history_SOURCE) $(libutils_OBJECTS)
+	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
+
+$(plugin_chat_only_TARGET): $(plugin_chat_only_SOURCE) $(libutils_OBJECTS)
+	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
+
+$(plugin_welcome_TARGET): $(plugin_welcome_SOURCES) $(libutils_OBJECTS)
+	$(MSG_CC) $(CC) -shared -fPIC -o $@ $^ $(CFLAGS)
+
 $(adcrush_BINARY): $(adcrush_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
@@ -262,6 +298,10 @@ $(admin_BINARY): $(admin_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libad
 $(uhub_BINARY): $(uhub_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
+$(uhub-passwd_BINARY): $(uhub-passwd_OBJECTS)
+	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(uhub-passwd_LIBS)
+
+
 autotest.c: $(autotest_SOURCES)
 	$(shell exotic --standalone $(autotest_SOURCES) > $@)
 
@@ -293,9 +333,9 @@ else
 install: $(uhub_BINARY)
 	@echo Copying $(uhub_BINARY) to $(UHUB_PREFIX)/bin/
 	@cp $(uhub_BINARY) $(UHUB_PREFIX)/bin/
+	@cp $(uhub-passwd_BINARY) $(UHUB_PREFIX)/bin/
 	@if [ ! -d $(UHUB_CONF_DIR) ]; then echo Creating $(UHUB_CONF_DIR); mkdir -p $(UHUB_CONF_DIR); fi
 	@if [ ! -f $(UHUB_CONF_DIR)/uhub.conf ]; then cp doc/uhub.conf $(UHUB_CONF_DIR); fi
-	@if [ ! -f $(UHUB_CONF_DIR)/users.conf ]; then cp doc/users.conf  $(UHUB_CONF_DIR); fi
 	@if [ ! -f $(UHUB_CONF_DIR)/rules.txt ]; then cp doc/rules.txt  $(UHUB_CONF_DIR); fi
 	@if [ ! -f $(UHUB_CONF_DIR)/plugins.conf ]; then cp doc/plugins.conf  $(UHUB_CONF_DIR); fi
 	@if [ ! -d $(UHUB_MOD_DIR) ]; then echo Creating $(UHUB_MOD_DIR); mkdir -p $(UHUB_MOD_DIR); fi

autotest/test_commands.tcc

@@ -0,0 +1,146 @@
+#include <uhub.h>
+
+static struct hub_info* hub = NULL;
+static struct hub_user user;
+static struct command_base* cbase = NULL;
+static struct command_handle* c_test1 = NULL;
+static struct command_handle* c_test2 = NULL;
+static struct command_handle* c_test3 = NULL;
+static struct command_handle* c_test4 = NULL;
+static struct command_handle* c_test5 = NULL;
+static struct command_handle* c_test6 = NULL;
+static struct command_handle* c_test7 = NULL;
+
+// for results:
+static int result = 0;
+
+EXO_TEST(setup, {
+	hub = hub_malloc_zero(sizeof(struct hub_info));
+	cbase = command_initialize(hub);
+	return cbase && hub && uman_init(hub) == 0;
+});
+
+static int test_handler(struct command_base* cbase, struct hub_user* user, struct hub_command* hcmd)
+{
+	result = 1;
+	return 0;
+}
+
+static struct command_handle* create_handler(const char* prefix, const char* args, enum auth_credentials cred)
+{
+	struct command_handle* c = hub_malloc_zero(sizeof(struct command_handle));
+	c->prefix = prefix;
+	c->length = strlen(prefix);
+	c->args = args;
+	c->cred = cred;
+	c->handler = test_handler;
+	c->description = "A handler added by autotest.";
+	c->description = "exotic";
+	c->ptr = &c->ptr;
+	return c;
+}
+
+EXO_TEST(command_setup_user, {
+	memset(&user, 0, sizeof(user));
+	user.id.sid = 1;
+	strcpy(user.id.nick, "tester");
+	strcpy(user.id.cid, "3AGHMAASJA2RFNM22AA6753V7B7DYEPNTIWHBAY");
+	user.credentials = auth_cred_guest;
+	return 1;
+});
+
+#define ADD_TEST(var, prefix, args, cred) \
+	var = create_handler(prefix, args, cred); \
+	if (!command_add(cbase, var, NULL)) \
+		return 0;
+
+#define DEL_TEST(var) \
+		if (var) \
+		{ \
+			if (!command_del(cbase, var)) \
+				return 0; \
+			hub_free(var); \
+			var = NULL; \
+		}
+
+EXO_TEST(command_create, {
+	ADD_TEST(c_test1, "test1", "", auth_cred_guest);
+	ADD_TEST(c_test2, "test2", "", auth_cred_operator);
+	ADD_TEST(c_test3, "test3", "N?N?N", auth_cred_guest);
+	ADD_TEST(c_test4, "test4", "n", auth_cred_guest);
+	ADD_TEST(c_test5, "test5", "i", auth_cred_guest);
+	ADD_TEST(c_test6, "test6", "?c", auth_cred_guest);
+	ADD_TEST(c_test6, "test7", "C", auth_cred_guest);
+	return 1;
+});
+
+extern void command_destroy(struct hub_command* cmd);
+
+static int verify(const char* str, enum command_parse_status expected)
+{
+	struct hub_command* cmd = command_parse(cbase, &user, str);
+	enum command_parse_status status = cmd->status;
+	command_free(cmd);
+	return status == expected;
+}
+
+EXO_TEST(command_access_1, { return verify("!test1", cmd_status_ok); });
+EXO_TEST(command_access_2, { return verify("!test2", cmd_status_access_error); });
+EXO_TEST(command_access_3, { user.credentials = auth_cred_operator; return verify("!test2", cmd_status_ok); });
+
+EXO_TEST(command_syntax_1, { return verify("", cmd_status_syntax_error); });
+EXO_TEST(command_syntax_2, { return verify("!", cmd_status_syntax_error); });
+
+EXO_TEST(command_missing_args_1, { return verify("!test3", cmd_status_missing_args); });
+EXO_TEST(command_missing_args_2, { return verify("!test3 12345", cmd_status_ok); });
+EXO_TEST(command_missing_args_3, { return verify("!test3 1 2 345", cmd_status_ok); });
+EXO_TEST(command_number_1, { return verify("!test3 abc", cmd_status_arg_number); });
+EXO_TEST(command_number_2, { return verify("!test3 -", cmd_status_arg_number); });
+EXO_TEST(command_number_3, { return verify("!test3 -12", cmd_status_ok); });
+
+EXO_TEST(command_user_1, { return verify("!test4 tester", cmd_status_arg_nick); });
+EXO_TEST(command_user_2, { return verify("!test5 3AGHMAASJA2RFNM22AA6753V7B7DYEPNTIWHBAY", cmd_status_arg_cid); });
+EXO_TEST(command_user_3, { return uman_add(hub, &user) == 0; });
+EXO_TEST(command_user_4, { return verify("!test4 tester", cmd_status_ok); });
+EXO_TEST(command_user_5, { return verify("!test5 3AGHMAASJA2RFNM22AA6753V7B7DYEPNTIWHBAY", cmd_status_ok); });
+
+EXO_TEST(command_command_1, { return verify("!test6 test1", cmd_status_ok); });
+EXO_TEST(command_command_2, { return verify("!test6 test2", cmd_status_ok); });
+EXO_TEST(command_command_3, { return verify("!test6 test3", cmd_status_ok); });
+EXO_TEST(command_command_4, { return verify("!test6 test4", cmd_status_ok); });
+EXO_TEST(command_command_5, { return verify("!test6 test5", cmd_status_ok); });
+EXO_TEST(command_command_6, { return verify("!test6 test6", cmd_status_ok); });
+EXO_TEST(command_command_7, { return verify("!test6 fail", cmd_status_arg_command); });
+EXO_TEST(command_command_8, { return verify("!test6", cmd_status_ok); });
+
+EXO_TEST(command_cred_1, { return verify("!test7 guest", cmd_status_ok); });
+EXO_TEST(command_cred_2, { return verify("!test7 user", cmd_status_ok); });
+EXO_TEST(command_cred_3, { return verify("!test7 operator", cmd_status_ok); });
+EXO_TEST(command_cred_4, { return verify("!test7 super", cmd_status_ok); });
+EXO_TEST(command_cred_5, { return verify("!test7 admin", cmd_status_ok); });
+EXO_TEST(command_cred_6, { return verify("!test7 nobody", cmd_status_arg_cred); });
+EXO_TEST(command_cred_7, { return verify("!test7 bot", cmd_status_ok); });
+EXO_TEST(command_cred_8, { return verify("!test7 link", cmd_status_ok); });
+
+
+#if 0
+	cmd_status_arg_cred,       /** <<< "A credentials argument is not valid ('C')" */
+};
+#endif
+
+// command not found
+EXO_TEST(command_parse_3, { return verify("!fail", cmd_status_not_found); });
+
+// built-in command
+EXO_TEST(command_parse_4, { return verify("!help", cmd_status_ok); });
+
+EXO_TEST(command_destroy, {
+	DEL_TEST(c_test1);
+	DEL_TEST(c_test2);
+	DEL_TEST(c_test3);
+	DEL_TEST(c_test4);
+	DEL_TEST(c_test5);
+	DEL_TEST(c_test6);
+	DEL_TEST(c_test7);
+	return 1;
+});

doc/plugins.conf

@@ -1,16 +1,62 @@
 # ATTENTION!
 # Plugins are invoked in the order of listing in the plugin config file.
 
-# auth user
-# file={path for DB file with user auth information}
+
+# Sqlite based user authentication.
+#
+# This plugin provides a Sqlite based authentication database for
+# registered users.
+# Use the uhub-passwd utility to create the database and add/remove users.
+#
+# Parameters:
+# file: path/filename for database.
+#
 plugin /var/lib/uhub/mod_auth_sqlite.so "file=/etc/uhub/users.db"
 
-# log subsystem.
-# file={/path/to/logfile} 
+
+# Log file writer
+#
+# Parameters:
+# file: path/filename for log file.
+# syslog: if true then syslog is used instead of writing to a file (Unix only)
 plugin /var/lib/uhub/mod_logging.so "file=/var/log/uhub.log"
 
-#
-# plugin /var/lib/uhub/mod_auth_simple.so
-
-#
+# A simple example plugin
 # plugin /var/lib/uhub/mod_example.so
+# A plugin sending a welcome message.
+#
+# This plugin provides the following commands:
+# !motd - Message of the day
+# !rules - Show hub rules.
+#
+# Parameters:
+# motd: path/filename for the welcome message (message of the day)
+# rules: path/filenam for the rules file
+#
+# NOTE: The files MUST exist, however if you do not wish to provide one then these parameters can be omitted.
+#
+# The motd/rules files can do the following substitutions:
+# %n - Nickname of the user who entered the hub or issued the command.
+# %a - IP address of the user
+# %c - The credentials of the user (guest, user, op, super, admin).
+# %% - Becomes '%'
+# %H - Hour 24-hour format (00-23) (Hub local time)
+# %I - Hour 12-hour format (01-12) (Hub local time)
+# %P - 'AM' or 'PM'
+# %p - 'am' or 'pm'
+# %M - Minutes (00-59) (Hub local time)
+# %S - Seconds (00-60) (Hub local time)
+plugin /var/lib/uhub/mod_welcome.so "motd=/etc/uhub/motd.txt rules=/etc/uhub/rules.txt"
+
+# Load the chat history plugin.
+#
+# This plugin provides chat history when users are connecting, or
+# when users invoke the !history command.
+# The history command can optionally take a parameter to indicate how many lines of history is requested.
+#
+# Parameters:
+# history_max:     the maximum number of messages to keep in history
+# history_default: when !history is provided without arguments, then this default number of messages are returned.
+# history_connect: the number of chat history messages to send when users connect (0 = do not send any history)
+plugin /var/lib/uhub/mod_chat_history.so "history_max=200 history_default=10 history_connect=5"
+

doc/uhub.1

@@ -23,7 +23,7 @@ on high-end servers, or a small private hub on embedded hardware.
 .SH "OPTIONS"
 .TP
 .BI \^\-v
-Verbose mode, add more -v's for higher verbosity.
+Verbose mode, add more \-v's for higher verbosity.
 .TP
 .BI \^\-q 
 Quiet mode, if quiet mode is enabled no output or logs are made.

doc/uhub.conf

@@ -84,9 +84,6 @@ flood_ctl_extras=5
 # if chat_is_privileged=yes only registered users may write in main chat
 chat_is_privileged = no
 
-# if chat_only = yes then search and transfer functionality is disabled for
-# non-operator users.
-chat_only = no
 
 # if obsolete_clients=1 allows old clients to enter , 0 gives an error message (msg_proto_obsolete_adc0) if they try connect
 # defaults obsolete_clients=1

doc/uhub.spec

@@ -1,7 +1,7 @@
 Summary: High performance ADC p2p hub.
 Name: uhub
 Version: 0.4.0
-Release: 1
+Release: 2
 License: GPLv3
 Group: Networking/File transfer
 Source: uhub-%{version}.tar.gz
@@ -9,6 +9,7 @@ URL: http://www.uhub.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: sqlite-devel
+BuildRequires: openssl-devel
 
 %description
 uhub is a high performance peer-to-peer hub for the ADC network.
@@ -22,6 +23,9 @@ Key features:
 - Advanced access control support
 - Easy configuration
 - plugin support
+ - mod_welcome  - MOTD\RULES messages
+ - mod_auth_sipmle - auth with sqlite DB
+ - mod_logging - log hub activity
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -40,8 +44,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
 mkdir -p $RPM_BUILD_ROOT/var/lib/uhub
 
 install uhub $RPM_BUILD_ROOT/usr/bin/
+install uhub-passwd $RPM_BUILD_ROOT/usr/bin/
 > doc/motd.txt
-install -m644 doc/uhub.conf doc/users.conf doc/rules.txt doc/motd.txt doc/plugins.conf $RPM_BUILD_ROOT/etc/uhub
+install -m644 doc/uhub.conf doc/users.conf doc/rules.txt doc/motd.txt doc/plugins.conf doc/users.db $RPM_BUILD_ROOT/etc/uhub
 install doc/init.d.RedHat/etc/init.d/uhub $RPM_BUILD_ROOT/etc/init.d
 install -m644 doc/init.d.RedHat/etc/sysconfig/uhub  $RPM_BUILD_ROOT/etc/sysconfig/
 install -m644 doc/init.d.RedHat/etc/logrotate.d/uhub $RPM_BUILD_ROOT/etc/logrotate.d/
@@ -59,6 +64,7 @@ install -m644 mod_*.so $RPM_BUILD_ROOT/var/lib/uhub
 %config(noreplace) %{_sysconfdir}/uhub/motd.txt
 %config(noreplace) %{_sysconfdir}/uhub/rules.txt
 %config(noreplace) %{_sysconfdir}/uhub/plugins.conf
+%config(noreplace) %{_sysconfdir}/uhub/users.db
 %{_sysconfdir}/init.d/uhub
 %config(noreplace) %{_sysconfdir}/logrotate.d/uhub
 %config(noreplace) %{_sysconfdir}/sysconfig/uhub
@@ -76,9 +82,14 @@ if [ $1 -gt 1 ] ; then
 fi
 # need more informations about add services and users in system
 /usr/sbin/adduser -M -d /tmp -G nobody -s /sbin/nologin -c 'The Uhub ADC p2p hub Daemon' uhub >/dev/null 2>&1 ||:
+# write SSL create 
+echo "PLS see /usr/share/doc/uhub/"
 
 %changelog
-* Tue Jun 26 2001 E_zombie
+* Fri Dec 30 2011 E_zombie
+- add users.db 
+- add new doc
+* Tue Jun 26 2010 E_zombie
 - add plugins.conf
 * Tue Jan 31 2010 E_zombie
 - change GROUP

src/adc/adcconst.h

@@ -20,7 +20,11 @@
 #ifndef HAVE_UHUB_ADC_CONSTANTS_H
 #define HAVE_UHUB_ADC_CONSTANTS_H
 
+#ifndef SID_T_DEFINED
 typedef uint32_t sid_t;
+#define SID_T_DEFINED
+#endif
+
 typedef uint32_t fourcc_t;
 
 /* Internal uhub limit */
@@ -60,6 +64,11 @@ typedef uint32_t fourcc_t;
 #define ADC_CMD_FSCH FOURCC('F','S','C','H')
 #define ADC_CMD_DRES FOURCC('D','R','E','S')
 
+/* invalid search results (spam) */
+#define ADC_CMD_BRES FOURCC('B','R','E','S')
+#define ADC_CMD_ERES FOURCC('E','R','E','S')
+#define ADC_CMD_FRES FOURCC('F','R','E','S')
+
 /* connection setup */
 #define ADC_CMD_DCTM FOURCC('D','C','T','M')
 #define ADC_CMD_DRCM FOURCC('D','R','C','M')

src/adc/sid.c

@@ -120,7 +120,6 @@ void sid_pool_destroy(struct sid_pool* pool)
 sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
 {
 	sid_t n;
-
 	if (pool->count >= (pool->max - pool->min))
 	{
 #ifdef DEBUG_SID
@@ -129,8 +128,7 @@ sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
 		return 0;
 	}
 
-	n = ++pool->count;
-
+	n = (++pool->count);
 	for (; (pool->map[n % pool->max]); n++) ;
 
 #ifdef DEBUG_SID

src/core/auth.c

@@ -26,12 +26,10 @@
 static int check_cmd_bool(const char* cmd, struct linked_list* list, char* line, int line_count)
 {
 	char* data;
-	char* data_extra;
 	
 	if (!strncmp(line, cmd, strlen(cmd)))
 	{
 		data = &line[strlen(cmd)];
-		data_extra = 0;
 		data[0] = '\0';
 		data++;
 		
@@ -88,6 +86,7 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 		}
 
 		strncpy(info->nickname, data, MAX_NICK_LEN);
+		if (data_extra)
 			strncpy(info->password, data_extra, MAX_PASS_LEN);
 		info->credentials = status;
 		list_append(list, info);
@@ -288,35 +287,24 @@ int acl_shutdown(struct acl_handle* handle)
 
 extern int acl_register_user(struct hub_info* hub, struct auth_info* info)
 {
-#ifdef PLUGIN_SUPPORT
 	if (plugin_auth_register_user(hub, info) != st_allow)
 	{
 		return 0;
 	}
 	return 1;
-#else
-	// NOT SUPPORTED!
-	return 0;
-#endif
 }
 
 extern int acl_update_user(struct hub_info* hub, struct auth_info* info)
 {
-#ifdef PLUGIN_SUPPORT
 	if (plugin_auth_update_user(hub, info) != st_allow)
 	{
 		return 0;
 	}
 	return 1;
-#else
-	// NOT SUPPORTED!
-	return 0;
-#endif
 }
 
 extern int acl_delete_user(struct hub_info* hub, const char* name)
 {
-#ifdef PLUGIN_SUPPORT
 	struct auth_info data;
 	strncpy(data.nickname, name, MAX_NICK_LEN);
 	data.nickname[MAX_NICK_LEN] = '\0';
@@ -327,16 +315,11 @@ extern int acl_delete_user(struct hub_info* hub, const char* name)
 		return 0;
 	}
 	return 1;
-#else
-	// NOT SUPPORTED!
-	return 0;
-#endif
 }
 
 struct auth_info* acl_get_access_info(struct hub_info* hub, const char* name)
 {
 	struct auth_info* info = 0;
-#ifdef PLUGIN_SUPPORT
 	info = (struct auth_info*) hub_malloc(sizeof(struct auth_info));
 	if (plugin_auth_get_user(hub, name, info) != st_allow)
 	{
@@ -344,18 +327,6 @@ struct auth_info* acl_get_access_info(struct hub_info* hub, const char* name)
 		return NULL;
 	}
 	return info;
-#else
-	info = (struct auth_info*) list_get_first(hub->acl->users);
-	while (info)
-	{
-		if (strcasecmp((char*)info->nickname, name) == 0)
-		{
-			return info;
-		}
-		info = (struct auth_info*) list_get_next(hub->acl->users);
-	}
-	return NULL;
-#endif
 }
 
 #define STR_LIST_CONTAINS(LIST, STR) \
@@ -513,9 +484,7 @@ int acl_password_verify(struct hub_info* hub, struct hub_user* user, const char*
 	base32_encode((unsigned char*) tiger_res, TIGERSIZE, password_calc);
 	password_calc[MAX_CID_LEN] = 0;
 
-#ifdef PLUGIN_SUPPORT
 	hub_free(access);
-#endif
 
 	if (strcasecmp(password, password_calc) == 0)
 	{

src/core/commands.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -17,6 +17,160 @@
  *
  */
 
-#include "uhub.h"
+#ifndef HAVE_UHUB_COMMANDS_H
+#define HAVE_UHUB_COMMANDS_H
 
-extern int command_dipatcher(struct hub_info* hub, struct hub_user* user, const char* message);
+struct command_base;
+struct command_handle;
+struct hub_command;
+
+typedef int (*command_handler)(struct command_base* cbase, struct hub_user* user, struct hub_command* cmd);
+
+enum command_parse_status
+{
+	cmd_status_ok,             /** <<< "Everything seems to OK" */
+	cmd_status_not_found,      /** <<< "Command was not found" */
+	cmd_status_access_error,   /** <<< "You don't have access to this command" */
+	cmd_status_syntax_error,   /** <<< "Not a valid command." */
+	cmd_status_missing_args,   /** <<< "Missing some or all required arguments." */
+	cmd_status_arg_nick,       /** <<< "A nick argument does not match an online user. ('n')" */
+	cmd_status_arg_cid,        /** <<< "A cid argument does not match an online user. ('i')." */
+	cmd_status_arg_address,    /** <<< "A address range argument is not valid ('a')." */
+	cmd_status_arg_number,     /** <<< "A number argument is not valid ('N')" */
+	cmd_status_arg_cred,       /** <<< "A credentials argument is not valid ('C')" */
+	cmd_status_arg_command,    /** <<< "A command argument is not valid ('c')" */
+};
+
+struct hub_command_arg_data
+{
+	enum Type {
+		type_integer,
+		type_string,
+		type_user,
+		type_address,
+		type_range,
+		type_credentials,
+		type_command
+	} type;
+
+	union {
+		int integer;
+		char* string;
+		struct hub_user* user;
+		struct ip_addr_encap* address;
+		struct ip_range* range;
+		enum auth_credentials credentials;
+		struct command_handle* command;
+	} data;
+
+	struct hub_command_arg_data* next;
+};
+
+void hub_command_args_free(struct hub_command* command);
+
+/**
+ * This struct contains all information needed to invoke
+ * a command, which includes the whole message, the prefix,
+ * the decoded arguments (according to parameter list), and
+ * the user pointer (ptr) which comes from the command it was matched to.
+ *
+ * The message and prefix is generally always available, but args only
+ * if status == cmd_status_ok.
+ * Handler and ptr are NULL if status == cmd_status_not_found, or status == cmd_status_access_error.
+ * Ptr might also be NULL if cmd_status_ok because the command that handles it was added with a NULL ptr.
+ */
+struct hub_command
+{
+	const char* message;                /**<<< "The complete message." */
+	char* prefix;                       /**<<< "The prefix extracted from the message." */
+	struct linked_list* args;           /**<<< "List of all parsed arguments from the message. Type depends on expectations." */
+	enum command_parse_status status;   /**<<< "Status of the hub_command." */
+	command_handler handler;            /**<<< "The function handler to call in order to invoke this command." */
+	const struct hub_user* user;        /**<<< "The user who invoked this command." */
+	void* ptr;                          /**<<< "A pointer of data which came from struct command_handler" */
+};
+
+/**
+ * Argument codes are used to automatically parse arguments
+ * for a a hub command.
+ *
+ * n = nick name (must exist in hub session)
+ * i = CID (must exist in hub)
+ * a = (IP) address (must be a valid IPv4 or IPv6 address)
+ * r = (IP) address range (either: IP-IP or IP/mask, both IPv4 or IPv6 work)
+ * m = message (string)
+ * p = password (string)
+ * C = credentials (see auth_string_to_cred).
+ * c = command (name of command)
+ * N = number (integer)
+ *
+ * Prefix an argument with ? to make it optional.
+ * NOTE; if an argument is optional then all following arguments must also be optional.
+ *
+ * Example:
+ * "nia" means "nick cid ip"
+ * "n?p" means "nick [password]" where password is optional.
+ *
+ */
+struct command_handle
+{
+	const char* prefix;             /**<<< "Command prefix, for instance 'help' would be the prefix for the !help command." */
+	size_t length;                  /**<<< "Length of the prefix" */
+	const char* args;               /**<<< "Argument codes (see above)" */
+	enum auth_credentials cred;     /**<<< "Minimum access level for the command" */
+	command_handler handler;        /**<<< "Function pointer for the command" */
+	const char* description;        /**<<< "Description for the command" */
+	const char* origin;             /**<<< "Name of module where the command is implemented." */
+	void* ptr;                      /**<<< "A pointer which will be passed along to the handler. @See hub_command::ptr" */
+};
+
+/**
+ * Returns NULL on error, or handle
+ */
+extern struct command_base* command_initialize(struct hub_info* hub);
+extern void command_shutdown(struct command_base* cbase);
+
+/**
+ * Add a new command to the command base.
+ * Returns 1 on success, or 0 on error.
+ */
+extern int command_add(struct command_base*, struct command_handle*, void* ptr);
+
+/**
+ * Remove a command from the command base.
+ * Returns 1 on success, or 0 on error.
+ */
+extern int command_del(struct command_base*, struct command_handle*);
+
+/**
+ * Dispatch a message and forward it as a command.
+ * Returns 1 if the message should be forwarded as a chat message, or 0 if
+ * it is supposed to be handled internally in the dispatcher.
+ *
+ * This will break the message down into a struct hub_command and invoke the command handler
+ * for that command if the sufficient access credentials are met.
+ */
+extern int command_invoke(struct command_base*, struct hub_user* user, const char* message);
+
+/**
+ * Parse a message as a command and return a status indicating if the command
+ * is valid and that the arguments are sane.
+ *
+ * @param cbase Command base pointer.
+ * @param user User who invoked the command.
+ * @param message The message that is to be interpreted as a command (including the invokation prefix '!' or '+')
+ *
+ * @return a hub_command that must be freed with command_free(). @See struct hub_command.
+ */
+extern struct hub_command* command_parse(struct command_base* cbase, const struct hub_user* user, const char* message);
+
+/**
+ * Free a hub_command that was created in command_parse().
+ */
+extern void command_free(struct hub_command* command);
+
+
+extern void commands_builtin_add(struct command_base*);
+extern void commands_builtin_remove(struct command_base*);
+
+#endif /* HAVE_UHUB_COMMANDS_H */

src/core/config.xml

@@ -108,6 +108,15 @@
 		<since>0.1.1</since>
 	</option>
 
+   <option name="register_self" type="boolean" default="0">
+	   <short>Allow users to register themselves on the hub.</short>
+		<description><![CDATA[
+			If this is enabled guests can register their nickname on the hub.
+			Otherwise only operators can register users.
+		]]></description>
+		<since>0.4.0</since>
+   </option>
+
 	<option name="obsolete_clients" type="boolean" default="0">
 		<short>Support obsolete clients using a ADC protocol prior to 1.0</short>
 		<description><![CDATA[
@@ -117,14 +126,6 @@
 		<since>0.3.1</since>
 	</option>
 
-	<option name="chat_only" type="boolean" default="0">
-		<short>Allow chat only operation on hub</short>
-		<description><![CDATA[
-			If this is enabled the hub will refuse to relay messages for search and connection setup. This effectively makes the hub viable for chat only.
-		]]></description>
-		<since>0.1.1</since>
-	</option>
-
 	<option name="chat_is_privileged" type="boolean" default="0">
 		<short>Allow chat for operators and above only</short>
 		<description><![CDATA[
@@ -417,6 +418,17 @@
 		<since>0.3.0</since>
 	</option>
 
+	<option name="tls_require_redirect_addr" type="string" default="">
+		<check regexp="(adc|adcs|dchub)://.*" />
+		<short>A redirect address in case a client connects using "adc://" when "adcs://" is required.</short>
+		<description><![CDATA[
+		This is the redirect address used when the hub wants to redirect a client for not using ADCS.
+		For instance a hub at adc://adc.example.com might redirect to adcs://adc.example.com
+		]]></description>
+		<since>0.3.3</since>
+	</option>
+
+
 	<option name="tls_certificate" type="file" default="">
 		<short>Certificate file</short>
 		<description><![CDATA[
@@ -433,24 +445,6 @@
 		<since>0.3.0</since>
 	</option>
 
-	<option name="file_motd" type="file" default="">
-		<short>File containing the 'message of the day</short>
-		<description><![CDATA[
-			This can be specified as a message of the day file. If a valid file is given here it's content will be sent to all users after they have logged in to the hub. If the file is missing or empty this configuration entry will be ignored.
-		]]></description>
-		<since>0.1.3</since>
-		<example><![CDATA[
-			<p>
-			Unix users: <br />
-				file_acl = "/etc/uhub/motd.txt"
-			</p>
-			<p>
-			Windows users: <br />
-				file_acl = "c:\uhub\motd.txt"
-			</p>
-		]]></example>
-	</option>
-
 	<option name="file_acl" type="file" default="">
 		<short>File containing access control lists</short>
 		<description><![CDATA[
@@ -471,25 +465,6 @@
 		]]></example>
 	</option>
 
-	<option name="file_rules" type="file" default="">
-		<short>File containing hub rules</short>
-		<description><![CDATA[
-			This is a text file that is displayed on login as an extended message of the day.
-			In addition the contents of the file is displayed when a user uses the "!rules" command.
-		]]></description>
-		<since>0.3.0</since>
-		<example><![CDATA[
-			<p>
-			Unix users: <br />
-				file_acl = "/etc/uhub/rules.txt"
-			</p>
-			<p>
-			Windows users: <br />
-				file_acl = "c:\uhub\rules.txt"
-			</p>
-		]]></example>
-	</option>
-
 	<option name="file_plugins" type="file" default="">
 		<short>Plugin configuration file</short>
 		<description><![CDATA[

src/core/gen_config.c

@@ -11,8 +11,8 @@ void config_defaults(struct hub_config* config)
 	config->show_banner_sys_info = 1;
 	config->max_users = 500;
 	config->registered_users_only = 0;
+	config->register_self = 0;
 	config->obsolete_clients = 0;
-	config->chat_only = 0;
 	config->chat_is_privileged = 0;
 	config->hub_name = hub_strdup("uhub");
 	config->hub_description = hub_strdup("no description");
@@ -42,11 +42,10 @@ void config_defaults(struct hub_config* config)
 	config->flood_ctl_extras = 0;
 	config->tls_enable = 0;
 	config->tls_require = 0;
+	config->tls_require_redirect_addr = hub_strdup("");
 	config->tls_certificate = hub_strdup("");
 	config->tls_private_key = hub_strdup("");
-	config->file_motd = hub_strdup("");
 	config->file_acl = hub_strdup("");
-	config->file_rules = hub_strdup("");
 	config->file_plugins = hub_strdup("");
 	config->msg_hub_full = hub_strdup("Hub is full");
 	config->msg_hub_disabled = hub_strdup("Hub is disabled");
@@ -183,9 +182,9 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
-	if (!strcmp(key, "obsolete_clients"))
+	if (!strcmp(key, "register_self"))
 	{
-		if (!apply_boolean(key, data, &config->obsolete_clients))
+		if (!apply_boolean(key, data, &config->register_self))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
 			return -1;
@@ -193,9 +192,9 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
-	if (!strcmp(key, "chat_only"))
+	if (!strcmp(key, "obsolete_clients"))
 	{
-		if (!apply_boolean(key, data, &config->chat_only))
+		if (!apply_boolean(key, data, &config->obsolete_clients))
 		{
 			LOG_ERROR("Configuration parse error on line %d", line_count);
 			return -1;
@@ -496,6 +495,16 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
+	if (!strcmp(key, "tls_require_redirect_addr"))
+	{
+		if (!apply_string(key, data, &config->tls_require_redirect_addr, (char*) ""))
+		{
+			LOG_ERROR("Configuration parse error on line %d", line_count);
+			return -1;
+		}
+		return 0;
+	}
+
 	if (!strcmp(key, "tls_certificate"))
 	{
 		if (!apply_string(key, data, &config->tls_certificate, (char*) ""))
@@ -516,16 +525,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
-	if (!strcmp(key, "file_motd"))
-	{
-		if (!apply_string(key, data, &config->file_motd, (char*) ""))
-		{
-			LOG_ERROR("Configuration parse error on line %d", line_count);
-			return -1;
-		}
-		return 0;
-	}
-
 	if (!strcmp(key, "file_acl"))
 	{
 		if (!apply_string(key, data, &config->file_acl, (char*) ""))
@@ -536,16 +535,6 @@ static int apply_config(struct hub_config* config, char* key, char* data, int li
 		return 0;
 	}
 
-	if (!strcmp(key, "file_rules"))
-	{
-		if (!apply_string(key, data, &config->file_rules, (char*) ""))
-		{
-			LOG_ERROR("Configuration parse error on line %d", line_count);
-			return -1;
-		}
-		return 0;
-	}
-
 	if (!strcmp(key, "file_plugins"))
 	{
 		if (!apply_string(key, data, &config->file_plugins, (char*) ""))
@@ -933,16 +922,14 @@ void free_config(struct hub_config* config)
 
 	hub_free(config->redirect_addr);
 
+	hub_free(config->tls_require_redirect_addr);
+
 	hub_free(config->tls_certificate);
 
 	hub_free(config->tls_private_key);
 
-	hub_free(config->file_motd);
-
 	hub_free(config->file_acl);
 
-	hub_free(config->file_rules);
-
 	hub_free(config->file_plugins);
 
 	hub_free(config->msg_hub_full);
@@ -1048,12 +1035,12 @@ void dump_config(struct hub_config* config, int ignore_defaults)
 	if (!ignore_defaults || config->registered_users_only != 0)
 		fprintf(stdout, "registered_users_only = %s\n", config->registered_users_only ? "yes" : "no");
 
+	if (!ignore_defaults || config->register_self != 0)
+		fprintf(stdout, "register_self = %s\n", config->register_self ? "yes" : "no");
+
 	if (!ignore_defaults || config->obsolete_clients != 0)
 		fprintf(stdout, "obsolete_clients = %s\n", config->obsolete_clients ? "yes" : "no");
 
-	if (!ignore_defaults || config->chat_only != 0)
-		fprintf(stdout, "chat_only = %s\n", config->chat_only ? "yes" : "no");
-
 	if (!ignore_defaults || config->chat_is_privileged != 0)
 		fprintf(stdout, "chat_is_privileged = %s\n", config->chat_is_privileged ? "yes" : "no");
 
@@ -1141,21 +1128,18 @@ void dump_config(struct hub_config* config, int ignore_defaults)
 	if (!ignore_defaults || config->tls_require != 0)
 		fprintf(stdout, "tls_require = %s\n", config->tls_require ? "yes" : "no");
 
+	if (!ignore_defaults || strcmp(config->tls_require_redirect_addr, "") != 0)
+		fprintf(stdout, "tls_require_redirect_addr = \"%s\"\n", config->tls_require_redirect_addr);
+
 	if (!ignore_defaults || strcmp(config->tls_certificate, "") != 0)
 		fprintf(stdout, "tls_certificate = \"%s\"\n", config->tls_certificate);
 
 	if (!ignore_defaults || strcmp(config->tls_private_key, "") != 0)
 		fprintf(stdout, "tls_private_key = \"%s\"\n", config->tls_private_key);
 
-	if (!ignore_defaults || strcmp(config->file_motd, "") != 0)
-		fprintf(stdout, "file_motd = \"%s\"\n", config->file_motd);
-
 	if (!ignore_defaults || strcmp(config->file_acl, "") != 0)
 		fprintf(stdout, "file_acl = \"%s\"\n", config->file_acl);
 
-	if (!ignore_defaults || strcmp(config->file_rules, "") != 0)
-		fprintf(stdout, "file_rules = \"%s\"\n", config->file_rules);
-
 	if (!ignore_defaults || strcmp(config->file_plugins, "") != 0)
 		fprintf(stdout, "file_plugins = \"%s\"\n", config->file_plugins);
 

src/core/gen_config.h

@@ -11,8 +11,8 @@ struct hub_config
 	int   show_banner_sys_info;            /*<<< Show banner on connect (default: 1) */
 	int   max_users;                       /*<<< Maximum number of users allowed on the hub (default: 500) */
 	int   registered_users_only;           /*<<< Allow registered users only (default: 0) */
+	int   register_self;                   /*<<< Allow users to register themselves on the hub. (default: 0) */
 	int   obsolete_clients;                /*<<< Support obsolete clients using a ADC protocol prior to 1.0 (default: 0) */
-	int   chat_only;                       /*<<< Allow chat only operation on hub (default: 0) */
 	int   chat_is_privileged;              /*<<< Allow chat for operators and above only (default: 0) */
 	char* hub_name;                        /*<<< Name of hub (default: uhub) */
 	char* hub_description;                 /*<<< Short hub description, topic or subject. (default: no description) */
@@ -42,11 +42,10 @@ struct hub_config
 	int   flood_ctl_extras;                /*<<< Max extra messages allowed in time interval (default: 0) */
 	int   tls_enable;                      /*<<< Enable SSL/TLS support (default: 0) */
 	int   tls_require;                     /*<<< If SSL/TLS enabled, should it be required (default: 0) (default: 0) */
+	char* tls_require_redirect_addr;       /*<<< A redirect address in case a client connects using "adc://" when "adcs://" is required. (default: ) */
 	char* tls_certificate;                 /*<<< Certificate file (default: ) */
 	char* tls_private_key;                 /*<<< Private key file (default: ) */
-	char* file_motd;                       /*<<< File containing the 'message of the day (default: ) */
 	char* file_acl;                        /*<<< File containing access control lists (default: ) */
-	char* file_rules;                      /*<<< File containing hub rules (default: ) */
 	char* file_plugins;                    /*<<< Plugin configuration file (default: ) */
 	char* msg_hub_full;                    /*<<< "Hub is full" */
 	char* msg_hub_disabled;                /*<<< "Hub is disabled" */

src/core/hub.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -21,10 +21,6 @@
 
 struct hub_info* g_hub = 0;
 
-#define CHECK_CHAT_ONLY \
-	if (hub->config->chat_only && u->credentials < auth_cred_operator) \
-		break
-
 /* FIXME: Flood control should be done in a plugin! */
 #define CHECK_FLOOD(TYPE, WARN) \
 	if (flood_control_check(&u->flood_ ## TYPE , hub->config->flood_ctl_  ## TYPE, hub->config->flood_ctl_interval, net_get_time())) \
@@ -81,6 +77,7 @@ int hub_handle_message(struct hub_info* hub, struct hub_user* u, const char* lin
 			case ADC_CMD_EINF:
 			case ADC_CMD_FINF:
 				/* these must never be allowed for security reasons, so we ignore them. */
+				CHECK_FLOOD(extras, 1);
 				break;
 
 			case ADC_CMD_EMSG:
@@ -96,20 +93,35 @@ int hub_handle_message(struct hub_info* hub, struct hub_user* u, const char* lin
 			case ADC_CMD_ESCH:
 			case ADC_CMD_FSCH:
 				cmd->priority = -1;
-				CHECK_CHAT_ONLY;
+				if (plugin_handle_search(hub, u, cmd->cache) == st_deny)
+					break;
 				CHECK_FLOOD(search, 1);
 				ROUTE_MSG;
 
+			case ADC_CMD_FRES: // spam
+			case ADC_CMD_BRES: // spam
+			case ADC_CMD_ERES: // pointless.
+				CHECK_FLOOD(extras, 1);
+				break;
+
 			case ADC_CMD_DRES:
 				cmd->priority = -1;
-				CHECK_CHAT_ONLY;
+				if (plugin_handle_search_result(hub, u, uman_get_user_by_sid(hub, cmd->target), cmd->cache) == st_deny)
+					break;
 				/* CHECK_FLOOD(search, 0); */
 				ROUTE_MSG;
 
 			case ADC_CMD_DRCM:
+				cmd->priority = -1;
+				if (plugin_handle_revconnect(hub, u, uman_get_user_by_sid(hub, cmd->target)) == st_deny)
+					break;
+				CHECK_FLOOD(connect, 1);
+				ROUTE_MSG;
+
 			case ADC_CMD_DCTM:
 				cmd->priority = -1;
-				CHECK_CHAT_ONLY;
+				if (plugin_handle_connect(hub, u, uman_get_user_by_sid(hub, cmd->target)) == st_deny)
+					break;
 				CHECK_FLOOD(connect, 1);
 				ROUTE_MSG;
 
@@ -254,6 +266,7 @@ int hub_handle_password(struct hub_info* hub, struct hub_user* u, struct adc_mes
 int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd)
 {
 	char* message = adc_msg_get_argument(cmd, 0);
+	char* message_decoded = NULL;
 	int ret = 0;
 	int relay = 1;
 	int broadcast;
@@ -264,6 +277,13 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
 	if (!message)
 		return 0;
 
+	message_decoded = adc_msg_unescape(message);
+	if (!message_decoded)
+	{
+		hub_free(message);
+		return 0;
+	}
+
 	if (!user_is_logged_in(u))
 	{
 		hub_free(message);
@@ -289,7 +309,7 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
 		}
 		else
 		{
-			relay = command_dipatcher(hub, u, message);
+			relay = command_invoke(hub->commands, u, message_decoded);
 		}
 	}
 
@@ -301,16 +321,16 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
 
 	if (relay)
 	{
-		plugin_st status;
+		plugin_st status = st_default;
 		if (broadcast)
 		{
-			status = plugin_handle_chat_message(hub, u, message, 0);
+			status = plugin_handle_chat_message(hub, u, message_decoded, 0);
 		}
 		else if (private_msg)
 		{
 			struct hub_user* target = uman_get_user_by_sid(hub, cmd->target);
 			if (target)
-				status = plugin_handle_private_message(hub, u, target, message, 0);
+				status = plugin_handle_private_message(hub, u, target, message_decoded, 0);
 			else
 				relay = 0;
 		}
@@ -324,37 +344,15 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
 		/* adc_msg_remove_named_argument(cmd, "PM"); */
 		if (broadcast)
 		{
-			hub_chat_history_add(hub, u, cmd);
-			plugin_log_chat_message(hub, u, message, 0);
+			plugin_log_chat_message(hub, u, message_decoded, 0);
 		}
 		ret = route_message(hub, u, cmd);
 	}
 	hub_free(message);
+	hub_free(message_decoded);
 	return ret;
 }
 
-void hub_chat_history_add(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
-{
-	char* msg_esc   = adc_msg_get_argument(cmd, 0);
-	char* message = adc_msg_unescape(msg_esc);
-	char* log = hub_malloc(strlen(message) + strlen(user->id.nick) + 14);
-	sprintf(log, "%s <%s> %s\n", get_timestamp(time(NULL)), user->id.nick, message);
-	list_append(hub->chat_history, log);
-	while (list_size(hub->chat_history) > (size_t) hub->config->max_chat_history)
-	{
-		char* msg = list_get_first(hub->chat_history);
-		list_remove(hub->chat_history, msg);
-		hub_free(msg);
-	}
-	hub_free(message);
-	hub_free(msg_esc);
-}
-
-void hub_chat_history_clear(struct hub_info* hub)
-{
-	list_clear(hub->chat_history, &hub_free);
-}
-
 void hub_send_support(struct hub_info* hub, struct hub_user* u)
 {
 	if (user_is_connecting(u) || user_is_logged_in(u))
@@ -473,27 +471,6 @@ void hub_send_handshake(struct hub_info* hub, struct hub_user* u)
 	}
 }
 
-int hub_send_motd(struct hub_info* hub, struct hub_user* u)
-{
-	if (hub->command_motd)
-	{
-		route_to_user(hub, u, hub->command_motd);
-		return 1;
-	}
-	return 0;
-}
-
-int hub_send_rules(struct hub_info* hub, struct hub_user* u)
-{
-	if (hub->command_rules)
-	{
-		route_to_user(hub, u, hub->command_rules);
-		return 1;
-	}
-	return 0;
-}
-
-
 void hub_send_password_challenge(struct hub_info* hub, struct hub_user* u)
 {
 	struct adc_message* igpa;
@@ -526,8 +503,25 @@ void hub_send_flood_warning(struct hub_info* hub, struct hub_user* u, const char
 	}
 }
 
+static int check_duplicate_logins_ok(struct hub_info* hub, struct hub_user* user)
+{
+	struct hub_user* lookup1;
+	struct hub_user* lookup2;
+
+	lookup1 = uman_get_user_by_nick(hub, user->id.nick);
+	if (lookup1)
+		return status_msg_inf_error_nick_taken;
+
+	lookup2 = uman_get_user_by_cid(hub,  user->id.cid);
+	if (lookup2)
+		return status_msg_inf_error_cid_taken;
+
+	return 0;
+}
+
 static void hub_event_dispatcher(void* callback_data, struct event_data* message)
 {
+	int status;
 	struct hub_info* hub = (struct hub_info*) callback_data;
 	struct hub_user* user = (struct hub_user*) message->ptr;
 	assert(hub != NULL);
@@ -544,9 +538,19 @@ static void hub_event_dispatcher(void* callback_data, struct event_data* message
 				hub_send_password_challenge(hub, user);
 			}
 			else
+			{
+				/* Race condition, we could have two messages for two logins queued up.
+				   So make sure we don't let the second client in. */
+				status = check_duplicate_logins_ok(hub, user);
+				if (!status)
 				{
 					on_login_success(hub, user);
 				}
+				else
+				{
+					on_login_failure(hub, user, (enum status_message) status);
+				}
+			}
 			break;
 		}
 
@@ -690,11 +694,12 @@ static int load_ssl_certificates(struct hub_info* hub, struct hub_config* config
 {
 	if (config->tls_enable)
 	{
-		hub->ssl_method = SSLv23_method(); /* TLSv1_method() */
+		hub->ssl_method = (SSL_METHOD*) SSLv23_method(); /* TLSv1_method() */
 		hub->ssl_ctx = SSL_CTX_new(hub->ssl_method);
 
 		/* Disable SSLv2 */
 		SSL_CTX_set_options(hub->ssl_ctx, SSL_OP_NO_SSLv2);
+		SSL_CTX_set_quiet_shutdown(hub->ssl_ctx, 1);
 
 		if (SSL_CTX_use_certificate_file(hub->ssl_ctx, config->tls_certificate, SSL_FILETYPE_PEM) < 0)
 		{
@@ -791,25 +796,15 @@ struct hub_info* hub_start_service(struct hub_config* config)
 		return 0;
 	}
 
-	hub->chat_history = (struct linked_list*) list_create();
 	hub->logout_info  = (struct linked_list*) list_create();
-	if (!hub->chat_history)
-	{
-		net_con_close(hub->server);
-		list_destroy(hub->chat_history);
-		list_destroy(hub->logout_info);
-		hub_free(hub->recvbuf);
-		hub_free(hub->sendbuf);
-		uman_shutdown(hub);
-		hub_free(hub);
-		return 0;
-	}
-
 	server_alt_port_start(hub, config);
 
 	hub->status = hub_status_running;
 
 	g_hub = hub;
+
+	// Start the hub command sub-system
+	hub->commands = command_initialize(hub);
 	return hub;
 }
 
@@ -824,37 +819,35 @@ void hub_shutdown_service(struct hub_info* hub)
 
 	event_queue_shutdown(hub->queue);
 	net_con_close(hub->server);
-	hub_free(hub->server);
 	server_alt_port_stop(hub);
 	uman_shutdown(hub);
 	hub->status = hub_status_stopped;
 	hub_free(hub->sendbuf);
 	hub_free(hub->recvbuf);
-	hub_chat_history_clear(hub);
-	list_destroy(hub->chat_history);
 	list_clear(hub->logout_info, &hub_free);
 	list_destroy(hub->logout_info);
+	command_shutdown(hub->commands);
 	hub_free(hub);
 	hub = 0;
 	g_hub = 0;
 }
 
-#ifdef PLUGIN_SUPPORT
-void hub_plugins_load(struct hub_info* hub)
+int hub_plugins_load(struct hub_info* hub)
 {
 	if (!hub->config->file_plugins || !*hub->config->file_plugins)
-		return;
+		return 0;
 
 	hub->plugins = hub_malloc_zero(sizeof(struct uhub_plugins));
 	if (!hub->plugins)
-		return;
+		return -1;
 
-	if (plugin_initialize(hub->config, hub->plugins) < 0)
+	if (plugin_initialize(hub->config, hub) < 0)
 	{
 		hub_free(hub->plugins);
 		hub->plugins = 0;
-		return;
+		return -1;
 	}
+	return 0;
 }
 
 void hub_plugins_unload(struct hub_info* hub)
@@ -866,12 +859,9 @@ void hub_plugins_unload(struct hub_info* hub)
 		hub->plugins = 0;
 	}
 }
-#endif
 
 void hub_set_variables(struct hub_info* hub, struct acl_handle* acl)
 {
-	int fd, ret;
-	char buf[MAX_RECV_BUF];
 	char* tmp;
 	char* server = adc_msg_escape(PRODUCT_STRING); /* FIXME: OOM */
 
@@ -891,39 +881,6 @@ void hub_set_variables(struct hub_info* hub, struct acl_handle* acl)
 		hub_free(tmp);
 	}
 
-	/* (Re-)read the message of the day */
-	hub->command_motd = 0;
-	fd = (hub->config->file_motd && *hub->config->file_motd) ? open(hub->config->file_motd, 0) : -1;
-	if (fd != -1)
-	{
-		ret = read(fd, buf, MAX_RECV_BUF);
-		if (ret > 0)
-		{
-			buf[ret] = 0;
-			tmp = adc_msg_escape(buf);
-			hub->command_motd = adc_msg_construct(ADC_CMD_IMSG, 6 + strlen(tmp));
-			adc_msg_add_argument(hub->command_motd, tmp);
-			hub_free(tmp);
-		}
-		close(fd);
-	}
-
-	hub->command_rules = 0;
-	fd = (hub->config->file_rules && *hub->config->file_rules) ? open(hub->config->file_rules, 0) : -1;
-	if (fd != -1)
-	{
-		ret = read(fd, buf, MAX_RECV_BUF);
-		if (ret > 0)
-		{
-			buf[ret] = 0;
-			tmp = adc_msg_escape(buf);
-			hub->command_rules = adc_msg_construct(ADC_CMD_IMSG, 6 + strlen(tmp));
-			adc_msg_add_argument(hub->command_rules, tmp);
-			hub_free(tmp);
-		}
-		close(fd);
-	}
-
 	hub->command_support = adc_msg_construct(ADC_CMD_ISUP, 6 + strlen(ADC_PROTO_SUPPORT));
 	if (hub->command_support)
 	{
@@ -942,9 +899,11 @@ void hub_set_variables(struct hub_info* hub, struct acl_handle* acl)
 		hub_free(tmp);
 	}
 
-#ifdef PLUGIN_SUPPORT
-	hub_plugins_load(hub);
-#endif
+	if (hub_plugins_load(hub) < 0)
+	{
+		hub->status = hub_status_shutdown;
+	}
+	else
 
 	hub->status = (hub->config->hub_enabled ? hub_status_running : hub_status_disabled);
 	hub_free(server);
@@ -953,53 +912,13 @@ void hub_set_variables(struct hub_info* hub, struct acl_handle* acl)
 
 void hub_free_variables(struct hub_info* hub)
 {
-#ifdef PLUGIN_SUPPORT
 	hub_plugins_unload(hub);
-#endif
 
 	adc_msg_free(hub->command_info);
 	adc_msg_free(hub->command_banner);
-
-	if (hub->command_motd)
-		adc_msg_free(hub->command_motd);
-
-	if (hub->command_rules)
-		adc_msg_free(hub->command_rules);
-
 	adc_msg_free(hub->command_support);
 }
 
-
-/**
- * @return 1 if nickname is in use, or 0 if not used.
- */
-static int is_nick_in_use(struct hub_info* hub, const char* nick)
-{
-	struct hub_user* lookup = uman_get_user_by_nick(hub, nick);
-	if (lookup)
-	{
-		return 1;
-	}
-	return 0;
-}
-
-
-/**
- * @return 1 if CID is in use, or 0 if not used.
- */
-static int is_cid_in_use(struct hub_info* hub, const char* cid)
-{
-	struct hub_user* lookup = uman_get_user_by_cid(hub, cid);
-	if (lookup)
-	{
-		return 1;
-	}
-	return 0;
-}
-
-
-
-
 static void set_status_code(enum msg_status_level level, int code, char buffer[4])
 {
 	buffer[0] = ('0' + (int) level);
@@ -1357,8 +1276,8 @@ void hub_logout_log(struct hub_info* hub, struct hub_user* user)
 	struct hub_logout_info* loginfo = hub_malloc_zero(sizeof(struct hub_logout_info));
 	if (!loginfo) return;
 	loginfo->time = time(NULL);
-	strcpy(loginfo->cid, user->id.cid);
-	strcpy(loginfo->nick, user->id.nick);
+	memcpy(loginfo->cid, user->id.cid, sizeof(loginfo->cid));
+	memcpy(loginfo->nick, user->id.nick, sizeof(loginfo->nick));
 	memcpy(&loginfo->addr, &user->id.addr, sizeof(struct ip_addr_encap));
 	loginfo->reason = user->quit_reason;
 

src/core/hub.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -103,20 +103,16 @@ struct hub_info
 	struct acl_handle* acl;
 	struct adc_message* command_info;    /* The hub's INF command */
 	struct adc_message* command_support; /* The hub's SUP command */
-	struct adc_message* command_motd;    /* The message of the day */
-	struct adc_message* command_rules;   /* The hub rules */
 	struct adc_message* command_banner;  /* The default welcome message */
 	time_t tm_started;
 	int status;
 	char* recvbuf; /* Global receive buffer */
 	char* sendbuf; /* Global send buffer */
 
-	struct linked_list* chat_history;    /* Chat history */
 	struct linked_list* logout_info;     /* Log of people logging out. */
 
-#ifdef PLUGIN_SUPPORT
-	struct uhub_plugins* plugins;
-#endif
+	struct command_base* commands;       /* Hub command handler */
+	struct uhub_plugins* plugins;        /* Plug-ins loaded for this hub instance. */
 
 #ifdef SSL_SUPPORT
 	SSL_METHOD* ssl_method;
@@ -154,16 +150,6 @@ extern int hub_handle_password(struct hub_info* hub, struct hub_user* u, struct
  */
 extern int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
 
-/**
- * Add a chat message to the chat history
- */
-extern void hub_chat_history_add(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd);
-
-/**
- * Clear the chat history.
- */
-extern void hub_chat_history_clear(struct hub_info* hub);
-
 /**
  * Used internally by hub_handle_info
  * @return 1 if nickname is OK, or 0 if nickname is not accepted.
@@ -206,19 +192,6 @@ extern void hub_send_hubinfo(struct hub_info* hub, struct hub_user* u);
  */
 extern void hub_send_handshake(struct hub_info* hub, struct hub_user* u);
 
-/**
- * Send a welcome message containing the message of the day to 
- * one particular user. This can be sent in any point in time.
- * @return 1 if the motd were sent.
- */
-extern int hub_send_motd(struct hub_info* hub, struct hub_user* u);
-
-/**
- * Send the rules if configured.
- * @return 1 if the rules were sent.
- */
-extern int hub_send_rules(struct hub_info* hub, struct hub_user* u);
-
 /**
  * Send a password challenge to a user.
  * This is only used if the user tries to access the hub using a

src/core/hubevent.c

@@ -20,42 +20,7 @@
 #include "uhub.h"
 #include "plugin_api/handle.h"
 
-#ifndef PLUGIN_SUPPORT
-static void log_user_login(struct hub_user* u)
-{
-	const char* cred = auth_cred_to_string(u->credentials);
-	const char* addr = user_get_address(u);
-	LOG_USER("LoginOK     %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, cred, u->user_agent);
-}
-
-static void log_user_login_error(struct hub_user* u, enum status_message msg)
-{
-	const char* addr = user_get_address(u);
-	const char* message = hub_get_status_message_log(u->hub, msg);
-	LOG_USER("LoginError  %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message, u->user_agent);
-}
-
-static void log_user_update_error(struct hub_user* u, enum status_message msg)
-{
-	const char* addr = user_get_address(u);
-	const char* message = hub_get_status_message_log(u->hub, msg);
-	LOG_USER("UpdateError %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message, u->user_agent);
-}
-
-static void log_user_logout(struct hub_user* u, const char* message)
-{
-	const char* addr = user_get_address(u);
-	LOG_USER("Logout      %s/%s %s \"%s\" (%s)", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message);
-}
-
-static void log_user_nick_change(struct hub_user* u, const char* nick)
-{
-	const char* addr = user_get_address(u);
-	LOG_USER("NickChange  %s/%s %s \"%s\" -> \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, nick);
-}
-#endif /* !PLUGIN_SUPPORT */
-
-/* Send MOTD, do logging etc */
+/* Notify plugins, etc */
 void on_login_success(struct hub_info* hub, struct hub_user* u)
 {
 	/* Send user list of all existing users */
@@ -66,24 +31,11 @@ void on_login_success(struct hub_info* hub, struct hub_user* u)
 	user_set_state(u, state_normal);
 	uman_add(hub, u);
 
-#ifdef PLUGIN_SUPPORT
-	plugin_log_user_login_success(hub, u);
-#else
-	/* Print log message */
-	log_user_login(u);
-#endif
-
 	/* Announce new user to all connected users */
 	if (user_is_logged_in(u))
 		route_info_message(hub, u);
 
-	/* Send message of the day (if any) */
-	if (user_is_logged_in(u)) /* Previous send() can fail! */
-		hub_send_motd(hub, u);
-
-	/* Send message of the day (if any) */
-	if (user_is_logged_in(u)) /* Previous send() can fail! */
-		hub_send_rules(hub, u);
+	plugin_log_user_login_success(hub, u);
 
 	/* reset timeout */
 	net_con_clear_timeout(u->connection);
@@ -91,22 +43,14 @@ void on_login_success(struct hub_info* hub, struct hub_user* u)
 
 void on_login_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg)
 {
-#ifdef PLUGIN_SUPPORT
 	plugin_log_user_login_error(hub, u, hub_get_status_message_log(hub, msg));
-#else
-	log_user_login_error(u, msg);
-#endif
 	hub_send_status(hub, u, msg, status_level_fatal);
 	hub_disconnect_user(hub, u, quit_logon_error);
 }
 
 void on_update_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg)
 {
-#ifdef PLUGIN_SUPPORT
 	plugin_log_user_update_error(hub, u, hub_get_status_message_log(hub, msg));
-#else
-	log_user_update_error(u, msg);
-#endif
 	hub_send_status(hub, u, msg, status_level_fatal);
 	hub_disconnect_user(hub, u, quit_update_error);
 }
@@ -115,11 +59,7 @@ void on_nick_change(struct hub_info* hub, struct hub_user* u, const char* nick)
 {
 	if (user_is_logged_in(u))
 	{
-#ifdef PLUGIN_SUPPORT
 		plugin_log_user_nick_change(hub, u, nick);
-#else
-		log_user_nick_change(u, nick);
-#endif
 	}
 }
 
@@ -127,12 +67,7 @@ void on_logout_user(struct hub_info* hub, struct hub_user* user)
 {
 	const char* reason = user_get_quit_reason_string(user->quit_reason);
 
-#ifdef PLUGIN_SUPPORT
 	plugin_log_user_logout(hub, user, reason);
-#else
-	log_user_logout(user, reason);
-#endif
-
 	hub_logout_log(hub, user);
 }
 

src/core/inf.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -378,7 +378,7 @@ static int check_user_agent(struct hub_info* hub, struct hub_user* user, struct
 		ua = adc_msg_unescape(ua_encoded);
 		if (ua)
 		{
-			memcpy(user->user_agent, ua, MIN(strlen(ua), MAX_UA_LEN));
+			memcpy(user->id.user_agent, ua, MIN(strlen(ua), MAX_UA_LEN));
 			hub_free(ua);
 		}
 	}
@@ -546,6 +546,7 @@ static int set_credentials(struct hub_info* hub, struct hub_user* user, struct a
 	{
 		user->credentials = auth_cred_guest;
 	}
+	hub_free(info);
 
 	switch (user->credentials)
 	{

src/core/netevent.c

@@ -176,16 +176,18 @@ void net_on_accept(struct net_connection* con, int event, void *arg)
 	struct hub_probe* probe = 0;
 	struct ip_addr_encap ipaddr;
 	int server_fd = net_con_get_sd(con);
-#ifdef PLUGIN_SUPPORT
 	plugin_st status;
-#endif
 
 	for (;;)
 	{
 		int fd = net_accept(server_fd, &ipaddr);
 		if (fd == -1)
 		{
+#ifdef WINSOCK
+			if (net_error() == WSAEWOULDBLOCK)
+#else
 			if (net_error() == EWOULDBLOCK)
+#endif
 			{
 				break;
 			}
@@ -196,7 +198,6 @@ void net_on_accept(struct net_connection* con, int event, void *arg)
 			}
 		}
 
-#ifdef PLUGIN_SUPPORT
 		status = plugin_check_ip_early(hub, &ipaddr);
 		if (status == st_deny)
 		{
@@ -206,7 +207,6 @@ void net_on_accept(struct net_connection* con, int event, void *arg)
 		}
 
 		plugin_log_connection_accepted(hub, &ipaddr);
-#endif
 
 		probe = probe_create(hub, fd, &ipaddr);
 		if (!probe)

src/core/plugincallback.c

@@ -0,0 +1,162 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "uhub.h"
+#include "plugin_api/command_api.h"
+
+struct plugin_callback_data
+{
+	struct linked_list* commands;
+};
+
+static struct plugin_callback_data* get_callback_data(struct plugin_handle* plugin)
+{
+	struct plugin_callback_data* data;
+	uhub_assert(plugin && plugin->handle && plugin->handle->internals);
+	data = (struct plugin_callback_data*) plugin->handle->internals;
+	return data;
+}
+
+static int plugin_command_dispatch(struct command_base* cbase, struct hub_user* user, struct hub_command* cmd)
+{
+	struct plugin_handle* plugin = (struct plugin_handle*) cmd->ptr;
+	struct plugin_callback_data* data = get_callback_data(plugin);
+	struct plugin_command_handle* cmdh;
+	struct plugin_user* puser = (struct plugin_user*) user; // FIXME: Use a proper conversion function instead.
+	struct plugin_command* pcommand = (struct plugin_command*) cmd; // FIXME: Use a proper conversion function instead.
+
+	LOG_PLUGIN("plugin_command_dispatch: cmd=%s", cmd->prefix);
+
+	cmdh = (struct plugin_command_handle*) list_get_first(data->commands);
+	while (cmdh)
+	{
+		if (strcmp(cmdh->prefix, cmd->prefix) == 0)
+			return cmdh->handler(plugin, puser, pcommand);
+
+		cmdh = (struct plugin_command_handle*) list_get_next(data->commands);
+	}
+	return 0;
+}
+
+struct plugin_callback_data* plugin_callback_data_create()
+{
+	struct plugin_callback_data* data = (struct plugin_callback_data*) hub_malloc_zero(sizeof(struct plugin_callback_data));
+	LOG_PLUGIN("plugin_callback_data_create()");
+	data->commands = list_create();
+	return data;
+}
+
+void plugin_callback_data_destroy(struct plugin_callback_data* data)
+{
+	LOG_PLUGIN("plugin_callback_data_destroy()");
+	if (data->commands)
+	{
+		uhub_assert(list_size(data->commands) == 0);
+		list_destroy(data->commands);
+	}
+
+	hub_free(data);
+}
+
+static struct hub_user* convert_user_type(struct plugin_user* user)
+{
+	struct hub_user* huser = (struct hub_user*) user;
+	return huser;
+}
+
+static int cbfunc_send_message(struct plugin_handle* plugin, struct plugin_user* user, const char* message)
+{
+//	struct plugin_callback_data* data = get_callback_data(plugin);
+	char* buffer = adc_msg_escape(message);
+	struct adc_message* command = adc_msg_construct(ADC_CMD_IMSG, strlen(buffer) + 6);
+	adc_msg_add_argument(command, buffer);
+	route_to_user(plugin_get_hub(plugin), convert_user_type(user), command);
+	adc_msg_free(command);
+	hub_free(buffer);
+	return 1;
+}
+
+static int cbfunc_send_status(struct plugin_handle* plugin, struct plugin_user* user, int code, const char* message)
+{
+//	struct plugin_callback_data* data = get_callback_data(plugin);
+	char code_str[4];
+	char* buffer = adc_msg_escape(message);
+	struct adc_message* command = adc_msg_construct(ADC_CMD_ISTA, strlen(buffer) + 10);
+	snprintf(code_str, sizeof(code_str), "%03d", code);
+	adc_msg_add_argument(command, code_str);
+	adc_msg_add_argument(command, buffer);
+	route_to_user(plugin_get_hub(plugin), convert_user_type(user), command);
+	adc_msg_free(command);
+	hub_free(buffer);
+	return 1;
+}
+
+static int cbfunc_user_disconnect(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	// struct plugin_callback_data* data = get_callback_data(plugin);
+	hub_disconnect_user(plugin_get_hub(plugin), convert_user_type(user), quit_kicked);
+	return 0;
+}
+
+static int cbfunc_command_add(struct plugin_handle* plugin, struct plugin_command_handle* cmdh)
+{
+	struct plugin_callback_data* data = get_callback_data(plugin);
+	struct command_handle* command = (struct command_handle*) hub_malloc_zero(sizeof(struct command_handle));
+
+	command->prefix = cmdh->prefix;
+	command->length = cmdh->length;
+	command->args = cmdh->args;
+	command->cred = cmdh->cred;
+	command->description = cmdh->description;
+	command->origin = cmdh->origin;
+	command->handler = plugin_command_dispatch;
+
+	cmdh->internal_handle = command;
+	list_append(data->commands, cmdh);
+	command_add(plugin_get_hub(plugin)->commands, command, (void*) plugin);
+	printf("*** Add plugin command: %s (%p, %p)\n", command->prefix, command, cmdh);
+	return 0;
+}
+
+static int cbfunc_command_del(struct plugin_handle* plugin, struct plugin_command_handle* cmdh)
+{
+	struct plugin_callback_data* data = get_callback_data(plugin);
+	struct command_handle* command = (struct command_handle*) cmdh->internal_handle;
+
+	printf("*** Del plugin command: %s (%p, %p)\n", command->prefix, command, cmdh);
+	list_remove(data->commands, cmdh);
+	command_del(plugin_get_hub(plugin)->commands, command);
+	hub_free(command);
+	cmdh->internal_handle = NULL;
+	return 0;
+}
+
+
+void plugin_register_callback_functions(struct plugin_handle* handle)
+{
+	handle->hub.send_message = cbfunc_send_message;
+	handle->hub.send_status_message = cbfunc_send_status;
+	handle->hub.user_disconnect = cbfunc_user_disconnect;
+	handle->hub.command_add = cbfunc_command_add;
+	handle->hub.command_del = cbfunc_command_del;
+}
+
+void plugin_unregister_callback_functions(struct plugin_handle* handle)
+{
+}

src/core/plugincallback.h

@@ -0,0 +1,32 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef HAVE_UHUB_PLUGIN_CALLBACK_H
+#define HAVE_UHUB_PLUGIN_CALLBACK_H
+
+struct plugin_handle;
+struct uhub_plugin;
+
+extern struct plugin_callback_data* plugin_callback_data_create();
+extern void plugin_callback_data_destroy(struct plugin_callback_data* data);
+
+extern void plugin_register_callback_functions(struct plugin_handle* plugin);
+extern void plugin_unregister_callback_functions(struct plugin_handle* plugin);
+
+#endif /* HAVE_UHUB_PLUGIN_CALLBACK_H */

src/core/plugininvoke.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -20,7 +20,7 @@
 #include "uhub.h"
 #include "plugin_api/handle.h"
 
-#define PLUGIN_DEBUG(hub, name) printf("Invoke %s on %d plugins\n",name, (int) (hub->plugins ? list_size(hub->plugins->loaded) : -1));
+#define PLUGIN_DEBUG(hub, name) LOG_PLUGIN("Invoke %s on %d plugins", name, (int) (hub->plugins ? list_size(hub->plugins->loaded) : -1));
 
 
 #define INVOKE(HUB, FUNCNAME, CODE) \
@@ -74,14 +74,10 @@
 #define PLUGIN_INVOKE_3(HUB, FUNCNAME, ARG1, ARG2, ARG3) INVOKE(HUB, FUNCNAME, { plugin->funcs.FUNCNAME(plugin, ARG1, ARG2, ARG3); })
 
 
-static void convert_user_type(struct plugin_user* puser, struct hub_user* user)
+static struct plugin_user* convert_user_type(struct hub_user* user)
 {
-	puser->sid  = user->id.sid;
-	puser->nick = user->id.nick;
-	puser->cid  = user->id.cid;
-	puser->user_agent = user->user_agent;
-	puser->addr = user->id.addr;
-	puser->credentials = user->credentials;
+	struct plugin_user* puser = (struct plugin_user*) user;
+	return puser;
 }
 
 plugin_st plugin_check_ip_early(struct hub_info* hub, struct ip_addr_encap* addr)
@@ -106,85 +102,78 @@ void plugin_log_connection_denied(struct hub_info* hub, struct ip_addr_encap* ip
 
 void plugin_log_user_login_success(struct hub_info* hub, struct hub_user* who)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_1(hub, on_user_login, &user);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_1(hub, on_user_login, user);
 }
 
 void plugin_log_user_login_error(struct hub_info* hub, struct hub_user* who, const char* reason)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_2(hub, on_user_login_error, &user, reason);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_2(hub, on_user_login_error, user, reason);
 }
 
 void plugin_log_user_logout(struct hub_info* hub, struct hub_user* who, const char* reason)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_2(hub, on_user_logout, &user, reason);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_2(hub, on_user_logout, user, reason);
 }
 
 void plugin_log_user_nick_change(struct hub_info* hub, struct hub_user* who, const char* new_nick)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_2(hub, on_user_nick_change, &user, new_nick);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_2(hub, on_user_nick_change, user, new_nick);
 }
 
 void plugin_log_user_update_error(struct hub_info* hub, struct hub_user* who, const char* reason)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_2(hub, on_user_update_error, &user, reason);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_2(hub, on_user_update_error, user, reason);
 }
 
 void plugin_log_chat_message(struct hub_info* hub, struct hub_user* who, const char* message, int flags)
 {
-	struct plugin_user user;
-	convert_user_type(&user, who);
-	PLUGIN_INVOKE_3(hub, on_user_chat_message, &user, message, flags);
+	struct plugin_user* user = convert_user_type(who);
+	PLUGIN_INVOKE_3(hub, on_user_chat_message, user, message, flags);
 }
 
 plugin_st plugin_handle_chat_message(struct hub_info* hub, struct hub_user* from, const char* message, int flags)
 {
-	struct plugin_user user;
-	convert_user_type(&user, from);
-	PLUGIN_INVOKE_STATUS_2(hub, on_chat_msg, &user, message);
+	struct plugin_user* user = convert_user_type(from);
+	PLUGIN_INVOKE_STATUS_2(hub, on_chat_msg, user, message);
 }
 
 plugin_st plugin_handle_private_message(struct hub_info* hub, struct hub_user* from, struct hub_user* to, const char* message, int flags)
 {
-	struct plugin_user user1;
-	struct plugin_user user2;
-	convert_user_type(&user1, from);
-	convert_user_type(&user2, to);
-	PLUGIN_INVOKE_STATUS_3(hub, on_private_msg, &user1, &user2, message);
+	struct plugin_user* user1 = convert_user_type(from);
+	struct plugin_user* user2 = convert_user_type(to);
+	PLUGIN_INVOKE_STATUS_3(hub, on_private_msg, user1, user2, message);
 }
 
 plugin_st plugin_handle_search(struct hub_info* hub, struct hub_user* from, const char* data)
 {
-	struct plugin_user user;
-	convert_user_type(&user, from);
-	PLUGIN_INVOKE_STATUS_2(hub, on_search, &user, data);
+	struct plugin_user* user = convert_user_type(from);
+	PLUGIN_INVOKE_STATUS_2(hub, on_search, user, data);
+}
+
+plugin_st plugin_handle_search_result(struct hub_info* hub, struct hub_user* from, struct hub_user* to, const char* data)
+{
+	struct plugin_user* user1 = convert_user_type(from);
+	struct plugin_user* user2 = convert_user_type(to);
+	PLUGIN_INVOKE_STATUS_3(hub, on_search_result, user1, user2, data);
 }
 
 plugin_st plugin_handle_connect(struct hub_info* hub, struct hub_user* from, struct hub_user* to)
 {
-	struct plugin_user user1;
-	struct plugin_user user2;
-	convert_user_type(&user1, from);
-	convert_user_type(&user2, to);
-	PLUGIN_INVOKE_STATUS_2(hub, on_p2p_connect, &user1, &user2);
+	struct plugin_user* user1 = convert_user_type(from);
+	struct plugin_user* user2 = convert_user_type(to);
+	PLUGIN_INVOKE_STATUS_2(hub, on_p2p_connect, user1, user2);
 }
 
 plugin_st plugin_handle_revconnect(struct hub_info* hub, struct hub_user* from, struct hub_user* to)
 {
-	struct plugin_user user1;
-	struct plugin_user user2;
-	convert_user_type(&user1, from);
-	convert_user_type(&user2, to);
-	PLUGIN_INVOKE_STATUS_2(hub, on_p2p_revconnect, &user1, &user2);
+	struct plugin_user* user1 = convert_user_type(from);
+	struct plugin_user* user2 = convert_user_type(to);
+	PLUGIN_INVOKE_STATUS_2(hub, on_p2p_revconnect, user1, user2);
 }
 
 plugin_st plugin_auth_get_user(struct hub_info* hub, const char* nickname, struct auth_info* info)

src/core/plugininvoke.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -23,8 +23,6 @@
 #include "uhub.h"
 #include "plugin_api/handle.h"
 
-#ifdef PLUGIN_SUPPORT
-
 struct hub_info;
 struct ip_addr_encap;
 
@@ -52,6 +50,7 @@ plugin_st plugin_handle_private_message(struct hub_info* hub, struct hub_user* f
 
 /* Handle searches */
 plugin_st plugin_handle_search(struct hub_info* hub, struct hub_user* user, const char* data);
+plugin_st plugin_handle_search_result(struct hub_info* hub, struct hub_user* from, struct hub_user* to, const char* data);
 
 /* Handle p2p connections */
 plugin_st plugin_handle_connect(struct hub_info* hub, struct hub_user* from, struct hub_user* to);
@@ -63,7 +62,5 @@ plugin_st plugin_auth_register_user(struct hub_info* hub, struct auth_info* user
 plugin_st plugin_auth_update_user(struct hub_info* hub, struct auth_info* user);
 plugin_st plugin_auth_delete_user(struct hub_info* hub, struct auth_info* user);
 
-#endif
-
 #endif // HAVE_UHUB_PLUGIN_INVOKE_H
 

src/core/pluginloader.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -19,40 +19,74 @@
 
 #include "uhub.h"
 
-#ifdef PLUGIN_SUPPORT
 #include "plugin_api/handle.h"
 
+struct plugin_callback_data;
+
+struct plugin_hub_internals
+{
+	struct hub_info* hub;
+	plugin_unregister_f unregister;             /* The unregister function. */
+	struct plugin_callback_data* callback_data; /* callback data that is unique for the plugin */
+};
+
+static struct plugin_hub_internals* get_internals(struct plugin_handle* handle)
+{
+	struct plugin_hub_internals* internals;
+	assert(handle && handle->handle && handle->handle->internals);
+	internals = (struct plugin_hub_internals*) handle->handle->internals;
+	return internals;
+}
+
 struct uhub_plugin* plugin_open(const char* filename)
 {
-	LOG_TRACE("plugin_open: \"%s\"", filename);
-#ifdef HAVE_DLOPEN
-	struct uhub_plugin* plugin = (struct uhub_plugin*) hub_malloc_zero(sizeof(struct uhub_plugin));
+	struct uhub_plugin* plugin;
+	LOG_PLUGIN("plugin_open: \"%s\"", filename);
+
+	plugin = (struct uhub_plugin*) hub_malloc_zero(sizeof(struct uhub_plugin));
 	if (!plugin)
 	{
 		return 0;
 	}
 
+#ifdef HAVE_DLOPEN
 	plugin->handle = dlopen(filename, RTLD_LAZY);
+#else
+	plugin->handle = LoadLibraryExA(filename, NULL, 0);
+#endif
 
 	if (!plugin->handle)
 	{
+#ifdef HAVE_DLOPEN
 		LOG_ERROR("Unable to open plugin %s: %s", filename, dlerror());
+#else
+		LOG_ERROR("Unable to open plugin %s: %d", filename, GetLastError());
+#endif
 		hub_free(plugin);
 		return 0;
 	}
 
+	plugin->filename = strdup(filename);
+	plugin->internals = hub_malloc_zero(sizeof(struct plugin_hub_internals));
 	return plugin;
-#else
-	return 0;
-#endif
 }
 
 void plugin_close(struct uhub_plugin* plugin)
 {
+	struct plugin_hub_internals* internals = (struct plugin_hub_internals*) plugin->internals;
+
+	LOG_PLUGIN("plugin_close: \"%s\"", plugin->filename);
+	plugin_callback_data_destroy(internals->callback_data);
+	hub_free(internals);
+	plugin->internals = NULL;
+
 #ifdef HAVE_DLOPEN
 	dlclose(plugin->handle);
-	hub_free(plugin);
+#else
+	FreeLibrary((HMODULE) plugin->handle);
 #endif
+	hub_free(plugin->filename);
+	hub_free(plugin);
 }
 
 void* plugin_lookup_symbol(struct uhub_plugin* plugin, const char* symbol)
@@ -61,17 +95,21 @@ void* plugin_lookup_symbol(struct uhub_plugin* plugin, const char* symbol)
 	void* addr = dlsym(plugin->handle, symbol);
 	return addr;
 #else
-	return 0;
+	FARPROC addr = GetProcAddress((HMODULE) plugin->handle, symbol);
+	return (void*) addr;
 #endif
 }
 
-struct plugin_handle* plugin_load(const char* filename, const char* config)
+
+
+struct plugin_handle* plugin_load(const char* filename, const char* config, struct hub_info* hub)
 {
 	plugin_register_f register_f;
 	plugin_unregister_f unregister_f;
 	int ret;
-	struct plugin_handle* handle = hub_malloc_zero(sizeof(struct plugin_handle));
+	struct plugin_handle* handle = (struct plugin_handle*) hub_malloc_zero(sizeof(struct plugin_handle));
 	struct uhub_plugin* plugin = plugin_open(filename);
+	struct plugin_hub_internals* internals = (struct plugin_hub_internals*) plugin->internals;
 
 	if (!plugin)
 		return NULL;
@@ -86,6 +124,14 @@ struct plugin_handle* plugin_load(const char* filename, const char* config)
 	register_f = plugin_lookup_symbol(plugin, "plugin_register");
 	unregister_f = plugin_lookup_symbol(plugin, "plugin_unregister");
 
+	// register hub internals
+	internals->unregister = unregister_f;
+	internals->hub = hub;
+	internals->callback_data = plugin_callback_data_create();
+
+	// setup callback functions, where the plugin can contact the hub.
+	plugin_register_callback_functions(handle);
+
 	if (register_f && unregister_f)
 	{
 		ret = register_f(handle, config);
@@ -94,8 +140,7 @@ struct plugin_handle* plugin_load(const char* filename, const char* config)
 			if (handle->plugin_api_version == PLUGIN_API_VERSION && handle->plugin_funcs_size == sizeof(struct plugin_funcs))
 			{
 				LOG_INFO("Loaded plugin: %s: %s, version %s.", filename, handle->name, handle->version);
-				LOG_TRACE("Plugin API version: %d (func table size: " PRINTF_SIZE_T ")", handle->plugin_api_version, handle->plugin_funcs_size);
-				plugin->unregister = unregister_f;
+				LOG_PLUGIN("Plugin API version: %d (func table size: " PRINTF_SIZE_T ")", handle->plugin_api_version, handle->plugin_funcs_size);
 				return handle;
 			}
 			else
@@ -116,15 +161,19 @@ struct plugin_handle* plugin_load(const char* filename, const char* config)
 
 void plugin_unload(struct plugin_handle* plugin)
 {
-	plugin->handle->unregister(plugin);
+	struct plugin_hub_internals* internals = get_internals(plugin);
+	plugin_unregister_callback_functions(plugin);
+	internals->unregister(plugin);
 	plugin_close(plugin->handle);
+	hub_free(plugin);
 }
 
 static int plugin_parse_line(char* line, int line_count, void* ptr_data)
 {
-	struct uhub_plugins* handle = (struct uhub_plugins*) ptr_data;
-	struct plugin_handle* plugin;
+	struct hub_info* hub = (struct hub_info*) ptr_data;
+	struct uhub_plugins* handle = hub->plugins;
 	struct cfg_tokens* tokens = cfg_tokenize(line);
+	struct plugin_handle* plugin;
 	char *directive, *soname, *params;
 
 	if (cfg_token_count(tokens) == 0)
@@ -148,8 +197,8 @@ static int plugin_parse_line(char* line, int line_count, void* ptr_data)
 		if (!params)
 			params = "";
 
-		LOG_TRACE("Load plugin: \"%s\", params=\"%s\"", soname, params);
-		plugin = plugin_load(soname, params);
+		LOG_PLUGIN("Load plugin: \"%s\", params=\"%s\"", soname, params);
+		plugin = plugin_load(soname, params, hub);
 		if (plugin)
 		{
 			list_append(handle->loaded, plugin);
@@ -162,12 +211,12 @@ static int plugin_parse_line(char* line, int line_count, void* ptr_data)
 	return -1;
 }
 
-int plugin_initialize(struct hub_config* config, struct uhub_plugins* handle)
+int plugin_initialize(struct hub_config* config, struct hub_info* hub)
 {
 	int ret;
 
-	handle->loaded = list_create();
-	if (!handle->loaded)
+	hub->plugins->loaded = list_create();
+	if (!hub->plugins->loaded)
 		return -1;
 
 	if (config)
@@ -175,10 +224,15 @@ int plugin_initialize(struct hub_config* config, struct uhub_plugins* handle)
 		if (!*config->file_plugins)
 			return 0;
 
-		ret = file_read_lines(config->file_plugins, handle, &plugin_parse_line);
+		ret = file_read_lines(config->file_plugins, hub, &plugin_parse_line);
 		if (ret == -1)
+		{
+			list_clear(hub->plugins->loaded, hub_free);
+			list_destroy(hub->plugins->loaded);
+			hub->plugins->loaded = 0;
 			return -1;
 		}
+	}
 	return 0;
 }
 
@@ -195,4 +249,10 @@ void plugin_shutdown(struct uhub_plugins* handle)
 	list_destroy(handle->loaded);
 }
 
-#endif /* PLUGIN_SUPPORT */
+// Used internally only
+struct hub_info* plugin_get_hub(struct plugin_handle* plugin)
+{
+	struct plugin_hub_internals* data = get_internals(plugin);
+	return data->hub;
+}
+

src/core/pluginloader.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -23,6 +23,7 @@
 #include "plugin_api/handle.h"
 
 struct hub_config;
+struct hub_info;
 struct linked_list;
 struct plugin_handle;
 
@@ -30,6 +31,8 @@ struct uhub_plugin
 {
 	void* handle;
 	plugin_unregister_f unregister;
+	char* filename;
+	void* internals;      // Hub internal stuff
 };
 
 struct uhub_plugins
@@ -38,11 +41,11 @@ struct uhub_plugins
 };
 
 // High level plugin loader ode
-extern struct plugin_handle* plugin_load(const char* filename, const char* config);
+extern struct plugin_handle* plugin_load(const char* filename, const char* config, struct hub_info* hub);
 extern void plugin_unload(struct plugin_handle* plugin);
 
 // extern void plugin_unload(struct plugin_handle*);
-extern int plugin_initialize(struct hub_config* config, struct uhub_plugins* handle);
+extern int plugin_initialize(struct hub_config* config, struct hub_info* hub);
 extern void plugin_shutdown(struct uhub_plugins* handle);
 
 // Low level plugin loader code (used internally)
@@ -50,5 +53,8 @@ extern struct uhub_plugin* plugin_open(const char* filename);
 extern void plugin_close(struct uhub_plugin*);
 extern void* plugin_lookup_symbol(struct uhub_plugin*, const char* symbol);
 
+// Used internally only
+extern struct hub_info* plugin_get_hub(struct plugin_handle*);
+
 #endif /* HAVE_UHUB_PLUGIN_LOADER_H */
 

src/core/probe.c

@@ -50,6 +50,17 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				if (probe->hub->config->tls_enable && probe->hub->config->tls_require)
 				{
 					LOG_TRACE("Not TLS connection - closing connection.");
+					if (*probe->hub->config->tls_require_redirect_addr)
+					{
+						char buf[512];
+						ssize_t len = snprintf(buf, sizeof(buf), "ISUP " ADC_PROTO_SUPPORT "\nISID AAAB\nIINF NIRedirecting...\nIQUI AAAB RD%s\n", probe->hub->config->tls_require_redirect_addr);
+						net_con_send(con, buf, (size_t) len);
+						LOG_TRACE("Not TLS connection - Redirecting to %s.", probe->hub->config->tls_require_redirect_addr);
+					}
+					else
+					{
+						LOG_TRACE("Not TLS connection - closing connection.");
+					}
 				}
 				else
 #endif
@@ -60,9 +71,8 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				probe_destroy(probe);
 				return;
 			}
-
 #ifdef SSL_SUPPORT
-			if (bytes >= 11 &&
+			else if (bytes >= 11 &&
 				probe_recvbuf[0] == 22 && 
 				probe_recvbuf[1] == 3 && /* protocol major version */
 				probe_recvbuf[5] == 1 && /* message type */
@@ -82,20 +92,14 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				{
 					LOG_TRACE("Probed TLS %d.%d connection. TLS disabled in hub.", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
 				}
-				probe_destroy(probe);
-				return;
 			}
 			else
 			{
-				LOG_TRACE("Probed TLS %d.%d connection", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
-
-				net_con_ssl_handshake(con, net_con_ssl_mode_server, probe->hub->ssl_ctx);
-				return;
+				LOG_TRACE("Probed unsupported protocol: %x%x%x%x.", (int) probe_recvbuf[0], (int) probe_recvbuf[1], (int) probe_recvbuf[2], (int) probe_recvbuf[3]);
 			}
-#else
+#endif
 			probe_destroy(probe);
 			return;
-#endif
 		}
 	}
 }
@@ -107,6 +111,8 @@ struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_enca
 	if (probe == NULL)
 		return NULL; /* OOM */
 
+	LOG_TRACE("probe_create(): %p", probe);
+
 	probe->hub = hub;
 	probe->connection = net_con_create();
 	net_con_initialize(probe->connection, sd, probe_net_event, probe, NET_EVENT_READ);
@@ -118,6 +124,7 @@ struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_enca
 
 void probe_destroy(struct hub_probe* probe)
 {
+	LOG_TRACE("probe_destroy(): %p (connection=%p)", probe, probe->connection);
 	if (probe->connection)
 	{
 		net_con_close(probe->connection);

src/core/user.c

@@ -71,6 +71,12 @@ void user_destroy(struct hub_user* user)
 	hub_recvq_destroy(user->recv_queue);
 	hub_sendq_destroy(user->send_queue);
 
+	if (user->connection)
+	{
+		LOG_TRACE("user_destory() -> net_con_close(%p)", user->connection);
+		net_con_close(user->connection);
+	}
+
 	adc_msg_free(user->info);
 	user_clear_feature_cast_support(user);
 	hub_free(user);
@@ -175,6 +181,10 @@ static int convert_support_fourcc(int fourcc)
 		case FOURCC('A','D','C','S'):
 			return feature_adcs;
 
+		// ignore these extensions, they are not useful for the hub.
+		case FOURCC('D','H','T','0'):
+			return 0;
+
 		default:
 			LOG_DEBUG("Unknown extension: %x", fourcc);
 			return 0;

src/core/user.h

@@ -82,8 +82,9 @@ extern const char* user_get_quit_reason_string(enum user_quit_reason);
 struct hub_user_info
 {
 	sid_t sid;                    /** session ID */
-	char cid[MAX_CID_LEN+1];      /** global client ID */
 	char nick[MAX_NICK_LEN+1];    /** User's nick name */
+	char cid[MAX_CID_LEN+1];      /** global client ID */
+	char user_agent[MAX_UA_LEN+1];/** User agent string */
 	struct ip_addr_encap addr;    /** User's IP address */
 };
 
@@ -105,11 +106,10 @@ struct hub_user_limits
 
 struct hub_user
 {
-	enum user_state         state;              /** see enum user_state */
-	enum auth_credentials   credentials;        /** see enum user_credentials */
 	struct hub_user_info    id;                 /** Contains nick name and CID */
+	enum auth_credentials   credentials;        /** see enum user_credentials */
+	enum user_state         state;              /** see enum user_state */
 	uint32_t                flags;              /** see enum user_features */
-	char                    user_agent[MAX_UA_LEN+1];/** User agent string */
 	struct linked_list*     feature_cast;       /** Features supported by feature cast */
 	struct adc_message*     info;               /** ADC 'INF' message (broadcasted to everyone joining the hub) */
 	struct hub_info*        hub;                /** The hub instance this user belong to */

src/network/backend.c

@@ -72,7 +72,7 @@ static net_backend_init_t net_backend_init_funcs[] = {
 int net_backend_init()
 {
 	size_t n;
-	g_backend = hub_malloc_zero(sizeof(struct net_backend));
+	g_backend = (struct net_backend*) hub_malloc_zero(sizeof(struct net_backend));
 	g_backend->common.num = 0;
 	g_backend->common.max = net_get_max_sockets();
 	g_backend->now = time(0);
@@ -179,6 +179,14 @@ void net_con_close(struct net_connection* con)
 
 	g_backend->handler.con_del(g_backend->data, con);
 
+#ifdef SSL_SUPPORT
+	if (con->ssl)
+	{
+		SSL_shutdown(con->ssl);
+		SSL_clear(con->ssl);
+	}
+#endif
+
 	net_close(con->sd);
 	con->sd = -1;
 
@@ -196,6 +204,7 @@ struct net_cleanup_handler* net_cleanup_initialize(size_t max)
 
 void net_cleanup_shutdown(struct net_cleanup_handler* handler)
 {
+	net_cleanup_process(handler);
 	hub_free(handler->queue);
 	hub_free(handler);
 }
@@ -213,7 +222,7 @@ void net_cleanup_process(struct net_cleanup_handler* handler)
 	{
 		struct net_connection* con = handler->queue[n];
 		LOG_TRACE("net_cleanup_process: free: %p", con);
-		hub_free(con);
+		net_con_destroy(con);
 	}
 	handler->num = 0;
 }

src/network/connection.c

@@ -70,7 +70,6 @@ static int handle_openssl_error(struct net_connection* con, int ret)
 			con->ssl_state = tls_st_error;
 			return -1;
 	}
-
 	return -1;
 }
 
@@ -123,6 +122,11 @@ ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode
 	if (ssl_mode == net_con_ssl_mode_server)
 	{
 		ssl = SSL_new(ssl_ctx);
+		if (!ssl)
+		{
+			LOG_ERROR("Unable to create new SSL stream\n");
+			return -1;
+		}
 		SSL_set_fd(ssl, con->sd);
 		net_con_set_ssl(con, ssl);
 		return net_con_ssl_accept(con);
@@ -137,6 +141,10 @@ ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode
 }
 #endif /* SSL_SUPPORT */
 
+#ifdef SSL_SUPPORT
+void net_stats_add_tx(size_t bytes);
+void net_stats_add_rx(size_t bytes);
+#endif
 
 ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
 {
@@ -148,7 +156,13 @@ ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
 		ret = net_send(con->sd, buf, len, UHUB_SEND_SIGNAL);
 		if (ret == -1)
 		{
-			if (net_error() == EWOULDBLOCK || net_error() == EINTR)
+			if (
+#ifdef WINSOCK
+				net_error() == WSAEWOULDBLOCK
+#else
+				net_error() == EWOULDBLOCK 
+#endif
+				|| net_error() == EINTR)
 				return 0;
 			return -1;
 		}
@@ -161,7 +175,11 @@ ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
 		LOG_PROTO("SSL_write(con=%p, buf=%p, len=" PRINTF_SIZE_T ") => %d", con, buf, len, ret);
 		if (ret <= 0)
 		{
-			return -handle_openssl_error(con, ret);
+			return handle_openssl_error(con, ret);
+		}
+		else
+		{
+			 net_stats_add_tx(ret);
 		}
 	}
 #endif
@@ -178,7 +196,13 @@ ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 		ret = net_recv(con->sd, buf, len, 0);
 		if (ret == -1)
 		{
-			if (net_error() == EWOULDBLOCK || net_error() == EINTR)
+			if (
+#ifdef WINSOCK
+				net_error() == WSAEWOULDBLOCK
+#else
+				net_error() == EWOULDBLOCK
+#endif
+				|| net_error() == EINTR)
 				return 0;
 			return -net_error();
 		}
@@ -198,10 +222,11 @@ ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 		if (ret > 0)
 		{
 			net_con_update(con, NET_EVENT_READ);
+			net_stats_add_rx(ret);
 		}
 		else
 		{
-			return -handle_openssl_error(con, ret);
+			return handle_openssl_error(con, ret);
 		}
 	}
 #endif
@@ -213,7 +238,13 @@ ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len)
 	int ret = net_recv(con->sd, buf, len, MSG_PEEK);
 	if (ret == -1)
 	{
-		if (net_error() == EWOULDBLOCK || net_error() == EINTR)
+		if (
+#ifdef WINSOCK
+				net_error() == WSAEWOULDBLOCK
+#else
+				net_error() == EWOULDBLOCK 
+#endif
+				|| net_error() == EINTR)
 			return 0;
 		return -net_error();
 	}
@@ -251,6 +282,9 @@ void* net_con_get_ptr(struct net_connection* con)
 
 void net_con_destroy(struct net_connection* con)
 {
+#ifdef SSL_SUPPORT
+	SSL_free(con->ssl);
+#endif
 	hub_free(con);
 }
 

src/network/network.c

@@ -62,7 +62,6 @@ int net_initialize()
 		LOG_TRACE("Initializing OpenSSL...");
 		SSL_library_init();
 		SSL_load_error_strings();
-		OpenSSL_add_all_algorithms();
 #endif /*  SSL_SUPPORT */
 
 		net_initialized = 1;
@@ -101,7 +100,9 @@ int net_destroy()
 		net_backend_shutdown();
 		
 #ifdef SSL_SUPPORT
-		/* FIXME: Shutdown OpenSSL here. */
+		ERR_free_strings();
+		EVP_cleanup();
+		CRYPTO_cleanup_all_ex_data();
 #endif
 
 #ifdef WINSOCK
@@ -371,8 +372,13 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
 			case EOPNOTSUPP:
 				errno = EWOULDBLOCK;
 #endif
+#ifdef WINSOCK
+			case WSAEWOULDBLOCK:
+				break;
+#else
 			case EWOULDBLOCK:
 				break;
+#endif
 			default:
 				net_error_out(fd, "net_accept");
 				net_stats_add_error();
@@ -418,7 +424,11 @@ int net_connect(int fd, const struct sockaddr *serv_addr, socklen_t addrlen)
 	int ret = connect(fd, serv_addr, addrlen);
 	if (ret == -1)
 	{
+#ifdef WINSOCK
+		if (net_error() != WSAEINPROGRESS)
+#else
 		if (net_error() != EINPROGRESS)
+#endif
 		{
 			net_error_out(fd, "net_connect");
 			net_stats_add_error();
@@ -684,7 +694,11 @@ ssize_t net_recv(int fd, void* buf, size_t len, int flags)
 	}
 	else
 	{
+#ifdef WINSOCK
+		if (net_error() != WSAEWOULDBLOCK)
+#else
 		if (net_error() != EWOULDBLOCK)
+#endif
 		{
 			/* net_error_out(fd, "net_recv"); */
 			net_stats_add_error();
@@ -703,7 +717,11 @@ ssize_t net_send(int fd, const void* buf, size_t len, int flags)
 	}
 	else
 	{
+#ifdef WINSOCK
+		if (net_error() != WSAEWOULDBLOCK)
+#else
 		if (net_error() != EWOULDBLOCK)
+#endif
 		{
 			/* net_error_out(fd, "net_send"); */
 			net_stats_add_error();

src/network/network.h

@@ -254,46 +254,4 @@ extern void net_stats_add_close();
 extern int net_stats_timeout();
 extern void net_stats_get(struct net_statistics** intermediate, struct net_statistics** total);
 
-
-#if defined(WINSOCK) && !defined(__CYGWIN__) && !defined(_MSC_VER)
-
-#define EWOULDBLOCK     WSAEWOULDBLOCK
-#define EINPROGRESS     WSAEINPROGRESS
-#define EALREADY        WSAEALREADY
-#define ENOTSOCK        WSAENOTSOCK
-#define EDESTADDRREQ    WSAEDESTADDRREQ
-#define EMSGSIZE        WSAEMSGSIZE
-#define EPROTOTYPE      WSAEPROTOTYPE
-#define ENOPROTOOPT     WSAENOPROTOOPT
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP      WSAEOPNOTSUPP
-#define EPFNOSUPPORT    WSAEPFNOSUPPORT
-#define EAFNOSUPPORT    WSAEAFNOSUPPORT
-#define EADDRINUSE      WSAEADDRINUSE
-#define EADDRNOTAVAIL   WSAEADDRNOTAVAIL
-#define ENETDOWN        WSAENETDOWN
-#define ENETUNREACH     WSAENETUNREACH
-#define ENETRESET       WSAENETRESET
-#define ECONNABORTED    WSAECONNABORTED
-#define ECONNRESET      WSAECONNRESET
-#define ENOBUFS         WSAENOBUFS
-#define EISCONN         WSAEISCONN
-#define ENOTCONN        WSAENOTCONN
-#define ESHUTDOWN       WSAESHUTDOWN
-#define ETOOMANYREFS    WSAETOOMANYREFS
-#define ETIMEDOUT       WSAETIMEDOUT
-#define ECONNREFUSED    WSAECONNREFUSED
-#define ELOOP           WSAELOOP
-#define EHOSTDOWN       WSAEHOSTDOWN
-#define EHOSTUNREACH    WSAEHOSTUNREACH
-#define EPROCLIM        WSAEPROCLIM
-#define EUSERS          WSAEUSERS
-#define EDQUOT          WSAEDQUOT
-#define ESTALE          WSAESTALE
-#define EREMOTE         WSAEREMOTE
-
-#endif /* WINSOCK && !__CYGWIN__ */
-
-
 #endif /* HAVE_UHUB_NETWORK_H */

src/plugin_api/command_api.h

@@ -0,0 +1,79 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2010, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef HAVE_UHUB_PLUGIN_API_H
+#define HAVE_UHUB_PLUGIN_API_H
+
+/**
+ * This file describes the interface a plugin implementation may use from
+ * uhub.
+ */
+
+#include "system.h"
+#include "plugin_api/types.h"
+
+struct plugin_command
+{
+	const char* message;
+	const char* prefix;
+	struct linked_list* args;
+};
+
+typedef int (*plugin_command_handler)(struct plugin_handle*, struct plugin_user* to, struct plugin_command*);
+
+struct plugin_command_handle
+{
+	void* internal_handle;			/**<<< "Internal used by the hub only" */
+	struct plugin_handle* handle;	/**<<< "The plugin handle this is associated with" */
+	const char* prefix;				/**<<< "Command prefix, for instance 'help' would be the prefix for the !help command." */
+	size_t length;					/**<<< "Length of the prefix" */
+	const char* args;				/**<<< "Argument codes" */
+	enum auth_credentials cred;		/**<<< "Minimum access level for the command" */
+	plugin_command_handler handler;	/**<<< "Function pointer for the command" */
+	const char* description;		/**<<< "Description for the command" */
+	const char* origin;				/**<<< "Name of plugin where the command originated." */
+};
+
+#define PLUGIN_COMMAND_INITIALIZE(PTR, HANDLE, PREFIX, ARGS, CRED, CALLBACK, DESC) \
+	do { \
+		PTR->internal_handle = 0; \
+		PTR->handle = HANDLE; \
+		PTR->prefix = PREFIX; \
+		PTR->length = strlen(PREFIX); \
+		PTR->args = ARGS; \
+		PTR->cred = CRED; \
+		PTR->handler = CALLBACK; \
+		PTR->description = DESC; \
+	} while (0)
+
+extern int plugin_command_add(struct plugin_handle*, struct plugin_command_handle*);
+extern int plugin_command_del(struct plugin_handle*, struct plugin_command_handle*);
+
+/**
+ * Send a message to a user.
+ * From the user's perspective the message will originate from the hub.
+ */
+extern int plugin_command_send_message(struct plugin_handle*, struct plugin_user* to, const char* message);
+
+/**
+ * Send a reply to a command.
+ */
+extern int plugin_command_send_reply(struct plugin_handle*, struct plugin_user* user, struct plugin_command* command, const char* message);
+
+#endif /* HAVE_UHUB_PLUGIN_API_H */

src/plugin_api/handle.h

@@ -20,73 +20,19 @@
 #ifndef HAVE_UHUB_PLUGIN_HANDLE_H
 #define HAVE_UHUB_PLUGIN_HANDLE_H
 
+/**
+ * This file describes the interface a uhub uses to interact with plugins.
+ */
+
 #include "system.h"
 #include "util/credentials.h"
 #include "util/ipcalc.h"
-
-#define PLUGIN_API_VERSION 1
-
-#ifndef MAX_NICK_LEN
-#define MAX_NICK_LEN 64
-#endif
-
-#ifndef MAX_PASS_LEN
-#define MAX_PASS_LEN 64
-#endif
-
-#ifndef MAX_CID_LEN
-#define MAX_CID_LEN 39
-#endif
-
-
-struct plugin_handle;
-
-struct plugin_user
-{
-	unsigned int sid;
-	const char* nick;
-	const char* cid;
-	const char* user_agent;
-	struct ip_addr_encap addr;
-	enum auth_credentials credentials;
-};
-
-enum plugin_status
-{
-	st_default = 0,    /* Use default */
-	st_allow = 1,      /* Allow action */
-	st_deny = -1,      /* Deny action */
-};
-
-typedef enum plugin_status plugin_st;
-
-struct auth_info
-{
-	char nickname[MAX_NICK_LEN+1];
-	char password[MAX_PASS_LEN+1];
-	enum auth_credentials credentials;
-};
-
-enum ban_flags
-{
-	ban_nickname = 0x01, /* Nickname is banned */
-	ban_cid      = 0x02, /* CID is banned */
-	ban_ip       = 0x04, /* IP address (range) is banned */
-};
-
-struct ban_info
-{
-	unsigned int flags;                 /* See enum ban_flags. */
-	char nickname[MAX_NICK_LEN+1];      /* Nickname - only defined if (ban_nickname & flags). */
-	char cid[MAX_CID_LEN+1];            /* CID - only defined if (ban_cid & flags). */
-	struct ip_addr_encap ip_addr_lo;    /* Low IP address of an IP range */
-	struct ip_addr_encap ip_addr_hi;    /* High IP address of an IP range */
-	time_t expiry;                      /* Time when the ban record expires */
-};
+#include "plugin_api/types.h"
 
 typedef plugin_st (*on_chat_msg_t)(struct plugin_handle*, struct plugin_user* from, const char* message);
 typedef plugin_st (*on_private_msg_t)(struct plugin_handle*, struct plugin_user* from, struct plugin_user* to, const char* message);
 typedef plugin_st (*on_search_t)(struct plugin_handle*, struct plugin_user* from, const char* data);
+typedef plugin_st (*on_search_result_t)(struct plugin_handle*, struct plugin_user* from, struct plugin_user* to, const char* data);
 typedef plugin_st (*on_p2p_connect_t)(struct plugin_handle*, struct plugin_user* from, struct plugin_user* to);
 typedef plugin_st (*on_p2p_revconnect_t)(struct plugin_handle*, struct plugin_user* from, struct plugin_user* to);
 
@@ -100,6 +46,11 @@ typedef void (*on_user_nick_change_t)(struct plugin_handle*, struct plugin_user*
 typedef void (*on_user_update_error_t)(struct plugin_handle*, struct plugin_user*, const char* reason);
 typedef void (*on_user_chat_msg_t)(struct plugin_handle*, struct plugin_user*, const char* message, int flags);
 
+typedef void (*on_hub_started_t)(struct plugin_handle*, struct plugin_hub_info*);
+typedef void (*on_hub_reloaded_t)(struct plugin_handle*, struct plugin_hub_info*);
+typedef void (*on_hub_shutdown_t)(struct plugin_handle*, struct plugin_hub_info*);
+typedef void (*on_hub_error_t)(struct plugin_handle*, struct plugin_hub_info*, const char* message);
+
 typedef plugin_st (*on_change_nick_t)(struct plugin_handle*, struct plugin_user*, const char* new_nick);
 
 typedef plugin_st (*on_check_ip_early_t)(struct plugin_handle*, struct ip_addr_encap*);
@@ -112,6 +63,9 @@ typedef plugin_st (*auth_register_user_t)(struct plugin_handle*, struct auth_inf
 typedef plugin_st (*auth_update_user_t)(struct plugin_handle*, struct auth_info* user);
 typedef plugin_st (*auth_delete_user_t)(struct plugin_handle*, struct auth_info* user);
 
+/**
+ * These are callbacks used for the hub to invoke functions in plugins.
+ */
 struct plugin_funcs
 {
 	// Log events for connections
@@ -126,10 +80,17 @@ struct plugin_funcs
 	on_user_update_error_t  on_user_update_error;/* A user has failed to update - nickname, etc. */
 	on_user_chat_msg_t      on_user_chat_message;/* A user has sent a public chat message */
 
+	// Log hub events
+	on_hub_started_t        on_hub_started;      /* Triggered just after plugins are loaded and the hub is started. */
+	on_hub_reloaded_t       on_hub_reloaded;     /* Triggered immediately after hub configuration is reloaded. */
+	on_hub_shutdown_t       on_hub_shutdown;     /* Triggered just before the hub is being shut down and before plugins are unloaded. */
+	on_hub_error_t          on_hub_error;        /* Triggered for log-worthy error messages */
+
 	// Activity events (can be intercepted and refused/accepted by a plugin)
 	on_chat_msg_t           on_chat_msg;         /* A public chat message is about to be sent (can be intercepted) */
 	on_private_msg_t        on_private_msg;      /* A public chat message is about to be sent (can be intercepted) */
 	on_search_t             on_search;           /* A search is about to be sent (can be intercepted) */
+	on_search_result_t      on_search_result;    /* A search result is about to be sent (can be intercepted) */
 	on_p2p_connect_t        on_p2p_connect;      /* A user is about to connect to another user (can be intercepted) */
 	on_p2p_revconnect_t     on_p2p_revconnect;   /* A user is about to connect to another user (can be intercepted) */
 
@@ -142,9 +103,30 @@ struct plugin_funcs
 	// Login check functions
 	on_check_ip_early_t     login_check_ip_early;
 	on_check_ip_late_t      login_check_ip_late;
-
 };
 
+struct plugin_command_handle;
+
+typedef int (*hfunc_send_message)(struct plugin_handle*, struct plugin_user* user, const char* message);
+typedef int (*hfunc_send_status)(struct plugin_handle*, struct plugin_user* to, int code, const char* message);
+typedef int (*hfunc_user_disconnect)(struct plugin_handle*, struct plugin_user* user);
+typedef int (*hfunc_command_add)(struct plugin_handle*, struct plugin_command_handle*);
+typedef int (*hfunc_command_del)(struct plugin_handle*, struct plugin_command_handle*);
+
+/**
+ * These are functions created and initialized by the hub and which can be used
+ * by plugins to access functionality internal to the hub.
+ */
+struct plugin_hub_funcs
+{
+	hfunc_send_message send_message;
+	hfunc_send_status send_status_message;
+	hfunc_user_disconnect user_disconnect;
+	hfunc_command_add command_add;
+	hfunc_command_del command_del;
+};
+
+
 struct plugin_handle
 {
 	struct uhub_plugin* handle;     /* Must NOT be modified by the plugin */
@@ -155,9 +137,11 @@ struct plugin_handle
 	const char* error_msg;          /* Error message for registration error. */
 	size_t plugin_api_version;      /* Plugin API version */
 	size_t plugin_funcs_size;       /* Size of the plugin funcs */
-	struct plugin_funcs funcs;
+	struct plugin_funcs funcs;      /* Table of functions that can be implemented by a plugin */
+	struct plugin_hub_funcs hub;    /* Table of core hub functions that can be used by a plugin */
 };
 
+
 #define PLUGIN_INITIALIZE(PTR, NAME, VERSION, DESCRIPTION) \
 	do { \
 		PTR->name = NAME; \
@@ -177,12 +161,12 @@ struct plugin_handle
  * @param config A configuration string
  * @return 0 on success, -1 on error.
  */
-extern int plugin_register(struct plugin_handle* handle, const char* config);
+PLUGIN_API int plugin_register(struct plugin_handle* handle, const char* config);
 
 /**
  * @return 0 on success, -1 on error.
  */
-extern int plugin_unregister(struct plugin_handle*);
+PLUGIN_API int plugin_unregister(struct plugin_handle*);
 
 typedef int (*plugin_register_f)(struct plugin_handle* handle, const char* config);
 typedef int (*plugin_unregister_f)(struct plugin_handle*);

src/plugin_api/message_api.h

@@ -0,0 +1,34 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2010, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef HAVE_UHUB_PLUGIN_MESSAGE_API_H
+#define HAVE_UHUB_PLUGIN_MESSAGE_API_H
+
+/**
+ * Send an informal message to a user.
+ * The user will see the message as if the hub sent it.
+ */
+extern int plugin_send_message(struct plugin_handle*, struct plugin_user* to, const char* message);
+
+/**
+ * Send a status message to a user.
+ */
+extern int plugin_send_status(struct plugin_handle* struct plugin_user* to, int code, const char* message);
+
+#endif /* HAVE_UHUB_PLUGIN_API_H */

src/plugin_api/types.h

@@ -0,0 +1,96 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2010, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef HAVE_UHUB_PLUGIN_TYPES_H
+#define HAVE_UHUB_PLUGIN_TYPES_H
+
+#define PLUGIN_API_VERSION 1
+
+#ifndef MAX_NICK_LEN
+#define MAX_NICK_LEN 64
+#endif
+
+#ifndef MAX_PASS_LEN
+#define MAX_PASS_LEN 64
+#endif
+
+#ifndef MAX_CID_LEN
+#define MAX_CID_LEN 39
+#endif
+
+#ifndef MAX_UA_LEN
+#define MAX_UA_LEN   32
+#endif
+
+#ifndef SID_T_DEFINED
+typedef uint32_t sid_t;
+#define SID_T_DEFINED
+#endif
+
+struct plugin_handle;
+
+struct plugin_user
+{
+	sid_t sid;
+	char nick[MAX_NICK_LEN+1];
+	char cid[MAX_CID_LEN+1];
+	char user_agent[MAX_UA_LEN+1];
+	struct ip_addr_encap addr;
+	enum auth_credentials credentials;
+};
+
+struct plugin_hub_info
+{
+	const char* description;
+};
+
+enum plugin_status
+{
+	st_default = 0,    /* Use default */
+	st_allow = 1,      /* Allow action */
+	st_deny = -1,      /* Deny action */
+};
+
+typedef enum plugin_status plugin_st;
+
+struct auth_info
+{
+	char nickname[MAX_NICK_LEN+1];
+	char password[MAX_PASS_LEN+1];
+	enum auth_credentials credentials;
+};
+
+enum ban_flags
+{
+	ban_nickname = 0x01, /* Nickname is banned */
+	ban_cid      = 0x02, /* CID is banned */
+	ban_ip       = 0x04, /* IP address (range) is banned */
+};
+
+struct ban_info
+{
+	unsigned int flags;                 /* See enum ban_flags. */
+	char nickname[MAX_NICK_LEN+1];      /* Nickname - only defined if (ban_nickname & flags). */
+	char cid[MAX_CID_LEN+1];            /* CID - only defined if (ban_cid & flags). */
+	struct ip_addr_encap ip_addr_lo;    /* Low IP address of an IP range */
+	struct ip_addr_encap ip_addr_hi;    /* High IP address of an IP range */
+	time_t expiry;                      /* Time when the ban record expires */
+};
+
+#endif /* HAVE_UHUB_PLUGIN_TYPES_H */

src/plugins/mod_auth_simple.c

@@ -1,6 +1,20 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2011, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "plugin_api/handle.h"
@@ -203,7 +217,7 @@ static plugin_st delete_user(struct plugin_handle* plugin, struct auth_info* use
 	return st_default;
 }
 
-int plugin_register(struct plugin_handle* plugin, const char* config)
+PLUGIN_API int plugin_register(struct plugin_handle* plugin, const char* config)
 {
 	PLUGIN_INITIALIZE(plugin, "File authentication plugin", "0.1", "Authenticate users based on a read-only text file.");
 
@@ -219,7 +233,7 @@ int plugin_register(struct plugin_handle* plugin, const char* config)
 	return -1;
 }
 
-int plugin_unregister(struct plugin_handle* plugin)
+PLUGIN_API int plugin_unregister(struct plugin_handle* plugin)
 {
 	set_error_message(plugin, 0);
 	unload_acl(plugin->ptr);

src/plugins/mod_auth_sqlite.c

@@ -1,6 +1,20 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2010, Jan Vidar Krey
+ * Copyright (C) 2007-2012, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "plugin_api/handle.h"
@@ -12,8 +26,7 @@
 #include "util/log.h"
 #include "util/config_token.h"
 
-#define DEBUG_SQL
-
+// #define DEBUG_SQL
 
 static void set_error_message(struct plugin_handle* plugin, const char* msg)
 {
@@ -204,8 +217,9 @@ int plugin_register(struct plugin_handle* plugin, const char* config)
 
 int plugin_unregister(struct plugin_handle* plugin)
 {
+	struct sql_data* sql;
 	set_error_message(plugin, 0);
-	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	sql = (struct sql_data*) plugin->ptr;
 	sqlite3_close(sql->db);
 	hub_free(sql);
 	return 0;

src/plugins/mod_chat_history.c

@@ -0,0 +1,245 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2012, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "plugin_api/handle.h"
+#include "plugin_api/command_api.h"
+#include "util/config_token.h"
+#include "util/memory.h"
+#include "util/misc.h"
+#include "util/list.h"
+#include "util/cbuffer.h"
+
+#define MAX_HISTORY_SIZE 16384
+
+struct chat_history_data
+{
+	size_t history_max;      ///<<< "the maximum number of chat messages kept in history."
+	size_t history_default;  ///<<< "the default number of chat messages returned if no limit was provided"
+	size_t history_connect;  ///<<< "the number of chat messages provided when users connect to the hub."
+	struct linked_list* chat_history; ///<<< "The chat history storage."
+	struct plugin_command_handle* command_history_handle; ///<<< "A handle to the !history command."
+};
+
+/**
+ * Add a chat message to history.
+ */
+static void history_add(struct plugin_handle* plugin, struct plugin_user* from, const char* message, int flags)
+{
+	size_t loglen = strlen(message) + strlen(from->nick) + 13;
+	struct chat_history_data* data = (struct chat_history_data*) plugin->ptr;
+	char* log = hub_malloc(loglen + 1);
+
+	snprintf(log, loglen, "%s <%s> %s\n", get_timestamp(time(NULL)), from->nick, message);
+	log[loglen] = '\0';
+	list_append(data->chat_history, log);
+	while (list_size(data->chat_history) > data->history_max)
+	{
+		char* msg = list_get_first(data->chat_history);
+		list_remove(data->chat_history, msg);
+		hub_free(msg);
+	}
+}
+
+/**
+ * Obtain 'num' messages from the chat history and append them to outbuf.
+ *
+ * @return the number of messages added to the buffer.
+ */
+static size_t get_messages(struct chat_history_data* data, size_t num, struct cbuffer* outbuf)
+{
+	struct linked_list* messages = data->chat_history;
+	char* message;
+	int skiplines = 0;
+	size_t lines = 0;
+	int total = list_size(messages);
+
+	if (total == 0)
+		return 0;
+
+	if (num <= 0 || num > total)
+		num = total;
+
+	if (num != total)
+		skiplines = total - num;
+
+	cbuf_append(outbuf, "\n");
+	message = (char*) list_get_first(messages);
+	while (message)
+	{
+		if (--skiplines < 0)
+		{
+			cbuf_append(outbuf, message);
+			lines++;
+		}
+		message = (char*) list_get_next(messages);
+	}
+	cbuf_append(outbuf, "\n");
+	return lines;
+}
+
+void user_login(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	struct chat_history_data* data = (struct chat_history_data*) plugin->ptr;
+	struct cbuffer* buf = NULL;
+	// size_t messages = 0;
+
+	if (data->history_connect > 0 && list_size(data->chat_history) > 0)
+	{
+		buf = cbuf_create(MAX_HISTORY_SIZE);
+		cbuf_append(buf, "Chat history:\n");
+		get_messages(data, data->history_connect, buf);
+		plugin->hub.send_message(plugin, user, cbuf_get(buf));
+		cbuf_destroy(buf);
+	}
+}
+
+/**
+ * Send a status message back to the user who issued the !history command.
+ */
+static int command_status(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd, struct cbuffer* buf)
+{
+	struct cbuffer* msg = cbuf_create(cbuf_size(buf) + strlen(cmd->prefix) + 8);
+	cbuf_append_format(msg, "*** %s: %s", cmd->prefix, cbuf_get(buf));
+	plugin->hub.send_message(plugin, user, cbuf_get(msg));
+	cbuf_destroy(msg);
+	cbuf_destroy(buf);
+	return 0;
+}
+
+/**
+ * The callback function for handling the !history command.
+ */
+static int command_history(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd)
+{
+	struct cbuffer* buf;
+	struct chat_history_data* data = (struct chat_history_data*) plugin->ptr;
+	int maxlines = 0;
+
+	if (!list_size(data->chat_history))
+		return command_status(plugin, user, cmd, cbuf_create_const("No messages."));
+
+	if (list_size(cmd->args) > 0)
+		maxlines = (int) (intptr_t) ((intptr_t*) (void*) list_get_first(cmd->args));
+	else
+		maxlines = data->history_default;
+	
+	buf = cbuf_create(MAX_HISTORY_SIZE);
+	cbuf_append_format(buf, "*** %s: Chat History:\n", cmd->prefix);
+	get_messages(data, maxlines, buf);
+
+	plugin->hub.send_message(plugin, user, cbuf_get(buf));
+	cbuf_destroy(buf);
+	return 0;
+}
+
+static void set_error_message(struct plugin_handle* plugin, const char* msg)
+{
+	plugin->error_msg = msg;
+}
+
+static struct chat_history_data* parse_config(const char* line, struct plugin_handle* plugin)
+{
+	struct chat_history_data* data = (struct chat_history_data*) hub_malloc_zero(sizeof(struct chat_history_data));
+	struct cfg_tokens* tokens = cfg_tokenize(line);
+	char* token = cfg_token_get_first(tokens);
+
+	assert(data != NULL);
+
+	data->history_max = 200;
+	data->history_default = 25;
+	data->history_connect = 5;
+	data->chat_history = list_create();
+
+	while (token)
+	{
+		struct cfg_settings* setting = cfg_settings_split(token);
+
+		if (!setting)
+		{
+			set_error_message(plugin, "Unable to parse startup parameters");
+			cfg_tokens_free(tokens);
+			hub_free(data);
+			return 0;
+		}
+
+		if (strcmp(cfg_settings_get_key(setting), "history_max") == 0)
+		{
+			data->history_max = (size_t) uhub_atoi(cfg_settings_get_value(setting));
+		}
+		else if (strcmp(cfg_settings_get_key(setting), "history_default") == 0)
+		{
+			data->history_default = (size_t) uhub_atoi(cfg_settings_get_value(setting));
+		}
+		else if (strcmp(cfg_settings_get_key(setting), "history_connect") == 0)
+		{
+			data->history_connect = (size_t) uhub_atoi(cfg_settings_get_value(setting));
+		}
+		else
+		{
+			set_error_message(plugin, "Unknown startup parameters given");
+			cfg_tokens_free(tokens);
+			cfg_settings_free(setting);
+			hub_free(data);
+			return 0;
+		}
+
+		cfg_settings_free(setting);
+		token = cfg_token_get_next(tokens);
+	}
+	cfg_tokens_free(tokens);
+	return data;
+}
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	struct chat_history_data* data;
+	PLUGIN_INITIALIZE(plugin, "Chat history plugin", "1.0", "Provide a global chat history log.");
+
+	plugin->funcs.on_user_chat_message = history_add;
+	plugin->funcs.on_user_login = user_login;
+	data = parse_config(config, plugin);
+	if (!data)
+		return -1;
+
+	plugin->ptr = data;
+
+	data->command_history_handle = (struct plugin_command_handle*) hub_malloc(sizeof(struct plugin_command_handle));
+	PLUGIN_COMMAND_INITIALIZE(data->command_history_handle, plugin, "history", "?N", auth_cred_guest, &command_history, "Show chat message history.");
+	plugin->hub.command_add(plugin, data->command_history_handle);
+
+	return 0;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	struct chat_history_data* data = (struct chat_history_data*) plugin->ptr;
+
+	if (data)
+	{
+		list_clear(data->chat_history, &hub_free);
+		list_destroy(data->chat_history);
+
+		plugin->hub.command_del(plugin, data->command_history_handle);
+		hub_free(data->command_history_handle);
+		hub_free(data);
+	}
+
+	return 0;
+}
+

src/plugins/mod_chat_only.c

@@ -0,0 +1,163 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2012, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "plugin_api/handle.h"
+#include "util/memory.h"
+
+enum Warnings
+{
+	WARN_SEARCH         = 0x01, ///<<< "Warn about searching."
+	WARN_CONNECT        = 0x02, ///<<< "Warn about connecting to a user"
+	WARN_EXTRA          = 0x08, ///<<< "Warn about unknown protocol data."
+};
+
+struct user_info
+{
+	sid_t sid;      // The SID of the user
+	int warnings;   // The number of denies (used to track wether or not a warning should be sent). @see enum Warnings.
+};
+
+struct chat_only_data
+{
+	size_t num_users;        // number of users tracked.
+	size_t max_users;        // max users (hard limit max 1M users due to limitations in the SID (20 bits)).
+	struct user_info* users; // array of max_users
+	int operator_override;   // operators are allowed to override these limitations.
+};
+
+static struct chat_only_data* co_initialize()
+{
+	struct chat_only_data* data = (struct chat_only_data*) hub_malloc(sizeof(struct chat_only_data));
+	data->num_users = 0;
+	data->max_users = 512;
+	data->users = hub_malloc_zero(sizeof(struct user_info) * data->max_users);
+	return data;
+}
+
+static void co_shutdown(struct chat_only_data* data)
+{
+	if (data)
+	{
+		hub_free(data->users);
+		hub_free(data);
+	}
+}
+
+static struct user_info* get_user_info(struct chat_only_data* data, sid_t sid)
+{
+	struct user_info* u;
+
+	// resize buffer if needed.
+	if (sid > data->max_users) // FIXME: >= ?
+	{
+		u = hub_malloc_zero(sizeof(struct user_info) * (sid + 1));
+		memcpy(u, data->users, data->max_users);
+		hub_free(data->users);
+		data->users = u;
+		data->max_users = sid;
+		u = NULL;
+	}
+
+	u = &data->users[sid];
+
+	// reset counters if the user was not previously known.
+	if (!u->sid)
+	{
+		u->sid = sid;
+		u->warnings = 0;
+		data->num_users++;
+	}
+	return u;
+}
+
+static plugin_st on_search_result(struct plugin_handle* plugin, struct plugin_user* from, struct plugin_user* to, const char* search_data)
+{
+	return st_deny;
+}
+
+static plugin_st on_search(struct plugin_handle* plugin, struct plugin_user* user, const char* search_data)
+{
+	struct chat_only_data* data = (struct chat_only_data*) plugin->ptr;
+	struct user_info* info = get_user_info(data, user->sid);
+
+	if (user->credentials >= auth_cred_operator && data->operator_override)
+		return st_allow;
+
+	if (!(info->warnings & WARN_SEARCH))
+	{
+		plugin->hub.send_status_message(plugin, user, 000, "Searching is disabled. This is a chat only hub.");
+		info->warnings |= WARN_SEARCH;
+	}
+	return st_deny;
+}
+
+static plugin_st on_p2p_connect(struct plugin_handle* plugin, struct plugin_user* from, struct plugin_user* to)
+{
+	struct chat_only_data* data = (struct chat_only_data*) plugin->ptr;
+	struct user_info* info = get_user_info(data, from->sid);
+
+	if (from->credentials >= auth_cred_operator && data->operator_override)
+		return st_allow;
+
+	if (!(info->warnings & WARN_CONNECT))
+	{
+		plugin->hub.send_status_message(plugin, from, 000, "Connection setup denied. This is a chat only hub.");
+		info->warnings |= WARN_CONNECT;
+	}
+	return st_deny;
+}
+
+static void on_user_login(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	struct chat_only_data* data = (struct chat_only_data*) plugin->ptr;
+	/*struct user_info* info = */
+	get_user_info(data, user->sid);
+}
+
+static void on_user_logout(struct plugin_handle* plugin, struct plugin_user* user, const char* reason)
+{
+	struct chat_only_data* data = (struct chat_only_data*) plugin->ptr;
+	struct user_info* info = get_user_info(data, user->sid);
+	if (info->sid)
+		data->num_users--;
+	info->warnings = 0;
+	info->sid = 0;
+}
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	PLUGIN_INITIALIZE(plugin, "Chat only hub", "1.0", "Disables connection setup, search and results.");
+	plugin->ptr = co_initialize();
+
+	plugin->funcs.on_search = on_search;
+	plugin->funcs.on_search_result = on_search_result;
+	plugin->funcs.on_p2p_connect = on_p2p_connect;
+	plugin->funcs.on_p2p_revconnect = on_p2p_connect;
+	plugin->funcs.on_user_login = on_user_login;
+	plugin->funcs.on_user_logout = on_user_logout;
+
+	return 0;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	co_shutdown((struct chat_only_data*) plugin->ptr);
+	return 0;
+}
+

src/plugins/mod_example.c

@@ -1,18 +1,67 @@
-/**
- * This is a minimal example plugin for uhub.
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "plugin_api/handle.h"
+#include "plugin_api/command_api.h"
+#include "util/memory.h"
+
+struct example_plugin_data
+{
+	struct plugin_command_handle* example;
+};
+
+static int example_command_handler(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd)
+{
+	plugin->hub.send_message(plugin, user, "Hello from mod_example.");
+	return 0;
+}
+
+static void command_register(struct plugin_handle* plugin)
+{
+	struct example_plugin_data* data = (struct example_plugin_data*) hub_malloc(sizeof(struct example_plugin_data));
+	data->example = hub_malloc_zero(sizeof(struct plugin_command_handle));
+	PLUGIN_COMMAND_INITIALIZE(data->example, (void*) data, "example", "", auth_cred_guest, example_command_handler, "This is an example command that is added dynamically by loading the mod_example plug-in.");
+	plugin->hub.command_add(plugin, data->example);
+	plugin->ptr = data;
+}
+
+static void command_unregister(struct plugin_handle* plugin)
+{
+	struct example_plugin_data* data = (struct example_plugin_data*) plugin->ptr;
+
+	plugin->hub.command_del(plugin, data->example);
+	hub_free(data->example);
+
+	hub_free(data);
+	plugin->ptr = NULL;
+}
 
 int plugin_register(struct plugin_handle* plugin, const char* config)
 {
 	PLUGIN_INITIALIZE(plugin, "Example plugin", "1.0", "A simple example plugin");
+	command_register(plugin);
 	return 0;
 }
 
 int plugin_unregister(struct plugin_handle* plugin)
 {
-	/* No need to do anything! */
+	command_unregister(plugin);
 	return 0;
 }
 

src/plugins/mod_logging.c

@@ -1,5 +1,20 @@
-/**
- * This is a minimal example plugin for uhub.
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "system.h"
@@ -9,40 +24,141 @@
 #include "util/ipcalc.h"
 #include "plugin_api/handle.h"
 
+#include "util/misc.h"
+#include "util/config_token.h"
+#include <syslog.h>
+
 struct ip_addr_encap;
 
 struct log_data
 {
+	enum {
+		mode_file,
+		mode_syslog
+	} logmode;
 	char* logfile;
 	int fd;
 };
 
+static void reset(struct log_data* data)
+{
+	/* set defaults */
+	data->logmode = mode_file;
+	data->logfile = NULL;
+	data->fd = -1;
+}
 
 static void set_error_message(struct plugin_handle* plugin, const char* msg)
 {
 	plugin->error_msg = msg;
 }
 
+static int log_open_file(struct plugin_handle* plugin, struct log_data* data)
+{
+	int flags = O_CREAT | O_APPEND | O_WRONLY;
+	data->fd = open(data->logfile, flags, 0664);
+	return (data->fd != -1);
+}
 
-static struct log_data* log_open(struct plugin_handle* plugin, const char* config)
+static int log_open_syslog(struct plugin_handle* plugin)
+{
+	openlog("uhub", 0, LOG_USER);
+	return 1;
+}
+
+static struct log_data* parse_config(const char* line, struct plugin_handle* plugin)
 {
 	struct log_data* data = (struct log_data*) hub_malloc(sizeof(struct log_data));
-	data->logfile = strdup(config);
-	data->fd = open(data->logfile, O_CREAT | O_APPEND | O_NOATIME | O_LARGEFILE | O_WRONLY, 0664);
-	if (data->fd == -1)
+	struct cfg_tokens* tokens = cfg_tokenize(line);
+	char* token = cfg_token_get_first(tokens);
+
+	if (!data)
+		return 0;
+
+	reset(data);
+
+	while (token)
+	{
+		struct cfg_settings* setting = cfg_settings_split(token);
+
+		if (!setting)
+		{
+			set_error_message(plugin, "Unable to parse startup parameters");
+			cfg_tokens_free(tokens);
+			hub_free(data);
+			return 0;
+		}
+
+		if (strcmp(cfg_settings_get_key(setting), "file") == 0)
+		{
+			data->logfile = strdup(cfg_settings_get_value(setting));
+			data->logmode = mode_file;
+		}
+		else if (strcmp(cfg_settings_get_key(setting), "syslog") == 0)
+		{
+			int use_syslog = 0;
+			if (!string_to_boolean(cfg_settings_get_value(setting), &use_syslog))
+			{
+				data->logmode = (use_syslog) ? mode_syslog : mode_file;
+			}
+		}
+		else
+		{
+			set_error_message(plugin, "Unknown startup parameters given");
+			cfg_tokens_free(tokens);
+			cfg_settings_free(setting);
+			hub_free(data);
+			return 0;
+		}
+
+		cfg_settings_free(setting);
+		token = cfg_token_get_next(tokens);
+	}
+
+	cfg_tokens_free(tokens);
+
+	if (data->logmode == mode_file)
+	{
+		if ((data->logmode == mode_file && !data->logfile))
+		{
+			set_error_message(plugin, "No log file is given, use file=<path>");
+			hub_free(data);
+			return 0;
+		}
+
+		if (!log_open_file(plugin, data))
 		{
-		set_error_message(plugin, "Unable to open log file!");
 			hub_free(data->logfile);
 			hub_free(data);
-		return NULL;
+			set_error_message(plugin, "Unable to open log file");
+			return 0;
 		}
+	}
+	else
+	{
+		if (!log_open_syslog(plugin))
+		{
+			hub_free(data->logfile);
+			hub_free(data);
+			set_error_message(plugin, "Unable to open syslog");
+			return 0;
+		}
+	}
+
 	return data;
 }
 
 static void log_close(struct log_data* data)
+{
+	if (data->logmode == mode_file)
 	{
 		hub_free(data->logfile);
 		close(data->fd);
+	}
+	else
+	{
+		closelog();
+	}
 	hub_free(data);
 }
 
@@ -54,6 +170,8 @@ static void log_message(struct log_data* data, const char *format, ...)
 	va_list args;
 	ssize_t size = 0;
 
+	if (data->logmode == mode_file)
+	{
 		t = time(NULL);
 		tmp = localtime(&t);
 		strftime(logmsg, 32, "%Y-%m-%d %H:%M:%S ", tmp);
@@ -62,8 +180,25 @@ static void log_message(struct log_data* data, const char *format, ...)
 		size = vsnprintf(logmsg + 20, 1004, format, args);
 		va_end(args);
 
-	write(data->fd, logmsg, size + 20);
+		if (write(data->fd, logmsg, size + 20) < (size+20))
+		{
+			fprintf(stderr, "Unable to write full log. Error=%d: %s\n", errno, strerror(errno));
+		}
+		else
+		{
+#if defined _POSIX_SYNCHRONIZED_IO && _POSIX_SYNCHRONIZED_IO > 0
 			fdatasync(data->fd);
+#else
+			fsync(data->fd);
+#endif
+		}
+	}
+	else
+	{
+		va_start(args, format);
+		vsyslog(LOG_INFO, format, args);
+		va_end(args);
+	}
 }
 
 static void log_user_login(struct plugin_handle* plugin, struct plugin_user* user)
@@ -101,7 +236,7 @@ int plugin_register(struct plugin_handle* plugin, const char* config)
 	plugin->funcs.on_user_logout = log_user_logout;
 	plugin->funcs.on_user_nick_change = log_change_nick;
 
-	plugin->ptr = log_open(plugin, config);
+	plugin->ptr = parse_config(config, plugin);
 	if (!plugin->ptr)
 		return -1;
 	return 0;

src/plugins/mod_welcome.c

@@ -0,0 +1,304 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2012, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "system.h"
+#include "adc/adcconst.h"
+#include "adc/sid.h"
+#include "util/cbuffer.h"
+#include "util/memory.h"
+#include "util/ipcalc.h"
+#include "plugin_api/handle.h"
+#include "plugin_api/command_api.h"
+
+#include "util/misc.h"
+#include "util/config_token.h"
+#include <syslog.h>
+
+#define MAX_WELCOME_SIZE 16384
+
+struct welcome_data
+{
+	char* motd_file;
+	char* motd;
+	char* rules_file;
+	char* rules;
+	struct plugin_command_handle* cmd_motd;
+	struct plugin_command_handle* cmd_rules;
+};
+
+static int command_handler_motd(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd);
+static int command_handler_rules(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd);
+
+static char* read_file(const char* filename)
+{
+	char* str;
+	char buf[MAX_WELCOME_SIZE];
+	int fd = open(filename, O_RDONLY);
+	int ret;
+
+	if (fd == -1)
+		return NULL;
+
+	ret = read(fd, buf, MAX_WELCOME_SIZE);
+	close(fd);
+
+	buf[ret > 0 ? ret : 0] = 0;
+	str = strdup(buf);
+
+	return str;
+}
+
+int read_motd(struct welcome_data* data)
+{
+	data->motd = read_file(data->motd_file);
+	return !!data->motd;
+}
+
+int read_rules(struct welcome_data* data)
+{
+	data->rules = read_file(data->rules_file);
+	return !!data->rules;
+}
+
+static void free_welcome_data(struct welcome_data* data)
+{
+	if (!data)
+		return;
+
+	hub_free(data->cmd_motd);
+	hub_free(data->motd_file);
+	hub_free(data->motd);
+	hub_free(data->cmd_rules);
+	hub_free(data->rules_file);
+	hub_free(data->rules);
+	hub_free(data);
+}
+
+
+static void set_error_message(struct plugin_handle* plugin, const char* msg)
+{
+	plugin->error_msg = msg;
+}
+
+static struct welcome_data* parse_config(const char* line, struct plugin_handle* plugin)
+{
+	struct welcome_data* data = (struct welcome_data*) hub_malloc_zero(sizeof(struct welcome_data));
+	struct cfg_tokens* tokens = cfg_tokenize(line);
+	char* token = cfg_token_get_first(tokens);
+
+	if (!data)
+		return 0;
+
+	while (token)
+	{
+		struct cfg_settings* setting = cfg_settings_split(token);
+
+		if (!setting)
+		{
+			set_error_message(plugin, "Unable to parse startup parameters");
+			goto cleanup_parse_error;
+		}
+
+		if (strcmp(cfg_settings_get_key(setting), "motd") == 0)
+		{
+			data->motd_file = strdup(cfg_settings_get_value(setting));
+			if (!read_motd(data))
+			{
+				set_error_message(plugin, "Unable to read motd file.");
+				cfg_settings_free(setting);
+				goto cleanup_parse_error;
+			}
+
+			data->cmd_motd = hub_malloc_zero(sizeof(struct plugin_command_handle));
+			PLUGIN_COMMAND_INITIALIZE(data->cmd_motd, (void*) data, "motd", "", auth_cred_guest, command_handler_motd, "Show the message of the day.");
+		}
+		else if (strcmp(cfg_settings_get_key(setting), "rules") == 0)
+		{
+			data->rules_file = strdup(cfg_settings_get_value(setting));
+			if (!read_rules(data))
+			{
+				set_error_message(plugin, "Unable to read rules file.");
+				cfg_settings_free(setting);
+				goto cleanup_parse_error;
+			}
+
+			data->cmd_rules = hub_malloc_zero(sizeof(struct plugin_command_handle));
+			PLUGIN_COMMAND_INITIALIZE(data->cmd_rules, (void*) data, "rules", "", auth_cred_guest, command_handler_rules, "Show the hub rules.");
+		}
+		else
+		{
+			set_error_message(plugin, "Unknown startup parameters given");
+			cfg_settings_free(setting);
+			goto cleanup_parse_error;
+		}
+
+		cfg_settings_free(setting);
+		token = cfg_token_get_next(tokens);
+	}
+
+	cfg_tokens_free(tokens);
+	return data;
+
+cleanup_parse_error:
+	cfg_tokens_free(tokens);
+	free_welcome_data(data);
+	return 0;
+}
+
+
+static struct cbuffer* parse_message(struct plugin_user* user, const char* msg)
+{
+	struct cbuffer* buf = cbuf_create(strlen(msg));
+	const char* start = msg;
+	const char* offset = NULL;
+	time_t timestamp = time(NULL);
+	struct tm* now = localtime(&timestamp);
+
+	while ((offset = strchr(start, '%')))
+	{
+		cbuf_append_bytes(buf, start, (offset - start));
+
+		offset++;
+		switch (offset[0])
+		{
+			case 'n':
+				cbuf_append(buf, user->nick);
+				break;
+
+			case 'a':
+				cbuf_append(buf, ip_convert_to_string(&user->addr));
+				break;
+			case 'c':
+				cbuf_append(buf, auth_cred_to_string(user->credentials));
+				break;
+
+			case '%':
+				cbuf_append(buf, "%");
+				break;
+
+			case 'H':
+				cbuf_append_strftime(buf, "%H", now);
+				break;
+
+			case 'I':
+				cbuf_append_strftime(buf, "%I", now);
+				break;
+
+			case 'P':
+				cbuf_append_strftime(buf, "%P", now);
+				break;
+
+			case 'p':
+				cbuf_append_strftime(buf, "%p", now);
+				break;
+
+			case 'M':
+				cbuf_append_strftime(buf, "%M", now);
+				break;
+
+			case 'S':
+				cbuf_append_strftime(buf, "%S", now);
+				break;
+		}
+
+		start = offset + 1;
+	}
+
+	if (*start)
+		cbuf_append(buf, start);
+
+	return buf;
+}
+
+static void send_motd(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	struct welcome_data* data = (struct welcome_data*) plugin->ptr;
+	struct cbuffer* buf = NULL;
+	if (data->motd)
+	{
+		buf = parse_message(user, data->motd);
+		plugin->hub.send_message(plugin, user, cbuf_get(buf));
+		cbuf_destroy(buf);
+	}
+}
+
+static void send_rules(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	struct welcome_data* data = (struct welcome_data*) plugin->ptr;
+	struct cbuffer* buf = NULL;
+	if (data->rules)
+	{
+		buf = parse_message(user, data->rules);
+		plugin->hub.send_message(plugin, user, cbuf_get(buf));
+		cbuf_destroy(buf);
+	}
+}
+
+static void on_user_login(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	send_motd(plugin, user);
+}
+
+static int command_handler_motd(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd)
+{
+	send_motd(plugin, user);
+	return 0;
+}
+
+static int command_handler_rules(struct plugin_handle* plugin, struct plugin_user* user, struct plugin_command* cmd)
+{
+	send_rules(plugin, user);
+	return 0;
+}
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	struct welcome_data* data;
+	PLUGIN_INITIALIZE(plugin, "Welcome plugin", "0.1", "Sends a welcome message to users when they log into the hub.");
+	data = parse_config(config, plugin);
+
+	if (!data)
+		return -1;
+
+	plugin->ptr = data;
+	plugin->funcs.on_user_login = on_user_login;
+
+	if (data->cmd_motd)
+		plugin->hub.command_add(plugin, data->cmd_motd);
+
+	if (data->cmd_rules)
+		plugin->hub.command_add(plugin, data->cmd_rules);
+
+	return 0;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	struct welcome_data* data = (struct welcome_data*) plugin->ptr;
+
+	if (data->cmd_motd)
+		plugin->hub.command_del(plugin, data->cmd_motd);
+
+	if (data->cmd_rules)
+		plugin->hub.command_del(plugin, data->cmd_rules);
+
+	free_welcome_data(data);
+	return 0;
+}
+

src/system.h

@@ -26,7 +26,7 @@
 #define _GNU_SOURCE
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__)
 #define BSD_LIKE
 #endif
 
@@ -36,6 +36,11 @@
 #endif
 #endif
 
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+#define HAVE_SSIZE_T
+#define NEED_GETOPT
+#endif
+
 #ifdef WINSOCK
 #ifndef FD_SETSIZE
 #define FD_SETSIZE 4096
@@ -106,8 +111,10 @@
 #endif
 
 #ifdef BSD_LIKE
+/*
 #define USE_KQUEUE
 #include <sys/event.h>
+*/
 #endif
 
 #define USE_SELECT
@@ -140,7 +147,7 @@
 #define OPSYS "MacOSX"
 #endif
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #define OPSYS "FreeBSD"
 #endif
 
@@ -164,6 +171,10 @@
 #define OPSYS "Haiku"
 #endif
 
+#if defined(__GNU__)
+#define OPSYS "Hurd"
+#endif
+
 /* Detect CPUs */
 #if defined(__alpha__) || defined(__alpha)
 #define CPUINFO "Alpha"
@@ -209,6 +220,10 @@
 #define CPUINFO "SuperH"
 #endif
 
+#if defined(__s390__) || defined(__s390x__)
+#define CPUINFO "s390"
+#endif
+
 /* Misc */
 #ifdef MSG_NOSIGNAL
 #define UHUB_SEND_SIGNAL MSG_NOSIGNAL
@@ -256,4 +271,9 @@ typedef unsigned __int64 uint64_t;
 #define NEED_GETOPT
 #endif
 
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(_MSC_VER)
+#define PLUGIN_API __declspec(dllexport)
+#else
+#define PLUGIN_API
+#endif
 #endif /* HAVE_UHUB_SYSTEM_H */

src/tools/adcclient.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -23,10 +23,14 @@
 #define ADC_CID_SIZE 39
 #define BIG_BUFSIZE 32768
 #define TIGERSIZE 24
+// #define ADCC_DEBUG
 
 static ssize_t ADC_client_recv(struct ADC_client* client);
 static void ADC_client_send_info(struct ADC_client* client);
 static void ADC_client_on_connected(struct ADC_client* client);
+#ifdef SSL_SUPPORT
+static void ADC_client_on_connected_ssl(struct ADC_client* client);
+#endif
 static void ADC_client_on_disconnected(struct ADC_client* client);
 static void ADC_client_on_login(struct ADC_client* client);
 static int ADC_client_parse_address(struct ADC_client* client, const char* arg);
@@ -42,14 +46,42 @@ static void ADC_client_debug(struct ADC_client* client, const char* format, ...)
 	fprintf(stdout, "* [%p] %s\n", client, logmsg);
 }
 
+#ifdef ADCC_DEBUG
+#define ADC_TRACE fprintf(stderr, "TRACE: %s\n", __PRETTY_FUNCTION__)
+#else
+#define ADC_TRACE do { } while(0)
+#endif
+
+#ifdef ADCC_DEBUG
+static const char* ADC_client_state_string[] =
+{
+	"ps_none",
+	"ps_conn",
+	"ps_conn_ssl",
+	"ps_protocol",
+	"ps_identify",
+	"ps_verify",
+	"ps_normal",
+	0
+};
+#endif
+
 static void ADC_client_set_state(struct ADC_client* client, enum ADC_client_state state)
 {
+	ADC_TRACE;
+	if (client->state != state)
+	{
+#ifdef ADCC_DEBUG
+		ADC_client_debug(client, "Set state %s (was %s)", ADC_client_state_string[(int) state], ADC_client_state_string[(int) client->state]);
+#endif
 		client->state = state;
 	}
+}
 
 
 static void adc_cid_pid(struct ADC_client* client)
 {
+	ADC_TRACE;
 	char seed[64];
 	char pid[64];
 	char cid[64];
@@ -73,17 +105,35 @@ static void adc_cid_pid(struct ADC_client* client)
 
 static void event_callback(struct net_connection* con, int events, void *arg)
 {
+	ADC_TRACE;
 	struct ADC_client* client = (struct ADC_client*) net_con_get_ptr(con);
 
+	switch (client->state)
+	{
+		case ps_conn:
 			if (events == NET_EVENT_TIMEOUT)
-	{
-		if (client->state == ps_conn)
 			{
 				client->callback(client, ADC_CLIENT_DISCONNECTED, 0);
-		}
 				return;
 			}
 
+			if (events & NET_EVENT_WRITE)
+				ADC_client_connect(client, 0);
+			break;
+
+#ifdef SSL_SUPPORT
+		case ps_conn_ssl:
+			if (events == NET_EVENT_TIMEOUT)
+			{
+				client->callback(client, ADC_CLIENT_DISCONNECTED, 0);
+				return;
+			}
+
+			ADC_client_on_connected_ssl(client);
+			break;
+#endif
+
+		default:
 			if (events & NET_EVENT_READ)
 			{
 				if (ADC_client_recv(client) == -1)
@@ -93,12 +143,6 @@ static void event_callback(struct net_connection* con, int events, void *arg)
 			}
 
 			if (events & NET_EVENT_WRITE)
-	{
-		if (client->state == ps_conn)
-		{
-			ADC_client_connect(client, 0);
-		}
-		else
 			{
 				/* FIXME: Call send again */
 			}
@@ -127,6 +171,7 @@ static void event_callback(struct net_connection* con, int events, void *arg)
 
 static void ADC_client_on_recv_line(struct ADC_client* client, const char* line, size_t length)
 {
+	ADC_TRACE;
 #ifdef ADC_CLIENT_DEBUG_PROTO
 	ADC_client_debug(client, "- LINE: '%s'", start);
 #endif
@@ -213,6 +258,7 @@ static void ADC_client_on_recv_line(struct ADC_client* client, const char* line,
 				if (adc_msg_has_named_argument(msg, "ID"))
 				{
 					struct ADC_user user;
+					user.sid = msg->source;
 					EXTRACT_NAMED_ARG(msg, "NI", user.name);
 					EXTRACT_NAMED_ARG(msg, "DE", user.description);
 					EXTRACT_NAMED_ARG(msg, "VE", user.version);
@@ -250,6 +296,7 @@ static void ADC_client_on_recv_line(struct ADC_client* client, const char* line,
 
 static ssize_t ADC_client_recv(struct ADC_client* client)
 {
+	ADC_TRACE;
 	ssize_t size = net_con_recv(client->con, &client->recvbuf[client->r_offset], ADC_BUFSIZE - client->r_offset);
 	if (size <= 0)
 		return size;
@@ -285,6 +332,7 @@ static ssize_t ADC_client_recv(struct ADC_client* client)
 
 void ADC_client_send(struct ADC_client* client, char* msg)
 {
+	ADC_TRACE;
 	int ret = net_con_send(client->con, msg, strlen(msg));
 
 #ifdef ADC_CLIENT_DEBUG_PROTO
@@ -311,6 +359,7 @@ void ADC_client_send(struct ADC_client* client, char* msg)
 
 void ADC_client_send_info(struct ADC_client* client)
 {
+	ADC_TRACE;
 	char binf[11];
 	snprintf(binf, 11, "BINF %s\n", sid_to_string(client->sid));
 	client->info = adc_msg_create(binf);
@@ -330,6 +379,7 @@ void ADC_client_send_info(struct ADC_client* client)
 
 int ADC_client_create(struct ADC_client* client, const char* nickname, const char* description)
 {
+	ADC_TRACE;
 	memset(client, 0, sizeof(struct ADC_client));
 
 	int sd = net_socket_create(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -355,6 +405,7 @@ int ADC_client_create(struct ADC_client* client, const char* nickname, const cha
 
 void ADC_client_destroy(struct ADC_client* client)
 {
+	ADC_TRACE;
 	ADC_client_disconnect(client);
 #if 0
 	/* FIXME */
@@ -369,6 +420,7 @@ void ADC_client_destroy(struct ADC_client* client)
 
 int ADC_client_connect(struct ADC_client* client, const char* address)
 {
+	ADC_TRACE;
 	if (!client->hub_address)
 	{
 		if (!ADC_client_parse_address(client, address))
@@ -383,13 +435,10 @@ int ADC_client_connect(struct ADC_client* client, const char* address)
 		ADC_client_on_connected(client);
 	}
 	else if (ret == -1 && (net_error() == EALREADY || net_error() == EINPROGRESS || net_error() == EWOULDBLOCK || net_error() == EINTR))
-	{
-		if (client->state != ps_conn)
 	{
 		net_con_update(client->con, NET_EVENT_READ | NET_EVENT_WRITE);
 		ADC_client_set_state(client, ps_conn);
 	}
-	}
 	else
 	{
 		ADC_client_on_disconnected(client);
@@ -399,15 +448,39 @@ int ADC_client_connect(struct ADC_client* client, const char* address)
 }
 
 static void ADC_client_on_connected(struct ADC_client* client)
+{
+	ADC_TRACE;
+#ifdef SSL_SUPPORT
+	if (client->ssl_enabled)
+	{
+		net_con_update(client->con, NET_EVENT_READ | NET_EVENT_WRITE);
+		client->callback(client, ADC_CLIENT_SSL_HANDSHAKE, 0);
+		ADC_client_set_state(client, ps_conn_ssl);
+	}
+	else
+#endif
 	{
 		net_con_update(client->con, NET_EVENT_READ);
 		client->callback(client, ADC_CLIENT_CONNECTED, 0);
 		ADC_client_send(client, ADC_HANDSHAKE);
 		ADC_client_set_state(client, ps_protocol);
 	}
+}
+
+#ifdef SSL_SUPPORT
+static void ADC_client_on_connected_ssl(struct ADC_client* client)
+{
+	ADC_TRACE;
+	net_con_update(client->con, NET_EVENT_READ);
+	client->callback(client, ADC_CLIENT_CONNECTED, 0);
+	ADC_client_send(client, ADC_HANDSHAKE);
+	ADC_client_set_state(client, ps_protocol);
+}
+#endif
 
 static void ADC_client_on_disconnected(struct ADC_client* client)
 {
+	ADC_TRACE;
 	net_con_close(client->con);
 	client->con = 0;
 	ADC_client_set_state(client, ps_none);
@@ -415,12 +488,14 @@ static void ADC_client_on_disconnected(struct ADC_client* client)
 
 static void ADC_client_on_login(struct ADC_client* client)
 {
+	ADC_TRACE;
 	ADC_client_set_state(client, ps_normal);
 	client->callback(client, ADC_CLIENT_LOGGED_IN, 0);
 }
 
 void ADC_client_disconnect(struct ADC_client* client)
 {
+	ADC_TRACE;
 	if (client->con && net_con_get_sd(client->con) != -1)
 	{
 		net_con_close(client->con);
@@ -430,6 +505,7 @@ void ADC_client_disconnect(struct ADC_client* client)
 
 static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
 {
+	ADC_TRACE;
 	char* split;
 	int ssl = 0;
 	struct hostent* dns;
@@ -446,9 +522,12 @@ static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
 
 	/* Check for ADC or ADCS */
 	if (!strncmp(arg, "adc://", 6))
-		ssl = 0;
+		client->ssl_enabled = 0;
 	else if (!strncmp(arg, "adcs://", 7))
+	{
+		client->ssl_enabled = 1;
 		ssl = 1;
+	}
 	else
 		return 0;
 
@@ -481,5 +560,6 @@ static int ADC_client_parse_address(struct ADC_client* client, const char* arg)
 
 void ADC_client_set_callback(struct ADC_client* client, adc_client_cb cb)
 {
+	ADC_TRACE;
 	client->callback = cb;
 }

src/tools/adcclient.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * Copyright (C) 2007-2011, Jan Vidar Krey
  *
  * 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
@@ -26,12 +26,13 @@
 
 enum ADC_client_state
 {
-	ps_none     = 0x00, /* Not connected */
-	ps_conn     = 0x01, /* Connecting... */
-	ps_protocol = 0x02, /* Have sent HSUP */
-	ps_identify = 0x04, /* Have sent BINF */
-	ps_verify   = 0x08, /* Have sent HPAS */
-	ps_normal   = 0x10, /* Are fully logged in */
+	ps_none, /* Not connected */
+	ps_conn, /* Connecting... */
+	ps_conn_ssl, /* SSL handshake */
+	ps_protocol, /* Have sent HSUP */
+	ps_identify, /* Have sent BINF */
+	ps_verify, /* Have sent HPAS */
+	ps_normal, /* Are fully logged in */
 };
 
 struct ADC_client;
@@ -41,6 +42,8 @@ enum ADC_client_callback_type
 	ADC_CLIENT_CONNECTING       = 1001,
 	ADC_CLIENT_CONNECTED        = 1002,
 	ADC_CLIENT_DISCONNECTED     = 1003,
+	ADC_CLIENT_SSL_HANDSHAKE    = 1101,
+	ADC_CLIENT_SSL_OK           = 1102,
 
 	ADC_CLIENT_LOGGING_IN       = 2001,
 	ADC_CLIENT_PASSWORD_REQ     = 2002,
@@ -115,6 +118,11 @@ struct ADC_client
 	char* hub_address;
 	char* nick;
 	char* desc;
+	int ssl_enabled;
+#ifdef SSL_SUPPORT
+	const SSL_METHOD* ssl_method;
+	SSL_CTX* ssl_ctx;
+#endif /*  SSL_SUPPORT */
 };
 
 int ADC_client_create(struct ADC_client* client, const char* nickname, const char* description);

src/tools/adcrush.c

@@ -1,5 +1,20 @@
-/**
- * An ADC client emulator.
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "adcclient.h"
@@ -23,7 +38,6 @@ static int cfg_level       = 1; /* activity level (0..3) */
 static int cfg_chat        = 0; /* chat mode, allow sending chat messages */
 static int cfg_quiet       = 0; /* quiet mode (no output) */
 static int cfg_clients     = ADC_CLIENTS_DEFAULT; /* number of clients */
-static int running         = 1;
 
 #define MAX_CHAT_MSGS 35
 const char* chat_messages[MAX_CHAT_MSGS] = {
@@ -328,9 +342,8 @@ void runloop(size_t clients)
 		ADC_client_connect(c, cfg_uri);
 	}
 
-	while (running)
+	while (net_backend_process())
 	{
-		net_backend_process();
 	}
 
 	for (n = 0; n < clients; n++)

src/tools/admin.c

@@ -1,5 +1,20 @@
-/**
- * A remote uhub admin client.
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 #include "adcclient.h"
@@ -20,12 +35,17 @@ static int handle(struct ADC_client* client, enum ADC_client_callback_type type,
 			puts("*** Disconnected.");
 			break;
 
+		case ADC_CLIENT_SSL_HANDSHAKE:
+			puts("*** SSL handshake.");
+			break;
+
 		case ADC_CLIENT_LOGGING_IN:
 			puts("*** Logging in...");
 			break;
 
 		case ADC_CLIENT_PASSWORD_REQ:
 			puts("*** Requesting password.");
+			break;
 
 		case ADC_CLIENT_LOGGED_IN:
 			puts("*** Logged in.");
@@ -40,7 +60,7 @@ static int handle(struct ADC_client* client, enum ADC_client_callback_type type,
 			break;
 
 		case ADC_CLIENT_USER_JOIN:
-			printf("    JOIN: %s\n", data->user->name);
+			printf("    JOIN: %s %s\n", sid_to_string(data->user->sid), data->user->name);
 			break;
 
 		case ADC_CLIENT_USER_QUIT:
@@ -80,10 +100,7 @@ int main(int argc, char** argv)
 	ADC_client_set_callback(&client, handle);
 	ADC_client_connect(&client, argv[1]);
 
-	while (running)
-	{
-		net_backend_process();
-	}
+	while (running && net_backend_process()) { }
 
 	ADC_client_destroy(&client);
 	net_destroy();

src/tools/fuzzer.h

@@ -1,3 +1,22 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 enum commandMode
 {
 	cm_bcast    = 0x01, /* B - broadcast */

src/tools/uhub-passwd.c

@@ -0,0 +1,341 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "uhub.h"
+#include <sqlite3.h>
+
+// #define DEBUG_SQL
+
+static sqlite3* db = NULL;
+static const char* command = NULL;
+static const char* filename = NULL;
+static const char* binary = NULL;
+
+typedef int (*command_func_t)(size_t, const char**);
+
+static int create(size_t argc, const char** argv);
+static int list(size_t argc, const char** argv);
+static int pass(size_t argc, const char** argv);
+static int add(size_t argc, const char** argv);
+static int del(size_t argc, const char** argv);
+static int mod(size_t argc, const char** argv);
+
+static struct commands
+{
+	command_func_t handle;
+	const char* command;
+	const char* usage;
+} COMMANDS[6] = {
+	{ &create, "create", "" },
+	{ &list,   "list",   "" },
+	{ &add,    "add",    "username password [credentials = user]" },
+	{ &del,    "del",    "username" },
+	{ &mod,    "mod",    "username credentials" },
+	{ &pass,   "pass",   "username password" },
+};
+
+static void print_usage(const char* str)
+{
+	fprintf(stderr, "Usage: %s filename %s %s\n", binary, command, str);
+	exit(1);
+}
+
+
+/**
+ * Escape an SQL statement and return a pointer to the string.
+ * NOTE: The returned value needs to be free'd.
+ *
+ * @return an escaped string.
+ */
+static char* sql_escape_string(const char* str)
+{
+	size_t i, n, size;
+	char* buf;
+
+	for (n = 0, size = strlen(str); n < strlen(str); n++)
+		if (str[n] == '\'')
+			size++;
+
+	buf = malloc(size+1);
+	for (n = 0, i = 0; n < strlen(str); n++)
+	{
+		if (str[n] == '\'')
+			buf[i++] = '\'';
+		buf[i++] = str[n];
+	}
+	buf[i++] = '\0';
+	return buf;
+}
+
+/**
+ * Validate credentials.
+ */
+static const char* validate_cred(const char* cred_str)
+{
+	if (!strcmp(cred_str, "admin"))
+		return "admin";
+
+	if (!strcmp(cred_str, "super"))
+		return "super";
+
+	if (!strcmp(cred_str, "op"))
+		return "op";
+
+	if (!strcmp(cred_str, "user"))
+		return "user";
+
+	fprintf(stderr, "Invalid user credentials. Must be one of: 'admin', 'super', 'op' or 'user'\n");
+	exit(1);
+}
+
+
+static void open_database()
+{
+	int res = sqlite3_open(filename, &db);
+
+	if (res)
+	{
+		fprintf(stderr, "Unable to open database: %s (result=%d)\n", filename, res);
+		exit(1);
+	}
+}
+
+static int sql_callback(void* ptr, int argc, char **argv, char **colName) { return 0; }
+
+static int sql_execute(const char* sql, ...)
+{
+	va_list args;
+	char query[1024];
+	char* errMsg;
+	int rc;
+
+	va_start(args, sql);
+	vsnprintf(query, sizeof(query), sql, args);
+
+#ifdef DEBUG_SQL
+	printf("SQL: %s\n", query);
+#endif
+
+	open_database();
+
+	rc = sqlite3_exec(db, query, sql_callback, NULL, &errMsg);
+	if (rc != SQLITE_OK) {
+		fprintf(stderr, "ERROR: %s\n", errMsg);
+		sqlite3_free(errMsg);
+	}
+
+	rc = sqlite3_changes(db);
+	sqlite3_close(db);
+	return rc;
+}
+
+static int create(size_t argc, const char** argv)
+{
+	const char* sql = "CREATE TABLE users"
+		"("
+			"nickname CHAR NOT NULL UNIQUE,"
+			"password CHAR NOT NULL,"
+			"credentials CHAR NOT NULL DEFAULT 'user',"
+			"created TIMESTAMP DEFAULT (DATETIME('NOW')),"
+			"activity TIMESTAMP DEFAULT (DATETIME('NOW'))"
+		");";
+
+	sql_execute(sql);
+	return 0;
+}
+
+
+static int sql_callback_list(void* ptr, int argc, char **argv, char **colName)
+{
+	int* found = (int*) ptr;
+	uhub_assert(strcmp(colName[0], "nickname") == 0 && strcmp(colName[2], "credentials") == 0);
+	printf("%s\t%s\n", argv[2], argv[0]);
+	(*found)++;
+	return 0;
+}
+
+static int list(size_t argc, const char** argv)
+{
+	char* errMsg;
+	int found = 0;
+	int rc;
+
+	open_database();
+
+	rc = sqlite3_exec(db, "SELECT * FROM users;", sql_callback_list, &found, &errMsg);
+	if (rc != SQLITE_OK) {
+#ifdef DEBUG_SQL
+		fprintf(stderr, "SQL: ERROR: %s (%d)\n", errMsg, rc);
+#endif
+		sqlite3_free(errMsg);
+		exit(1);
+	}
+
+	sqlite3_close(db);
+	return 0;
+}
+
+
+static int add(size_t argc, const char** argv)
+{
+	char* user = NULL;
+	char* pass = NULL;
+	const char* cred = NULL;
+	int rc;
+
+	if (argc < 2)
+		print_usage("username password [credentials = user]");
+
+	user = sql_escape_string(argv[0]);
+	pass = sql_escape_string(argv[1]);
+	cred = validate_cred(argv[2] ? argv[2] : "user");
+
+	rc = sql_execute("INSERT INTO users (nickname, password, credentials) VALUES('%s', '%s', '%s');", user, pass, cred);
+
+	free(user);
+	free(pass);
+
+	if (rc != 1)
+	{
+		fprintf(stderr, "Unable to add user \"%s\"\n", argv[0]);
+		return 1;
+	}
+	return 0;
+}
+
+static int mod(size_t argc, const char** argv)
+{
+	char* user = NULL;
+	const char* cred = NULL;
+	int rc;
+
+	if (argc < 2)
+		print_usage("username credentials");
+
+	user = sql_escape_string(argv[0]);
+	cred = validate_cred(argv[1]);
+
+	rc = sql_execute("UPDATE users SET credentials = '%s' WHERE nickname = '%s';", cred, user);
+
+	free(user);
+
+	if (rc != 1)
+	{
+		fprintf(stderr, "Unable to set credentials for user \"%s\"\n", argv[0]);
+		return 1;
+	}
+	return 0;
+}
+
+static int pass(size_t argc, const char** argv)
+{
+	char* user = NULL;
+	char* pass = NULL;
+	int rc;
+
+	if (argc < 2)
+		print_usage("username password");
+
+	user = sql_escape_string(argv[0]);
+	pass = sql_escape_string(argv[1]);
+
+	rc = sql_execute("UPDATE users SET password = '%s' WHERE nickname = '%s';", pass, user);
+
+	free(user);
+	free(pass);
+
+	if (rc != 1)
+	{
+		fprintf(stderr, "Unable to change password for user \"%s\"\n", argv[0]);
+		return 1;
+	}
+	
+	return 0;
+}
+
+
+static int del(size_t argc, const char** argv)
+{
+	char* user = NULL;
+	int rc;
+
+	if (argc < 2)
+		print_usage("username");
+
+	user = sql_escape_string(argv[0]);
+
+	rc = sql_execute("DELETE FROM users WHERE nickname = '%s';", user);
+	free(user);
+
+	if (rc != 1)
+	{
+		fprintf(stderr, "Unable to delete user \"%s\".\n", argv[0]);
+		return 1;
+	}
+
+	return 0;
+}
+
+void main_usage(const char* binary)
+{
+	printf(
+			"Usage: %s filename command [...]\n"
+			"\n"
+			"Command syntax:\n"
+			"  create\n"
+			"  add  username password [credentials = user]\n"
+			"  del  username\n"
+			"  mod  username credentials\n"
+			"  pass username password\n"
+			"  list\n"
+			"\n"
+			"Parameters:\n"
+			"  'filename' is a database file\n"
+			"  'username' is a nickname (UTF-8, up to 64 bytes)\n"
+			"  'password' is a password (UTF-8, up to 64 bytes)\n"
+			"  'credentials' is one of 'admin', 'super', 'op', 'user'\n"
+			"\n"
+		, binary);
+}
+
+int main(int argc, char** argv)
+{
+	size_t n = 0;
+	binary = argv[0];
+	filename = argv[1];
+	command = argv[2];
+
+	if (argc < 3)
+	{
+		main_usage(argv[0]);
+		return 1;
+	}
+
+	for (; n < sizeof(COMMANDS) / sizeof(COMMANDS[0]); n++)
+	{
+		if (!strcmp(command, COMMANDS[n].command))
+			return COMMANDS[n].handle(argc - 2, (const char**) &argv[3]);
+	}
+
+	// Unknown command!
+	main_usage(argv[0]);
+	return 1;
+}
+
+

src/uhub.h

@@ -25,8 +25,6 @@
 /* #define MEMORY_DEBUG */
 /* #define DEBUG_SENDQ 1 */
 
-#define PLUGIN_SUPPORT
-
 #include "system.h"
 
 #ifndef WIN32
@@ -60,6 +58,7 @@ extern "C" {
 
 #include "adc/adcconst.h"
 
+#include "util/cbuffer.h"
 #include "util/config_token.h"
 #include "util/credentials.h"
 #include "util/floodctl.h"
@@ -92,6 +91,7 @@ extern "C" {
 #include "core/commands.h"
 #include "core/inf.h"
 #include "core/hubevent.h"
+#include "core/plugincallback.h"
 #include "core/plugininvoke.h"
 #include "core/pluginloader.h"
 

src/util/cbuffer.c

@@ -0,0 +1,115 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "uhub.h"
+
+#define CBUF_FLAG_CONST_BUFFER 0x01
+
+struct cbuffer
+{
+	size_t capacity;
+	size_t size;
+	size_t flags;
+	char* buf;
+};
+
+extern struct cbuffer* cbuf_create(size_t capacity)
+{
+	struct cbuffer* buf = hub_malloc(sizeof(struct cbuffer));
+	buf->capacity = capacity;
+	buf->size = 0;
+	buf->flags = 0;
+	buf->buf = hub_malloc(capacity + 1);
+	return buf;
+}
+
+struct cbuffer* cbuf_create_const(const char* buffer)
+{
+	struct cbuffer* buf = hub_malloc(sizeof(struct cbuffer));
+	buf->capacity = 0;
+	buf->size = strlen(buffer);
+	buf->flags = CBUF_FLAG_CONST_BUFFER;
+	buf->buf = (char*) buffer;
+	return buf;
+}
+
+void cbuf_destroy(struct cbuffer* buf)
+{
+	if (!(buf->flags & CBUF_FLAG_CONST_BUFFER))
+	{
+		hub_free(buf->buf);
+	}
+	hub_free(buf);
+}
+
+void cbuf_resize(struct cbuffer* buf, size_t capacity)
+{
+	uhub_assert(buf->flags == 0);
+	buf->capacity = capacity;
+	buf->buf = hub_realloc(buf->buf, capacity + 1);
+}
+
+void cbuf_append_bytes(struct cbuffer* buf, const char* msg, size_t len)
+{
+	uhub_assert(buf->flags == 0);
+	if (buf->size + len >= buf->capacity)
+		cbuf_resize(buf, buf->size + len);
+
+	memcpy(buf->buf + buf->size, msg, len);
+	buf->size += len;
+	buf->buf[buf->size] = '\0';
+}
+
+void cbuf_append(struct cbuffer* buf, const char* msg)
+{
+	size_t len = strlen(msg);
+	uhub_assert(buf->flags == 0);
+	cbuf_append_bytes(buf, msg, len);
+}
+
+void cbuf_append_format(struct cbuffer* buf, const char* format, ...)
+{
+	static char tmp[1024];
+	va_list args;
+	int bytes;
+	uhub_assert(buf->flags == 0);
+	va_start(args, format);
+	bytes = vsnprintf(tmp, 1024, format, args);
+	va_end(args);
+	cbuf_append_bytes(buf, tmp, bytes);
+}
+
+void cbuf_append_strftime(struct cbuffer* buf, const char* format, const struct tm* tm)
+{
+	static char tmp[1024];
+	int bytes;
+	uhub_assert(buf->flags == 0);
+	bytes = strftime(tmp, sizeof(tmp), format, tm);
+	cbuf_append_bytes(buf, tmp, bytes);
+}
+
+const char* cbuf_get(struct cbuffer* buf)
+{
+	return buf->buf;
+}
+
+size_t cbuf_size(struct cbuffer* buf)
+{
+	return buf->size;
+}

src/util/cbuffer.h

@@ -0,0 +1,38 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * 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 3 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef HAVE_UTIL_CBUFFER_H
+#define HAVE_UTIL_CBUFFER_H
+
+struct cbuffer;
+
+extern struct cbuffer* cbuf_create(size_t capacity);
+extern struct cbuffer* cbuf_create_const(const char* buffer);
+extern void cbuf_destroy(struct cbuffer* buf);
+extern void cbuf_resize(struct cbuffer* buf, size_t capacity);
+extern void cbuf_append_bytes(struct cbuffer* buf, const char* msg, size_t len);
+extern void cbuf_append(struct cbuffer* buf, const char* msg);
+extern void cbuf_append_format(struct cbuffer* buf, const char* format, ...);
+extern void cbuf_append_strftime(struct cbuffer* buf, const char* format, const struct tm* tm);
+
+extern const char* cbuf_get(struct cbuffer* buf);
+extern size_t cbuf_size(struct cbuffer* buf);
+
+
+#endif /* HAVE_UTIL_CBUFFER_H */

src/util/config_token.c

@@ -30,7 +30,7 @@ struct cfg_tokens
 struct cfg_tokens* cfg_tokenize(const char* line)
 {
 	struct cfg_tokens* tokens = (struct cfg_tokens*) hub_malloc_zero(sizeof(struct cfg_tokens));
-	char* buffer = (char*) hub_malloc_zero(strlen(line));
+	char* buffer = (char*) hub_malloc_zero(strlen(line) + 1);
 	char* out = buffer;
 	const char* p = line;
 	int backslash = 0;
@@ -68,6 +68,7 @@ struct cfg_tokens* cfg_tokenize(const char* line)
 				else
 				{
 					RESET_TOKEN;
+					hub_free(buffer);
 					return tokens;
 				}
 				break;
@@ -115,15 +116,19 @@ struct cfg_tokens* cfg_tokenize(const char* line)
 	}
 
 	RESET_TOKEN;
+	hub_free(buffer);
 	return tokens;
 }
 
 void cfg_tokens_free(struct cfg_tokens* tokens)
+{
+	if (tokens)
 	{
 		list_clear(tokens->list, hub_free);
 		list_destroy(tokens->list);
 		hub_free(tokens);
 	}
+}
 
 int cfg_token_add(struct cfg_tokens* tokens, char* new_token)
 {

src/util/getopt.h

@@ -26,4 +26,5 @@ extern int optind;
 
 extern int getopt(int argc, char* const argv[], const char *optstring);
 
-#endif
+#endif /* NEED_GETOPT */
+

src/util/ipcalc.c

@@ -203,7 +203,6 @@ int ip_mask_create_left(int af, int bits, struct ip_addr_encap* result)
 		fill = (128-bits) / 8;
 		remain_bits = (128-bits) % 8;
 		mask = (0xff << (8 - remain_bits));
-		n = 0;
 
 		for (n = 0; n < fill; n++)
 			((uint8_t*) &result->internal_ip_data.in6)[n] = (uint8_t) 0xff;
@@ -252,7 +251,6 @@ int ip_mask_create_right(int af, int bits, struct ip_addr_encap* result)
 		fill = (128-bits) / 8;
 		remain_bits = (128-bits) % 8;
 		mask8 = (0xff >> (8 - remain_bits));
-		n = 0;
 		start = 16-fill;
 		
 		for (n = 0; n < start; n++)

src/util/log.c

@@ -51,6 +51,7 @@ static const char* prefixes[] =
 	"DUMP",
 	"MEM",
 	"PROTO",
+	"PLUGIN",
 	0
 };
 
@@ -185,12 +186,12 @@ void hub_log(int log_verbosity, const char *format, ...)
 		
 		if (logfile)
 		{
-			fprintf(logfile, "%s %5s: %s\n", timestamp, prefixes[log_verbosity], logmsg);
+			fprintf(logfile, "%s %6s: %s\n", timestamp, prefixes[log_verbosity], logmsg);
 			fflush(logfile);
 		}
 		else
 		{
-			fprintf(stderr, "%s %5s: %s\n", timestamp, prefixes[log_verbosity], logmsg);	
+			fprintf(stderr, "%s %6s: %s\n", timestamp, prefixes[log_verbosity], logmsg);
 		}
 	}
 

src/util/log.h

@@ -31,6 +31,7 @@ enum log_verbosity {
 	log_dump     = 7,
 	log_memory   = 8,
 	log_protocol = 9,
+	log_plugin   = 10,
 };
 
 #define LOG_FATAL(format, ...)  hub_log(log_fatal,    format, ## __VA_ARGS__)
@@ -42,9 +43,11 @@ enum log_verbosity {
 #ifdef DEBUG
 # define LOG_DEBUG(format, ...)  hub_log(log_debug,    format, ## __VA_ARGS__)
 # define LOG_TRACE(format, ...)  hub_log(log_trace,    format, ## __VA_ARGS__)
+# define LOG_PLUGIN(format, ...) hub_log(log_plugin,   format, ## __VA_ARGS__)
 #else
 # define LOG_DEBUG(format, ...)  do { } while(0)
 # define LOG_TRACE(format, ...)  do { } while(0)
+# define LOG_PLUGIN(format, ...) do { } while(0)
 #endif
 
 #ifdef LOWLEVEL_DEBUG

src/util/memory.h

@@ -35,9 +35,11 @@ extern char* debug_mem_strndup(const char* s, size_t n);
 
 #define hub_malloc     malloc
 #define hub_free       free
+#define hub_realloc    realloc
 #define hub_strdup     strdup
 #define hub_strndup    strndup
 
+
 #endif
 
 extern void* hub_malloc_zero(size_t size);

src/util/misc.c

@@ -281,6 +281,27 @@ int uhub_atoi(const char* value) {
 	return value[0] == '-' ? -val : val;
 }
 
+int is_number(const char* value, int* num)
+{
+	int len = strlen(value);
+	int offset = (value[0] == '-') ? 1 : 0;
+	int val = 0;
+	int i = offset;
+
+	if (!*(value + offset))
+		return 0;
+
+	for (; i < len; i++)
+		if (value[i] > '9' || value[i] < '0')
+			return 0;
+
+	for (i = offset; i< len; i++)
+		val = val*10 + (value[i] - '0');
+	*num = value[0] == '-' ? -val : val;
+
+	return 1;
+}
+
 
 /*
  * FIXME: -INTMIN is wrong!
@@ -293,7 +314,8 @@ const char* uhub_itoa(int val)
 	memset(buf, 0, sizeof(buf));
 	if (!val)
 	{
-		strcat(buf, "0");
+		buf[0] = '0';
+		buf[1] = '\0';
 		return buf;
 	}
 	i = sizeof(buf) - 1;
@@ -314,7 +336,8 @@ const char* uhub_ulltoa(uint64_t val)
 	
 	if (!val)
 	{
-		strcat(buf, "0");
+		buf[0] = '0';
+		buf[1] = '\0';
 		return buf;
 	}
 	i = sizeof(buf) - 1;
@@ -399,7 +422,7 @@ const char* get_timestamp(time_t now)
 {
 	static char ts[32] = {0, };
 	struct tm* t  = localtime(&now);
-	sprintf(ts, "[%02d:%02d]", t->tm_hour, t->tm_min);
+	snprintf(ts, sizeof(ts), "[%02d:%02d]", t->tm_hour, t->tm_min);
 	return ts;
 }
 

src/util/misc.h

@@ -36,6 +36,12 @@ extern char* strip_white_space(char* string);
 extern void strip_off_ini_line_comments(char* line, int line_count);
 extern char* strip_off_quotes(char* line);
 
+/**
+ * Convert number in str to integer and store it in num.
+ * @return 1 on success, or 0 on error.
+ */
+extern int is_number(const char* str, int* num);
+
 extern int file_read_lines(const char* file, void* data, file_line_handler_t handler);
 
 /**

version.h

@@ -1,4 +1,6 @@
+#if !defined(_MSC_VER)
 #include "revision.h"
+#endif
 
 #ifndef PRODUCT
 #define PRODUCT "uhub"
@@ -12,14 +14,10 @@
 #define REVISION ""
 #define PRODUCT_STRING PRODUCT "/" VERSION
 #else
-#define REVISION "(git: " GIT_REVISION ")"
-#ifdef GIT_VERSION
-#define PRODUCT_STRING PRODUCT "/" GIT_VERSION
-#else
-#define PRODUCT_STRING PRODUCT "/" VERSION " " REVISION
-#endif
+#define REVISION "git-" GIT_REVISION
+#define PRODUCT_STRING PRODUCT "/" VERSION "-" REVISION
 #endif
 
 #ifndef COPYRIGHT
-#define COPYRIGHT "Copyright (c) 2007-2010, Jan Vidar Krey <janvidar@extatic.org>"
+#define COPYRIGHT "Copyright (c) 2007-2012, Jan Vidar Krey <janvidar@extatic.org>"
 #endif

vs2010/.gitignore

@@ -0,0 +1,7 @@
+*.vcproj.user
+*.vcproj.filters
+*.ncb
+*.aps
+*.suo
+Debug
+Release

vs2010/plugins/mod_auth_simple/mod_auth_simple.vcxproj

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}</ProjectGuid>
+    <RootNamespace>mod_auth_simple</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)vs2010\$(Configuration);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\uhub_utils.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\plugins\mod_auth_simple.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/plugins/mod_auth_sqlite/mod_auth_sqlite.vcxproj

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0EF03E84-2720-4616-A5BE-4D5737F68445}</ProjectGuid>
+    <RootNamespace>mod_auth_sqlite</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath);$(SolutionDir)..\thirdparty\sqlite</IncludePath>
+    <LibraryPath>$(SolutionDir)vs2010\$(Configuration);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\uhub_utils.lib;$(SolutionDir)\$(Configuration)\sqlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>
+      </DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\plugins\mod_auth_sqlite.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/plugins/mod_example/mod_example.vcxproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>mod_example</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)vs2010\$(Configuration);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\uhub_utils.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\plugins\mod_example.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/thirdparty/sqlite/sqlite.vcxproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\thirdparty\sqlite\shell.c" />
+    <ClCompile Include="..\..\..\thirdparty\sqlite\sqlite3.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\thirdparty\sqlite\sqlite3.h" />
+    <ClInclude Include="..\..\..\thirdparty\sqlite\sqlite3ext.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A4FC9D62-D544-4D2A-88d7-A58529C3460B}</ProjectGuid>
+    <RootNamespace>sqlite</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)vs2010\$(Configuration);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\uhub_utils.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/uhub-passwd/uhub-passwd.vcxproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>uhubpasswd</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <LibraryPath>$(SolutionDir)vs2010\$(Configuration);$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath);$(SolutionDir)..\thirdparty\sqlite</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(SolutionDir)\$(Configuration)\uhub_utils.lib;$(SolutionDir)\$(Configuration)\sqlite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\tools\uhub-passwd.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/uhub.sln

@@ -0,0 +1,73 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uhub", "uhub.vcxproj", "{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75} = {0A3C1519-D877-47D9-A82E-40AC1BC79D75}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uhub_utils", "uhub_utils\uhub_utils.vcxproj", "{0A3C1519-D877-47D9-A82E-40AC1BC79D75}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_auth_simple", "plugins\mod_auth_simple\mod_auth_simple.vcxproj", "{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75} = {0A3C1519-D877-47D9-A82E-40AC1BC79D75}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_example", "plugins\mod_example\mod_example.vcxproj", "{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75} = {0A3C1519-D877-47D9-A82E-40AC1BC79D75}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_auth_sqlite", "plugins\mod_auth_sqlite\mod_auth_sqlite.vcxproj", "{0EF03E84-2720-4616-A5BE-4D5737F68445}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75} = {0A3C1519-D877-47D9-A82E-40AC1BC79D75}
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B} = {A4FC9D62-D544-4D2A-88D7-A58529C3460B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "thirdparty\sqlite\sqlite.vcxproj", "{A4FC9D62-D544-4D2A-88D7-A58529C3460B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uhub-passwd", "uhub-passwd\uhub-passwd.vcxproj", "{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75} = {0A3C1519-D877-47D9-A82E-40AC1BC79D75}
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B} = {A4FC9D62-D544-4D2A-88D7-A58529C3460B}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}.Debug|Win32.Build.0 = Debug|Win32
+		{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}.Release|Win32.ActiveCfg = Release|Win32
+		{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}.Release|Win32.Build.0 = Release|Win32
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75}.Debug|Win32.Build.0 = Debug|Win32
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75}.Release|Win32.ActiveCfg = Release|Win32
+		{0A3C1519-D877-47D9-A82E-40AC1BC79D75}.Release|Win32.Build.0 = Release|Win32
+		{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}.Debug|Win32.Build.0 = Debug|Win32
+		{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}.Release|Win32.ActiveCfg = Release|Win32
+		{A6674BB3-1B23-4E99-AF9B-1CCDB4EB049A}.Release|Win32.Build.0 = Release|Win32
+		{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}.Debug|Win32.Build.0 = Debug|Win32
+		{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}.Release|Win32.ActiveCfg = Release|Win32
+		{9BBAEFDA-8E0E-4E7F-B8B6-0050432FC45B}.Release|Win32.Build.0 = Release|Win32
+		{0EF03E84-2720-4616-A5BE-4D5737F68445}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0EF03E84-2720-4616-A5BE-4D5737F68445}.Debug|Win32.Build.0 = Debug|Win32
+		{0EF03E84-2720-4616-A5BE-4D5737F68445}.Release|Win32.ActiveCfg = Release|Win32
+		{0EF03E84-2720-4616-A5BE-4D5737F68445}.Release|Win32.Build.0 = Release|Win32
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B}.Debug|Win32.Build.0 = Debug|Win32
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B}.Release|Win32.ActiveCfg = Release|Win32
+		{A4FC9D62-D544-4D2A-88D7-A58529C3460B}.Release|Win32.Build.0 = Release|Win32
+		{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}.Debug|Win32.Build.0 = Debug|Win32
+		{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}.Release|Win32.ActiveCfg = Release|Win32
+		{E92EB860-AE9E-4532-A75F-0929A7BCF6D0}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

vs2010/uhub.vcxproj

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{98D8BFE9-DACD-40E1-B7BE-C9079ABF832E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>uhub</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\$(Configuration);$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(projectDir)..\src\</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <CompileAsManaged>false</CompileAsManaged>
+      <CompileAs>CompileAsC</CompileAs>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);ws2_32.lib;uhub_utils.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\adc\message.c" />
+    <ClCompile Include="..\src\adc\sid.c" />
+    <ClCompile Include="..\src\core\auth.c" />
+    <ClCompile Include="..\src\core\commands.c" />
+    <ClCompile Include="..\src\core\config.c" />
+    <ClCompile Include="..\src\core\eventqueue.c" />
+    <ClCompile Include="..\src\core\hub.c" />
+    <ClCompile Include="..\src\core\hubevent.c" />
+    <ClCompile Include="..\src\core\hubio.c" />
+    <ClCompile Include="..\src\core\inf.c" />
+    <ClCompile Include="..\src\core\main.c" />
+    <ClCompile Include="..\src\core\netevent.c" />
+    <ClCompile Include="..\src\core\plugincallback.c" />
+    <ClCompile Include="..\src\core\plugininvoke.c" />
+    <ClCompile Include="..\src\core\pluginloader.c" />
+    <ClCompile Include="..\src\core\probe.c" />
+    <ClCompile Include="..\src\core\route.c" />
+    <ClCompile Include="..\src\core\user.c" />
+    <ClCompile Include="..\src\core\usermanager.c" />
+    <ClCompile Include="..\src\network\backend.c" />
+    <ClCompile Include="..\src\network\connection.c" />
+    <ClCompile Include="..\src\network\epoll.c" />
+    <ClCompile Include="..\src\network\kqueue.c" />
+    <ClCompile Include="..\src\network\network.c" />
+    <ClCompile Include="..\src\network\select.c" />
+    <ClCompile Include="..\src\network\timeout.c" />
+    <ClCompile Include="..\src\network\timer.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\adc\adcconst.h" />
+    <ClInclude Include="..\src\adc\message.h" />
+    <ClInclude Include="..\src\adc\sid.h" />
+    <ClInclude Include="..\src\core\auth.h" />
+    <ClInclude Include="..\src\core\commands.h" />
+    <ClInclude Include="..\src\core\commands_builtin.h" />
+    <ClInclude Include="..\src\core\config.h" />
+    <ClInclude Include="..\src\core\eventid.h" />
+    <ClInclude Include="..\src\core\eventqueue.h" />
+    <ClInclude Include="..\src\core\gen_config.h" />
+    <ClInclude Include="..\src\core\hub.h" />
+    <ClInclude Include="..\src\core\hubevent.h" />
+    <ClInclude Include="..\src\core\hubio.h" />
+    <ClInclude Include="..\src\core\inf.h" />
+    <ClInclude Include="..\src\core\netevent.h" />
+    <ClInclude Include="..\src\core\plugincallback.h" />
+    <ClInclude Include="..\src\core\plugininvoke.h" />
+    <ClInclude Include="..\src\core\pluginloader.h" />
+    <ClInclude Include="..\src\core\probe.h" />
+    <ClInclude Include="..\src\core\route.h" />
+    <ClInclude Include="..\src\core\user.h" />
+    <ClInclude Include="..\src\core\usermanager.h" />
+    <ClInclude Include="..\src\network\backend.h" />
+    <ClInclude Include="..\src\network\common.h" />
+    <ClInclude Include="..\src\network\connection.h" />
+    <ClInclude Include="..\src\network\network.h" />
+    <ClInclude Include="..\src\network\timeout.h" />
+    <ClInclude Include="..\src\plugin_api\command_api.h" />
+    <ClInclude Include="..\src\plugin_api\handle.h" />
+    <ClInclude Include="..\src\system.h" />
+    <ClInclude Include="..\src\uhub.h" />
+    <ClInclude Include="..\version.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

vs2010/uhub_utils/uhub_utils.vcxproj

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0A3C1519-D877-47D9-A82E-40AC1BC79D75}</ProjectGuid>
+    <RootNamespace>uhub_utils</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)..\src;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\util\cbuffer.c" />
+    <ClCompile Include="..\..\src\util\config_token.c" />
+    <ClCompile Include="..\..\src\util\credentials.c" />
+    <ClCompile Include="..\..\src\util\floodctl.c" />
+    <ClCompile Include="..\..\src\util\getopt.c" />
+    <ClCompile Include="..\..\src\util\ipcalc.c" />
+    <ClCompile Include="..\..\src\util\list.c" />
+    <ClCompile Include="..\..\src\util\log.c" />
+    <ClCompile Include="..\..\src\util\memory.c" />
+    <ClCompile Include="..\..\src\util\misc.c" />
+    <ClCompile Include="..\..\src\util\rbtree.c" />
+    <ClCompile Include="..\..\src\util\tiger.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\util\cbuffer.h" />
+    <ClInclude Include="..\..\src\util\config_token.h" />
+    <ClInclude Include="..\..\src\util\credentials.h" />
+    <ClInclude Include="..\..\src\util\floodctl.h" />
+    <ClInclude Include="..\..\src\util\getopt.h" />
+    <ClInclude Include="..\..\src\util\ipcalc.h" />
+    <ClInclude Include="..\..\src\util\list.h" />
+    <ClInclude Include="..\..\src\util\log.h" />
+    <ClInclude Include="..\..\src\util\memory.h" />
+    <ClInclude Include="..\..\src\util\misc.h" />
+    <ClInclude Include="..\..\src\util\rbtree.h" />
+    <ClInclude Include="..\..\src\util\tiger.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>