Added all builtin commands plus some cleanups.

Started working on command storage by plugin.

.gitignore

@@ -2,7 +2,8 @@
 *.[oa]
 *.exe
 *.gch
+mod_*.so
 uhub-admin
 adcrush
 uhub
-
+revision.h*

AUTHORS

@@ -1,6 +1,8 @@
-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
 

BSDmakefile

@@ -0,0 +1,8 @@
+
+GMAKE=gmake
+
+all:
+	@${GMAKE} ${.TARGETS}
+
+${.TARGETS}: all
+

ChangeLog

@@ -1,3 +1,37 @@
+0.3.2:
+- Fixed bugs in the kqueue network backend (OSX/BSD)
+- Rewrote the configuration backend code.
+- Added support for escaping characters in the configuration files.
+- Updated the !broadcast command to send private messages instead of main chat messages.
+- Adding support for redirecting clients to other hubs when they fail to log in.
+- Fix some out of memory related crashes.
+- Fixed minor memory leaks.
+
+
+0.3.1:
+- Fixed bug where !getip did not work.
+- Added flood control configuration options.
+- Added configuration options to disallow old/obsolete ADC clients.
+- Fixed crash bugs, an freezes.
+- SSL/TLS fix for tls_require configuration option.
+- Fixed disconnect messages, so that clients can interpret them.
+- Fixed bugs where share limits could be circumvented.
+- Added support for listening to multiple ports.
+- kqueue backend for Mac OS X, and BSD systems.
+
+
+0.3.0:
+- More user commands: ban, broadcast, mute, rules, history, myip, whoip, log
+- Experimental SSL support
+- Large rewrite of the network stack in order to support SSL.
+- Added rule file for defining hub rules.
+- Many crash fixes and other important bug fixes.
+- Optimizations: O(1) timeout scheduler
+- New sid allocation code.
+- Added configurable server_listen_backlog (default 50).
+- Added init.d scripts for RedHat/CentOS
+
+
 0.2.8:
 - Fix bug #13: getsockname() failure, use sockaddr from accept() instead.
 - Fix bug #10: Improve logging, ensure logs are machine readable.

GNUmakefile

@@ -3,13 +3,14 @@
 ## Copyright (C) 2007-2010, Jan Vidar Krey <janvidar@extatic.org>
  #
 
+-include Makefile.private
+
 CC            = gcc
 LD            := $(CC)
 MV            := mv
 RANLIB        := ranlib
 CFLAGS        += -pipe -Wall
 USE_SSL       ?= NO
-USE_LIBEVENT  ?= NO
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES
@@ -18,15 +19,22 @@ STACK_PROTECT ?= NO
 
 ifeq ($(OS), Windows_NT)
 WINDOWS       ?= YES
+OPSYS ?= Windows
+else
+OPSYS ?= $(shell uname)
 endif
 
-ifeq (SOLARIS,YES)
+ifeq ($(OPSYS),SunOS)
 LDLIBS        += -lsocket -lnsl
 endif
 
+ifeq ($(OPSYS),Haiku)
+LDLIBS        += -lnetwork
+endif
+
 CFLAGS        += -I./src/
 
-ifeq ($(WINDOWS),YES)
+ifeq ($(OPSYS),Windows)
 USE_BIGENDIAN := NO
 LDLIBS        += -lws2_32
 UHUB_CONF_DIR ?= c:/uhub/
@@ -34,18 +42,18 @@ UHUB_PREFIX   ?= c:/uhub/
 CFLAGS        += -mno-cygwin
 LDFLAGS       += -mno-cygwin
 BIN_EXT       ?= .exe
-GIT_REVISION  ?= NO
 else
 DESTDIR       ?= /
 UHUB_CONF_DIR ?= $(DESTDIR)/etc/uhub
 UHUB_PREFIX   ?= $(DESTDIR)/usr/local
+UHUB_MOD_DIR  ?= $(DESTDIR)/var/lib/uhub
 CFLAGS        += -I/usr/local/include
 LDFLAGS       += -L/usr/local/lib
 BIN_EXT       ?=
 endif
 
 ifeq ($(SILENT),YES)
-	MSG_CC=@echo "  CC:" $(notdir $^) &&
+	MSG_CC=@echo "  CC:" $(notdir $<) &&
 	MSG_LD=@echo "  LD:" $(notdir $@) &&
 	MSG_AR=@echo "  AR:" $(notdir $@) &&
 else
@@ -63,15 +71,10 @@ else
 	MSG_CLEAN="Clean as a whistle"
 endif
 
-# CFLAGS        += -I/source/libevent
-# LDFLAGS       += -L/source/libevent
-
 ifeq ($(RELEASE),YES)
 CFLAGS        += -O3 -DNDEBUG
-GIT_REVISION  ?= NO
 else
 CFLAGS        += -ggdb -DDEBUG
-GIT_REVISION  ?= YES
 endif
 
 ifeq ($(STACK_PROTECT),YES)
@@ -116,18 +119,11 @@ CFLAGS        += -DSSL_SUPPORT
 LDLIBS        += -lssl
 endif
 
-ifeq ($(USE_LIBEVENT),YES)
+LDLIBS        += -ldl
-CFLAGS        += -DUSE_LIBEVENT
-LDLIBS        += -levent
-ifneq ($(LIBEVENT_PATH),)
-CFLAGS        += -I$(LIBEVENT_PATH)
-LDFLAGS       += -L$(LIBEVENT_PATH)
-endif
-endif
 
-ifeq ($(GIT_REVISION),YES)
+GIT_VERSION=$(shell git describe --tags 2>/dev/null || echo "")
-CFLAGS        += -DGIT_REVISION=\"$(shell git show --abbrev-commit | head -n 1 | cut -f 2 -d " ")\"
+GIT_REVISION=$(shell git show --abbrev-commit  2>/dev/null | head -n 1 | cut -f 2 -d " " || echo "")
-endif
+OLD_REVISION=$(shell grep GIT_REVISION revision.h 2>/dev/null | cut -f 3 -d " " | tr -d "\"")
 
 # Sources
 libuhub_SOURCES := \
@@ -144,23 +140,35 @@ 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/libevent.c \
+		src/network/kqueue.c \
 		src/network/network.c \
+		src/network/select.c \
+		src/network/timeout.c \
+		src/network/timer.c
+
+
+libadc_common_SOURCES := \
+		src/adc/message.c \
+		src/adc/sid.c
+
+libutils_SOURCES := \
+		src/util/config_token.c \
+		src/util/credentials.c \
+		src/util/floodctl.c \
 		src/util/ipcalc.c \
 		src/util/list.c \
 		src/util/log.c \
 		src/util/memory.c \
 		src/util/misc.c \
 		src/util/rbtree.c \
-		src/util/timeout.c \
 		src/util/tiger.c
 
-libadc_common_SOURCES := \
-		src/adc/message.c \
-		src/adc/sid.c
-
 libadc_client_SOURCES := \
 		src/tools/adcclient.c
 
@@ -171,21 +179,43 @@ adcrush_SOURCES := src/tools/adcrush.c
 admin_SOURCES := src/tools/admin.c
 
 autotest_SOURCES := \
-		autotest/test_message.tcc \
+		autotest/test_credentials.tcc \
+		autotest/test_eventqueue.tcc \
+		autotest/test_hub.tcc \
+		autotest/test_inf.tcc \
+		autotest/test_ipfilter.tcc \
 		autotest/test_list.tcc \
 		autotest/test_memory.tcc \
-		autotest/test_ipfilter.tcc \
+		autotest/test_message.tcc \
-		autotest/test_inf.tcc \
-		autotest/test_hub.tcc \
 		autotest/test_misc.tcc \
+		autotest/test_sid.tcc \
 		autotest/test_tiger.tcc \
-		autotest/test_usermanager.tcc \
+		autotest/test_timer.tcc \
-		autotest/test_eventqueue.tcc
+		autotest/test_tokenizer.tcc \
+		autotest/test_usermanager.tcc
 
 autotest_OBJECTS = autotest.o
 
+# Plugin targets:
+plugin_example_SOURCES := src/plugins/mod_example.c
+plugin_example_TARGET  := mod_example.so
+
+plugin_logging_SOURCES := src/plugins/mod_logging.c
+plugin_logging_TARGET  := mod_logging.so
+
+plugin_auth_SOURCES    := src/plugins/mod_auth_simple.c
+plugin_auth_TARGET     := mod_auth_simple.so
+
+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
+
 # Source to objects
 libuhub_OBJECTS       := $(libuhub_SOURCES:.c=.o)
+libutils_OBJECTS      := $(libutils_SOURCES:.c=.o)
 libadc_client_OBJECTS := $(libadc_client_SOURCES:.c=.o)
 libadc_common_OBJECTS := $(libadc_common_SOURCES:.c=.o)
 
@@ -193,34 +223,70 @@ uhub_OBJECTS          := $(uhub_SOURCES:.c=.o)
 adcrush_OBJECTS       := $(adcrush_SOURCES:.c=.o)
 admin_OBJECTS         := $(admin_SOURCES:.c=.o)
 
-all_OBJECTS     := $(libuhub_OBJECTS) $(uhub_OBJECTS) $(adcrush_OBJECTS) $(autotest_OBJECTS) $(admin_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+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) $(plugin_chat_history_TARGET)
 
 uhub_BINARY=uhub$(BIN_EXT)
 adcrush_BINARY=adcrush$(BIN_EXT)
 admin_BINARY=uhub-admin$(BIN_EXT)
 autotest_BINARY=autotest/test$(BIN_EXT)
 
-%.o: %.c
+ifeq ($(USE_PLUGINS),YES)
-	$(MSG_CC) $(CC) -c $(CFLAGS) -o $@ $^
+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)
 
-$(adcrush_BINARY): $(adcrush_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+plugins: $(uhub_BINARY) $(all_plugins)
+
+$(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)
+
+$(plugin_example_TARGET): $(plugin_example_SOURCES)
+	$(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)
+
+$(adcrush_BINARY): $(adcrush_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
-$(admin_BINARY): $(admin_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+$(admin_BINARY): $(admin_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
-$(uhub_BINARY): $(uhub_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS)
+$(uhub_BINARY): $(uhub_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
 autotest.c: $(autotest_SOURCES)
 	$(shell exotic --standalone $(autotest_SOURCES) > $@)
 
+revision.h.tmp:
+	@rm -f $@
+	@echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@
+	@if [ -n '$(GIT_VERSION)' ]; then echo \#define GIT_VERSION \"$(GIT_VERSION)\" >> $@; fi
+	@if [ -n '$(GIT_REVISION)' ]; then echo \#define GIT_REVISION \"$(GIT_REVISION)\" >> $@; fi
+
+version.h: revision.h
+
+revision.h: revision.h.tmp
+	@if [ '$(GIT_REVISION)' != '$(OLD_REVISION)' ]; then cp $@.tmp $@; fi
+	@if [ ! -f $@ ]; then cp $@.tmp $@; fi
+
 $(autotest_OBJECTS): autotest.c
 	$(MSG_CC) $(CC) -c $(CFLAGS) -Isrc -o $@ $<
 
-$(autotest_BINARY): $(autotest_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+$(autotest_BINARY): $(autotest_OBJECTS) $(libuhub_OBJECTS) $(libutils_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
 	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
 autotest: $(autotest_BINARY)
@@ -236,6 +302,10 @@ install: $(uhub_BINARY)
 	@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
+	@cp -f mod_*.so $(UHUB_MOD_DIR)
 	@touch $(UHUB_CONF_DIR)/motd.txt
 	@echo done.
 endif
@@ -244,7 +314,7 @@ dist-clean:
 	@rm -rf $(all_OBJECTS) *~ core
 
 clean:
-	@rm -rf $(libuhub_OBJECTS) *~ core $(uhub_BINARY) $(admin_BINARY) $(autotest_BINARY) $(adcrush_BINARY) $(all_OBJECTS) autotest.c && \
+	@rm -rf $(libuhub_OBJECTS) *~ core $(uhub_BINARY) $(admin_BINARY) $(autotest_BINARY) $(adcrush_BINARY) $(all_OBJECTS) $(all_plugins) autotest.c revision.h revision.h.tmp && \
 	echo $(MSG_CLEAN)
 
 

README

@@ -1,5 +1,8 @@
 Welcome and thanks for downloading uHub, a high performance ADC p2p hub.
 
 For the official documentation, bugs and other information, please visit:
-http://www.extatic.org/uhub/
+http://www.uhub.org/
+
+For a list of compatible ADC clients, see:
+http://www.adcportal.com/wiki/index.php/ADC_Software_List#Client_Software
 

autotest/test_credentials.tcc

@@ -0,0 +1,24 @@
+#include <uhub.h>
+
+EXO_TEST(cred_to_string_1, { return !strcmp(auth_cred_to_string(auth_cred_none),     "none");     });
+EXO_TEST(cred_to_string_2, { return !strcmp(auth_cred_to_string(auth_cred_bot),      "bot");      });
+EXO_TEST(cred_to_string_3, { return !strcmp(auth_cred_to_string(auth_cred_guest),    "guest");    });
+EXO_TEST(cred_to_string_4, { return !strcmp(auth_cred_to_string(auth_cred_user),     "user");     });
+EXO_TEST(cred_to_string_5, { return !strcmp(auth_cred_to_string(auth_cred_operator), "operator"); });
+EXO_TEST(cred_to_string_6, { return !strcmp(auth_cred_to_string(auth_cred_super),    "super");    });
+EXO_TEST(cred_to_string_7, { return !strcmp(auth_cred_to_string(auth_cred_link),     "link");     });
+EXO_TEST(cred_to_string_8, { return !strcmp(auth_cred_to_string(auth_cred_admin),    "admin");    });
+
+#define CRED_FROM_STRING(STR, EXPECT) enum auth_credentials cred; return auth_string_to_cred(STR, &cred) && cred == EXPECT;
+
+EXO_TEST(cred_from_string_1,  { CRED_FROM_STRING("none",     auth_cred_none);     });
+EXO_TEST(cred_from_string_2,  { CRED_FROM_STRING("bot",      auth_cred_bot);      });
+EXO_TEST(cred_from_string_3,  { CRED_FROM_STRING("guest",    auth_cred_guest);    });
+EXO_TEST(cred_from_string_4,  { CRED_FROM_STRING("user",     auth_cred_user);     });
+EXO_TEST(cred_from_string_5,  { CRED_FROM_STRING("reg",      auth_cred_user);     });
+EXO_TEST(cred_from_string_6,  { CRED_FROM_STRING("operator", auth_cred_operator); });
+EXO_TEST(cred_from_string_7,  { CRED_FROM_STRING("op",       auth_cred_operator); });
+EXO_TEST(cred_from_string_8,  { CRED_FROM_STRING("super",    auth_cred_super);    });
+EXO_TEST(cred_from_string_9,  { CRED_FROM_STRING("link",     auth_cred_link);     });
+EXO_TEST(cred_from_string_10, { CRED_FROM_STRING("admin",    auth_cred_admin);    });
+

autotest/test_hub.tcc

@@ -23,6 +23,7 @@ EXO_TEST(hub_net_startup, {
 
 EXO_TEST(hub_config_initialize, {
 	config_defaults(&g_config);
+	g_config.server_port = 65111;
 	return 1;
 });
 

autotest/test_inf.tcc

@@ -42,7 +42,6 @@ static void inf_create_user()
 {
 	if (inf_user) return;
 	inf_user = (struct hub_user*) hub_malloc_zero(sizeof(struct hub_user));
-	inf_user->connection = net_con_create();
 	inf_user->id.sid = 1;
 	inf_user->limits.upload_slots = 1;
 }

autotest/test_memory.tcc

@@ -8,27 +8,27 @@ EXO_TEST(test_message_refc_1, {
 });
 
 EXO_TEST(test_message_refc_2, {
-	return g_msg->references == 0; // 0
+	return g_msg->references == 1;
 });
 
 EXO_TEST(test_message_refc_3, {
 	adc_msg_incref(g_msg);
-	return g_msg->references == 1; // 1
+	return g_msg->references == 2;
 });
 
 EXO_TEST(test_message_refc_4, {
 	adc_msg_incref(g_msg);
-	return g_msg->references == 2; // 2
+	return g_msg->references == 3;
 });
 
 EXO_TEST(test_message_refc_5, {
 	adc_msg_free(g_msg);
-	return g_msg->references == 1; // 1
+	return g_msg->references == 2;
 });
 
 EXO_TEST(test_message_refc_6, {
 	adc_msg_free(g_msg);
-	return g_msg->references == 0; // 0
+	return g_msg->references == 1;
 });
 
 EXO_TEST(test_message_refc_7, {

autotest/test_sid.tcc

@@ -0,0 +1,138 @@
+#include <uhub.h>
+
+static struct sid_pool* sid_pool = 0;
+
+struct dummy_user
+{
+	sid_t sid;
+};
+
+static struct dummy_user* last = 0;
+sid_t last_sid = 0;
+
+EXO_TEST(sid_create_pool, {
+	sid_pool = sid_pool_create(4);
+	return sid_pool != 0;
+});
+
+EXO_TEST(sid_check_0a, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, 0);
+	return user == 0;
+});
+
+EXO_TEST(sid_check_0b, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, 5);
+	return user == 0;
+});
+
+EXO_TEST(sid_alloc_1, {
+	struct dummy_user* user = hub_malloc_zero(sizeof(struct dummy_user));
+	user->sid = sid_alloc(sid_pool, (struct hub_user*) user);
+	last = user;
+	last_sid = user->sid;
+	return (user->sid > 0 && user->sid < 1048576);
+});
+
+EXO_TEST(sid_check_1a, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, last_sid);
+	return last == user;
+});
+
+EXO_TEST(sid_check_1b, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, last_sid+1);
+	return user == 0;
+});
+
+EXO_TEST(sid_alloc_2, {
+	struct dummy_user* user = hub_malloc_zero(sizeof(struct dummy_user));
+	user->sid = sid_alloc(sid_pool, (struct hub_user*) user);
+	last_sid = user->sid;
+	return (user->sid > 0 && user->sid < 1048576);
+});
+
+EXO_TEST(sid_check_2, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, last_sid);
+	return last != user;
+});
+
+EXO_TEST(sid_alloc_3, {
+	struct dummy_user* user = hub_malloc_zero(sizeof(struct dummy_user));
+	user->sid = sid_alloc(sid_pool, (struct hub_user*) user);
+	last_sid = user->sid;
+	return (user->sid > 0 && user->sid < 1048576);
+});
+
+EXO_TEST(sid_check_3, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, last_sid);
+	return last != user;
+});
+
+EXO_TEST(sid_alloc_4, {
+	struct dummy_user* user = hub_malloc_zero(sizeof(struct dummy_user));
+	user->sid = sid_alloc(sid_pool, (struct hub_user*) user);
+	last_sid = user->sid;
+	return (user->sid > 0 && user->sid < 1048576);
+});
+
+EXO_TEST(sid_check_4, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, last_sid);
+	return last != user;
+});
+
+EXO_TEST(sid_alloc_5, {
+	struct dummy_user user;
+	sid_t sid;
+	sid = sid_alloc(sid_pool, (struct hub_user*) &user);
+	return sid == 0;
+});
+
+EXO_TEST(sid_check_6, {
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, 0);
+	return user == 0;
+});
+
+
+EXO_TEST(sid_list_all_1, {
+	sid_t s;
+	size_t n = 0;
+	int ok = 1;
+	for (s = last->sid; s <= last_sid; s++)
+	{
+		struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, s);
+		if (s != (user ? user->sid : -1))
+		{
+			ok = 0;
+			break;
+		}
+		n++;
+	}
+	return ok && n == 4;
+});
+
+#define FREE_SID(N) \
+	struct dummy_user* user = (struct dummy_user*) sid_lookup(sid_pool, N); \
+	sid_free(sid_pool, N); \
+	hub_free(user); \
+	return sid_lookup(sid_pool, N) == NULL;
+
+EXO_TEST(sid_remove_1, {
+	FREE_SID(2);
+});
+
+EXO_TEST(sid_remove_2, {
+	FREE_SID(1);
+});
+
+EXO_TEST(sid_remove_3, {
+	FREE_SID(4);
+});
+
+EXO_TEST(sid_remove_4, {
+	FREE_SID(3);
+});
+
+EXO_TEST(sid_destroy_pool, {
+	sid_pool_destroy(sid_pool);
+	sid_pool = 0;
+	return sid_pool == 0;
+});

autotest/test_timer.tcc

@@ -0,0 +1,119 @@
+#include <uhub.h>
+
+#define MAX_EVENTS 15
+static struct timeout_queue* g_queue;
+static time_t g_now;
+static size_t g_max;
+static struct timeout_evt g_events[MAX_EVENTS];
+
+static size_t g_triggered;
+
+static void timeout_cb(struct timeout_evt* t)
+{
+	g_triggered++;
+}
+
+/*
+typedef void (*timeout_evt_cb)(struct timeout_evt*);
+
+struct timeout_evt
+{
+	time_t timestamp;
+	timeout_evt_cb callback;
+	void* ptr;
+	struct timeout_evt* prev;
+	struct timeout_evt* next;
+};
+
+void timeout_evt_initialize(struct timeout_evt*, timeout_evt_cb, void* ptr);
+void timeout_evt_reset(struct timeout_evt*);
+int  timeout_evt_is_scheduled(struct timeout_evt*);
+
+
+struct timeout_queue
+{
+	time_t last;
+	size_t max;
+	struct timeout_evt** events;
+};
+
+void timeout_queue_initialize(struct timeout_queue*, time_t now, size_t max);
+void timeout_queue_shutdown(struct timeout_queue*);
+size_t timeout_queue_process(struct timeout_queue*, time_t now);
+void timeout_queue_insert(struct timeout_queue*, struct timeout_evt*, size_t seconds);
+void timeout_queue_remove(struct timeout_queue*, struct timeout_evt*);
+void timeout_queue_reschedule(struct timeout_queue*, struct timeout_evt*, size_t seconds);
+
+size_t timeout_queue_get_next_timeout(struct timeout_queue*, time_t now);
+*/
+
+
+EXO_TEST(timer_setup,{
+	size_t n;
+	g_queue = hub_malloc_zero(sizeof(struct timeout_queue));
+	g_now = 0;
+	g_max = 5;
+	g_triggered = 0;
+	timeout_queue_initialize(g_queue, g_now, g_max);
+
+	memset(g_events, 0,  sizeof(g_events));
+	for (n = 0; n < MAX_EVENTS; n++)
+	{
+		timeout_evt_initialize(&g_events[n], timeout_cb, &g_events[n]);
+	}
+
+	return g_queue != NULL;
+});
+
+
+EXO_TEST(timer_check_timeout_0,{
+	return timeout_queue_get_next_timeout(g_queue, g_now) == g_max;
+});
+
+
+EXO_TEST(timer_add_event_1,{
+	timeout_queue_insert(g_queue, &g_events[0], 2);
+	return g_events[0].prev != NULL;
+});
+
+EXO_TEST(timer_check_timeout_1,{
+	return timeout_queue_get_next_timeout(g_queue, g_now) == 2;
+});
+
+EXO_TEST(timer_remove_event_1,{
+	timeout_queue_remove(g_queue, &g_events[0]);
+	return g_events[0].prev == NULL;
+});
+
+EXO_TEST(timer_check_timeout_2,{
+	return timeout_queue_get_next_timeout(g_queue, g_now) == g_max;
+});
+
+/* test re-removing an event - should not crash! */
+EXO_TEST(timer_remove_event_1_no_crash,{
+	timeout_queue_remove(g_queue, &g_events[0]);
+	return g_events[0].prev == NULL;
+});
+
+EXO_TEST(timer_add_5_events_1,{
+	timeout_queue_insert(g_queue, &g_events[0], 0);
+	timeout_queue_insert(g_queue, &g_events[1], 1);
+	timeout_queue_insert(g_queue, &g_events[2], 2);
+	timeout_queue_insert(g_queue, &g_events[3], 3);
+	timeout_queue_insert(g_queue, &g_events[4], 4);
+
+	return (g_events[0].prev != NULL &&
+			g_events[1].prev != NULL &&
+			g_events[2].prev != NULL &&
+			g_events[3].prev != NULL &&
+			g_events[4].prev != NULL);
+});
+
+EXO_TEST(timer_check_5_events_1,{
+	return timeout_queue_get_next_timeout(g_queue, g_now) == 1;
+});
+
+EXO_TEST(timer_process_5_events_1,{
+	g_now = 4;
+	return timeout_queue_process(g_queue, g_now) == g_triggered;
+});

autotest/test_tokenizer.tcc

@@ -0,0 +1,107 @@
+#include <uhub.h>
+
+#define SETUP(X, STR) struct cfg_tokens* tokens = cfg_tokenize(STR)
+#define CLEANUP_LIST(X) do { list_clear(X, hub_free); list_destroy(X); } while(0)
+#define CLEANUP_TOKENS(X) do { cfg_tokens_free(X); } while(0)
+
+static int match_str(const char* str1, char* str2)
+{
+	size_t i;
+	for (i = 0; i < strlen(str2); i++)
+		if (str2[i] == '_')
+			str2[i] = ' ';
+		else if (str2[i] == '|')
+			str2[i] = '\t';
+
+	int ret = strcmp(str1, str2);
+	if (ret) {
+		fprintf(stderr, "\n    Mismatch: \"%s\" != \"%s\"\n", str1, str2);
+	}
+	return ret;
+}
+
+static int count(const char* STR, size_t EXPECT) {
+	SETUP(tokens, STR);
+	int pass = cfg_token_count(tokens) == EXPECT;
+	CLEANUP_TOKENS(tokens);
+	return pass;
+}
+
+static int compare(const char* str, const char* ref) {
+	size_t i, max;
+	struct linked_list* compare = list_create();
+	SETUP(tokens, str);
+	split_string(ref, " ", compare, 0);
+	int pass = cfg_token_count(tokens) == list_size(compare);
+	if (pass) {
+		max = cfg_token_count(tokens);
+		for (i = 0; i < max; i++) {
+			char* token = (char*) cfg_token_get(tokens, i);
+			char* refer = (char*) list_get_index(compare, i);
+			if (match_str(token, refer)) {
+				pass = 0;
+				break;
+			}
+		}
+	}
+	CLEANUP_TOKENS(tokens);
+	CLEANUP_LIST(compare);
+	return pass;
+}
+
+EXO_TEST(tokenizer_basic_0,  { return count("", 0); });
+EXO_TEST(tokenizer_basic_1,  { return count("a", 1); });
+EXO_TEST(tokenizer_basic_1a, { return count(" a", 1); })
+EXO_TEST(tokenizer_basic_1b, { return count("\ta", 1); })
+EXO_TEST(tokenizer_basic_1c, { return count("      a", 1); })
+EXO_TEST(tokenizer_basic_1d, { return count(" a ", 1); })
+EXO_TEST(tokenizer_basic_1e, { return count("  a  ", 1); })
+EXO_TEST(tokenizer_basic_2,  { return count("a b", 2); });
+EXO_TEST(tokenizer_basic_2a, { return count("  a   b  ", 2); });
+EXO_TEST(tokenizer_basic_3,  { return count("a b c", 3); });
+EXO_TEST(tokenizer_basic_3a, { return count("a b   c", 3); });
+EXO_TEST(tokenizer_basic_3b, { return count("a b\tc", 3); });
+EXO_TEST(tokenizer_basic_3c, { return count("a b c ", 3); });
+EXO_TEST(tokenizer_basic_3d, { return count("a b c   ", 3); });
+
+EXO_TEST(tokenizer_basic_compare_0, { return compare("value1 value2 value3", "value1 value2 value3"); });
+EXO_TEST(tokenizer_basic_compare_1, { return compare("a b c", "a b c"); });
+EXO_TEST(tokenizer_basic_compare_2, { return compare("a b    c", "a b c"); });
+EXO_TEST(tokenizer_basic_compare_3, { return compare("   a	 b    c", "a b c"); });
+EXO_TEST(tokenizer_basic_compare_4, { return compare("   a	 b    c    ", "a b c"); });
+EXO_TEST(tokenizer_basic_compare_5, { return compare("a	b c ", "a b c"); });
+EXO_TEST(tokenizer_basic_compare_6, { return compare("a	b c  ", "a b c"); });
+
+EXO_TEST(tokenizer_comment_1, { return compare("value1 value2 # value3", "value1 value2"); });
+EXO_TEST(tokenizer_comment_2, { return compare("value1 value2\\# value3", "value1 value2# value3"); });
+EXO_TEST(tokenizer_comment_3, { return compare("value1 \"value2#\" value3", "value1 value2# value3"); });
+
+EXO_TEST(tokenizer_escape_1, { return compare("\"value1\" value2", "value1 value2"); });
+EXO_TEST(tokenizer_escape_2, { return compare("\"value1\\\"\" value2", "value1\" value2"); });
+EXO_TEST(tokenizer_escape_3, { return compare("\"value1\" \"value 2\"", "value1 value_2"); });
+EXO_TEST(tokenizer_escape_4, { return compare("\"value1\" value\\ 2", "value1 value_2"); });
+EXO_TEST(tokenizer_escape_5, { return compare("\"value1\" value\\\\2", "value1 value\\2"); });
+EXO_TEST(tokenizer_escape_6, { return compare("\"value1\" value\\\t2", "value1 value|2"); });
+EXO_TEST(tokenizer_escape_7, { return compare("\"value1\" \"value\t2\"", "value1 value|2"); });
+
+static int test_setting(const char* str, const char* expected_key, const char* expected_value)
+{
+	int success = 0;
+	struct cfg_settings* setting = cfg_settings_split(str);
+	if (!setting) return expected_key == NULL;
+	success = (!strcmp(cfg_settings_get_key(setting), expected_key) && !strcmp(cfg_settings_get_value(setting), expected_value));
+	cfg_settings_free(setting);
+	return success;
+}
+
+EXO_TEST(tokenizer_settings_1, { return test_setting("foo=bar", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_2, { return test_setting("foo =bar", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_3, { return test_setting("foo= bar", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_4, { return test_setting("\tfoo=bar", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_5, { return test_setting("foo=bar\t", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_6, { return test_setting("\tfoo=bar\t", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_7, { return test_setting("\tfoo\t=\tbar\t", "foo", "bar"); });
+EXO_TEST(tokenizer_settings_8, { return test_setting("foo=", "foo", ""); });
+EXO_TEST(tokenizer_settings_9, { return test_setting("=bar", NULL, ""); });
+
+

debian/changelog

@@ -0,0 +1,25 @@
+uhub (0.3.2-1) unstable; urgency=low
+
+  * Updated upstream version.
+
+ -- Jan Vidar Krey <janvidar@extatic.org>  Mon 30 May 2010 18:00:00 +0200
+
+uhub (0.3.1-1) unstable; urgency=low
+
+  * Updated version number.
+
+ -- Jan Vidar Krey <janvidar@extatic.org>  Mon 04 Apr 2010 16:44:21 +0200
+
+uhub (0.3.0-2) unstable; urgency=low
+
+  * Fixed init.d scripts.
+  * Fixed lintian warnings.
+
+ -- Jan Vidar Krey <janvidar@extatic.org>  Tue, 26 Jan 2010 19:02:02 +0100
+
+uhub (0.3.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Jan Vidar Krey <janvidar@extatic.org>  Tue, 26 Jan 2010 18:59:02 +0100
+

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: uhub
+Section: net
+Priority: optional
+Maintainer: Jan Vidar Krey <janvidar@extatic.org>
+Build-Depends: debhelper (>= 7.0.0)
+Standards-Version: 3.8.3.0
+
+Package: uhub
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: High performance ADC p2p hub
+ uhub is a high performance peer-to-peer hub for the ADC network.
+ Its low memory footprint allows it to handle several thousand users on
+ high-end servers, or a small private hub on embedded hardware.
+ .
+ Key features:
+  - High performance and low memory usage
+  - IPv4 and IPv6 support
+  - Experimental SSL support (optional)
+  - Advanced access control support
+  - Easy configuration
+ .
+Homepage: http://www.uhub.org/
+

debian/copyright

@@ -0,0 +1,19 @@
+uhub - High performance ADC p2p hub.
+Copyright (C) 2010 Jan Vidar Krey <janvidar@extatic.org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 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/>.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'.
+

debian/rules

@@ -0,0 +1,45 @@
+#!/usr/bin/make -f
+
+# export DH_VERBOSE=1
+
+makeopts := DESTDIR=$(shell pwd)/debian/uhub/ \
+	UHUB_PREFIX=$(shell pwd)/debian/uhub/usr \
+	RELEASE=YES SILENT=YES
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	make $(makeopts)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	make clean
+	dh_clean
+
+binary-indep: build
+
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install $(makeopts)
+	dh_installdocs
+	dh_installinit
+	dh_installlogrotate
+	dh_installman -A
+	dh_installchangelogs	ChangeLog
+	dh_strip
+	dh_compress
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
+

debian/uhub.default

@@ -0,0 +1,4 @@
+# uhub - high performance adc hub.
+
+UHUB_ENABLE=0
+

debian/uhub.dirs

@@ -0,0 +1,6 @@
+etc/default
+etc/init.d
+etc/logrotate.d
+etc/uhub
+usr/bin
+var/log/uhub

debian/uhub.docs

@@ -0,0 +1,5 @@
+AUTHORS
+README
+BUGS
+TODO
+doc/getstarted.txt

debian/uhub.init

@@ -0,0 +1,92 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          uhub
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uhub - High performance ADC p2p hub.
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+NAME=uhub
+DESC="ADC hub"
+DAEMON=/usr/bin/uhub
+PIDFILE=/var/run/uhub/uhub.pid
+LOGFILE=/var/log/uhub/uhub.log
+SCRIPTNAME=/etc/init.d/uhub
+
+DEFAULTFILE=/etc/default/uhub
+[ -r $DEFAULTFILE ] && . $DEFAULTFILE
+
+DAEMON_ENABLE="${UHUB_ENABLE}"
+DAEMON_OPTS="-l ${LOGFILE} -f -p ${PIDFILE}"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+ulimit -n 65536
+mkdir -p /var/run/uhub/
+
+set -e
+
+case "$1" in
+	start)
+		if [ "$DAEMON_ENABLE" != "true" ]; then
+			log_daemon_msg "Disabled $DESC" $NAME
+			log_end_msg 0
+			exit 0
+		fi
+
+		log_daemon_msg "Starting $DESC" $NAME
+		if ! start-stop-daemon --start --quiet --oknodo \
+			--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+		then
+			log_end_msg 1
+		else
+			log_end_msg 0
+		fi
+		;;
+
+	stop)
+		log_daemon_msg "Stopping $DESC" $NAME
+		if start-stop-daemon --quiet --stop --oknodo --retry 30 --oknodo \
+			--pidfile $PIDFILE --exec $DAEMON
+		then
+			rm -f $PIDFILE
+			log_end_msg 0
+		else
+			log_end_msg 1
+		fi
+		;;
+
+	reload)
+		log_daemon_msg "Reloading $DESC configuration" $NAME
+		if start-stop-daemon --stop --signal 2 --oknodo --retry 30 --oknodo \
+			--quiet --pidfile $PIDFILE --exec $DAEMON
+		then
+			if start-stop-daemon --start --quiet  \
+				--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then
+				log_end_msg 0
+			else
+				log_end_msg 1
+			fi
+		else
+			log_end_msg 1
+		fi
+		;;
+
+	restart|force-reload)
+		$0 stop
+		$0 start
+		;;
+
+	*)
+		echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+		exit 1
+		;;
+esac
+
+exit 0

debian/uhub.logrotate

@@ -0,0 +1,9 @@
+/var/log/uhub/*.log
+{
+        compress
+        size 10M
+        rotate 10
+        missingok
+        notifempty
+}
+

debian/uhub.manpages

@@ -0,0 +1 @@
+doc/uhub.1

debian/uhub.postinst

@@ -0,0 +1,27 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    configure)
+	chmod 0750 /var/log/uhub
+
+	if [ -x /etc/init.d/uhub ]; then
+        	update-rc.d uhub defaults >/dev/null
+
+	        if [ -x /usr/sbin/invoke-rc.d ]; then
+	                invoke-rc.d uhub restart
+	        else
+        	        /etc/init.d/uhub restart
+	        fi
+	fi
+	;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+
+    *)
+        echo "postinst: error: unknown argument: $1" >&2
+        exit 1
+        ;;
+esac
+

debian/uhub.postrm

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+        update-rc.d uhub remove >/dev/null
+fi
+

debian/uhub.prerm

@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ]; then
+        if command -v invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d uhub stop || true
+        else
+                /etc/init.d/uhub stop
+        fi
+fi
+

doc/compile.txt

@@ -8,19 +8,18 @@ Prerequisites
 Before you try to compile µHub, please make sure the following prerequisites are met.
   * GNU make
   * gcc > 3.0 (or MinGW on Windows)
-  * libevent >= 1.3
   * Perl 5
+  * openssl > 0.9.8 (or use  "make USE_SSL=NO")
+  * sqlite > 3.x
 
-Linux and Mac OSX
+or read  http://www.uhub.org/compile.php for more info.
------------------
+
+
+Linux, Mac OSX, FreeBSD, NetBSD and OpenBSD
+-------------------------------------------
 Simply, run:
   % make 
 
-FreeBSD, NetBSD and OpenBSD
----------------------------
-Use GNU make, not BSD make: 
-  % gmake
-
 If you have an old gcc compiler, try disabling pre-compiled headers like this:
 gmake USE_PCH=NO
 

doc/getstarted.txt

@@ -43,4 +43,15 @@ if one wishes to run uhub as a specific user using the -u and -g switches.
 Example:
   % uhub -f -l mylog.txt -u nobody -g nogroup
 
+
+If you are planning to more than 1024 users on hub, you must increase the max number of file descriptors allowed.
+This limit needs to be higher than the configured max_users in uhub.conf.
+
+In linux can add the following lines to /etc/security/limits.conf (allows for ~4000 users)
+      *     soft nofile 4096
+      *     hard nofile 4096
+
+Or, you can use (as root):
+  % ulimit -n 4096
+                     
 Your mileage may vary -- Good luck!

doc/init.d.RedHat/etc/init.d/uhub

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # chkconfig: - 91 35
-# description: Starts and stops the Uhub ( http://www.extatic.org/uhub ) daemons on RHEL\CentOS \
+# description: Starts and stops the Uhub ( http://www.uhub.org ) daemons on RHEL\CentOS \
 #	       used to provide p2p network services.
 #
 # pidfile: /var/run/uhub.pid
@@ -38,7 +38,7 @@ RETVAL=0
 
 
 start() {
-        KIND="UHUB"
+        KIND="Uhub"
 	echo -n $"Starting $KIND services: "
 	daemon uhub $UHUBOPTIONS
 	RETVAL=$?
@@ -47,7 +47,7 @@ start() {
 }	
 
 stop() {
-        KIND="UHUB"
+        KIND="Uhub"
 	echo -n $"Shutting down $KIND services: "
 	killproc uhub
 	RETVAL=$?
@@ -68,6 +68,14 @@ reload() {
 	return $RETVAL
 }	
 
+relog() {
+    echo -n $"Reopen main log file: "
+     killproc uhub -SIGHUP
+     RETVAL=$?
+     echo ""
+     return $RETVAL
+}
+
 rhstatus() {
 	status uhub
         RETVAL=$?
@@ -90,11 +98,14 @@ case "$1" in
   reload)
   	reload
 	;;
+  relog)
+	relog
+	;;
   status)
   	rhstatus
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|reload|status}"
+	echo $"Usage: $0 {start|stop|restart|reload|relog|status}"
 	exit 2
 esac
 

doc/init.d.RedHat/etc/logrotate.d/uhub

@@ -0,0 +1,14 @@
+# Log rotate for Uhub
+# see man logrotate
+#
+#
+/var/log/uhub.log {
+        compress
+        size 10M
+        rotate 10
+        missingok
+        notifempty
+
+
+}
+

doc/init.d.RedHat/etc/sysconfig/uhub

@@ -9,7 +9,5 @@
 #  -u <user>   Run as given user
 #  -g <group>  Run with given group permissions
 #  -p <file>   Store pid in file (process id)
-                                 
-                                                                                                                                             
 UHUBOPTIONS=" -u uhub -f -p /var/run/uhub.pid -l /var/log/uhub.log"
 

doc/plugins.conf

@@ -0,0 +1,16 @@
+# 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}
+plugin /var/lib/uhub/mod_auth_sqlite.so "file=/etc/uhub/users.db"
+
+# log subsystem.
+# file={/path/to/logfile} 
+plugin /var/lib/uhub/mod_logging.so "file=/var/log/uhub.log"
+
+#
+# plugin /var/lib/uhub/mod_auth_simple.so
+
+#
+# plugin /var/lib/uhub/mod_example.so

doc/rules.txt

@@ -0,0 +1,5 @@
+1. rule #1
+2. rule #2
+3. rule #3
+......
+34. Rule #34

doc/uhub.conf

@@ -13,12 +13,18 @@
 server_port=1511
 server_bind_addr=any
 
+# Alternative server ports
+# server_alt_ports = 1512, 1513
+
 # The maximum amount of users allowed on the hub.
 max_users=500
 
-# If 1, will show a "This hub is running uhub/version".
+# If 1, will show a "Powered by uHub/{VERSION}".
 show_banner=1
 
+# If enabled then operating system and cpu architecture is part of the banner.
+show_banner_sys_info=1
+
 # Allow only registered users on the hub if set to 1.
 registered_users_only=0
 
@@ -39,7 +45,14 @@ file_acl=/etc/uhub/users.conf
 # Normally this message is sent to clients when connecting.
 file_motd=/etc/uhub/motd.txt
 
-# Slots\share\hubs limits
+# This file can contain a rules of the hub.
+# Normally this message is sent to clients when write in chat !rules
+file_rules=/etc/uhub/rules.txt
+
+# This file can contain a conf for plugin subsystem
+file_plugins = /etc/uhub/plugins.conf
+
+# Slots/share/hubs limits
 limit_max_hubs_user = 0
 limit_max_hubs_reg = 0
 limit_max_hubs_op = 0
@@ -55,6 +68,30 @@ limit_max_share = 0
 limit_min_slots = 0
 limit_max_slots = 0
 
+# Flood control support:
+# set the interval to 5 seconds
+flood_ctl_interval = 5
+
+# Then the maximum chat, connect, search, updates etc will be measured over 5 seconds.
+# So, 3 chat messages per 5 seconds allowed.
+flood_ctl_chat=3
+flood_ctl_connect=20
+flood_ctl_search=1
+flood_ctl_update=2
+flood_ctl_extras=5
+
+# chat control
+# 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
+obsolete_clients=1
+
 
 # Configure status message as sent to clients in different circumstances.
 msg_hub_full                   = Hub is full
@@ -86,5 +123,16 @@ msg_user_slots_high	       = User have too many upload slots
 msg_user_hub_limit_low 	       = User is on too few hubs
 msg_user_hub_limit_high	       = User is on too many hubs
 msg_error_no_memory            = No memory
+msg_user_flood_chat            = Chat flood detected, messages are dropped.
+msg_user_flood_connect         = Connect flood detected, connection refused.
+msg_user_flood_search          = Search flood detected, search is stopped.
+msg_user_flood_update          = Update flood detected.
+msg_user_flood_extras          = Flood detected.
 
+# If a client that supports ADC but not a compatible hash algorithm (tiger),
+# then the hub cannot accept the client:
+msg_proto_no_common_hash       = No common hash algorithm.
+
+# Message to be shown to old clients using an older version of ADC than ADC/1.0
+msg_proto_obsolete_adc0        = Client is using an obsolete ADC protocol version.
 

doc/uhub.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+inherit eutils
+
+if [ "$PV" != "9999" ]; then
+        SRC_URI="http://www.extatic.org/downloads/uhub/${P}-src.tar.bz2"
+        KEYWORDS="~amd64 ~x86"
+else
+        inherit git
+        SRC_URI=""
+        EGIT_REPO_URI="git://github.com/janvidar/uhub.git"
+        KEYWORDS=""
+fi
+
+EAPI="2"
+
+DESCRIPTION="High performance ADC hub"
+HOMEPAGE="http://www.uhub.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ssl"
+
+DEPEND="=dev-lang/perl-5*
+ssl? ( >=dev-libs/openssl-0.9.8 )
+"
+RDEPEND="${DEPEND}"
+src_compile() {
+        $opts=""
+        use ssl && opts="USE_SSL=YES $opts"
+        emake $opts
+}
+src_install() {
+        dodir /usr/bin
+        dodir /etc/uhub
+        emake DESTDIR="${D}" UHUB_PREFIX="${D}/usr" install || die "install failed"
+        newinitd doc/uhub.gentoo.rc uhub || newinitd ${FILESDIR}/uhub.rc uhub
+}
+pkg_postinst() {
+        enewuser uhub
+}

doc/uhub.spec

@@ -0,0 +1,91 @@
+Summary: High performance ADC p2p hub.
+Name: uhub
+Version: 0.4.0
+Release: 1
+License: GPLv3
+Group: Networking/File transfer
+Source: uhub-%{version}.tar.gz
+URL: http://www.uhub.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: sqlite-devel
+
+%description
+uhub is a high performance peer-to-peer hub for the ADC network.
+Its low memory footprint allows it to handle several thousand users on
+high-end servers, or a small private hub on embedded hardware.
+
+Key features:
+- High performance and low memory usage
+- IPv4 and IPv6 support
+- Experimental SSL support (optional)
+- Advanced access control support
+- Easy configuration
+- plugin support
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+echo RPM_BUILD_ROOT = $RPM_BUILD_ROOT
+make
+
+%install
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/etc/uhub
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+mkdir -p $RPM_BUILD_ROOT/var/lib/uhub
+
+install uhub $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 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/
+/bin/gzip -9c doc/uhub.1 > doc/uhub.1.gz &&
+install -m644 doc/uhub.1.gz $RPM_BUILD_ROOT/usr/share/man/man1
+install -m644 mod_*.so $RPM_BUILD_ROOT/var/lib/uhub
+
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS BUGS COPYING ChangeLog README TODO doc/Doxyfile doc/architecture.txt doc/compile.txt doc/extensions.txt doc/getstarted.txt doc/uhub.dot
+%config(noreplace) /etc/uhub/uhub.conf
+#%{_sysconfdir}/uhub/uhub.conf
+%config(noreplace) %{_sysconfdir}/uhub/users.conf
+%config(noreplace) %{_sysconfdir}/uhub/motd.txt
+%config(noreplace) %{_sysconfdir}/uhub/rules.txt
+%config(noreplace) %{_sysconfdir}/uhub/plugins.conf
+%{_sysconfdir}/init.d/uhub
+%config(noreplace) %{_sysconfdir}/logrotate.d/uhub
+%config(noreplace) %{_sysconfdir}/sysconfig/uhub
+/usr/share/man/man1/uhub.1.gz
+%{_bindir}/uhub
+%{_libdir}/uhub/mod_*.so
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/chkconfig --add uhub
+if [ $1 -gt 1 ] ; then
+    /etc/rc.d/init.d/uhub restart >/dev/null || :
+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 ||:
+
+%changelog
+* Tue Jun 26 2001 E_zombie
+- add plugins.conf
+* Tue Jan 31 2010 E_zombie
+- change GROUP
+- chmod for files
+- add postinstall scripts
+- fix "License"
+* Tue Jan 26 2010 E_zombie
+- first .spec release
+
+

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 */

src/adc/message.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -26,7 +26,9 @@
 	uhub_assert(X->capacity); \
 	uhub_assert(X->length); \
 	uhub_assert(X->length <= X->capacity); \
+	uhub_assert(X->references > 0); \
 	uhub_assert(X->length == strlen(X->cache));
+#define ADC_MSG_NULL_ON_FREE
 #else
 #define ADC_MSG_ASSERT(X) do { } while(0)
 #endif /* DEBUG */
@@ -53,40 +55,18 @@ static void* msg_malloc_zero(size_t size)
 static void msg_free(void* ptr)
 {
 	LOG_MEMORY("msg_free:   %p", ptr);
-	// hub_free(ptr);
+	hub_free(ptr);
 }
-
-#include <sys/mman.h>
-static void adc_msg_protect(struct adc_message* cmd)
-{
-	LOG_MEMORY("msg_prot:   %p %d", cmd, cmd->capacity);
-	mprotect(cmd,        sizeof(cmd),           PROT_READ);
-	mprotect(cmd->cache, sizeof(cmd->capacity), PROT_READ);
-}
-
-static void adc_msg_unprotect(struct adc_message* cmd)
-{
-	LOG_MEMORY("msg_unprot: %p %d", cmd, cmd->capacity);
-	mprotect(cmd,        sizeof(cmd),           PROT_READ | PROT_WRITE);
-	mprotect(cmd->cache, sizeof(cmd->capacity), PROT_READ | PROT_WRITE);
-}
-
 #else
-
 #define msg_malloc(X)       hub_malloc(X)
 #define msg_malloc_zero(X)  hub_malloc_zero(X)
 #define msg_free(X)         hub_free(X)
-
 #endif /* MSG_MEMORY_DEBUG */
 
 
 struct adc_message* adc_msg_incref(struct adc_message* msg)
 {
-	if (!msg) return 0;
 #ifndef ADC_MESSAGE_INCREF
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_unprotect(msg);
-#endif
 	msg->references++;
 #ifdef MSG_MEMORY_DEBUG
 	adc_msg_protect(msg);
@@ -108,6 +88,9 @@ static int adc_msg_grow(struct adc_message* msg, size_t size)
 	char* buf;
 	size_t newsize = 0;
 
+	if (!msg)
+		return 0;
+
 	if (msg->capacity > size)
 		return 1;
 
@@ -204,20 +187,15 @@ void adc_msg_free(struct adc_message* msg)
 
 	ADC_MSG_ASSERT(msg);
 
-	if (msg->references > 0)
+	msg->references--;
+
+	if (msg->references == 0)
 	{
-#ifdef MSG_MEMORY_DEBUG
+#ifdef ADC_MSG_NULL_ON_FREE
-		adc_msg_unprotect(msg);
+		if (msg->cache)
-#endif
+		{
-		msg->references--;
+			*msg->cache = 0;
-#ifdef MSG_MEMORY_DEBUG
+		}
-		adc_msg_protect(msg);
-#endif
-	}
-	else
-	{
-#ifdef MSG_MEMORY_DEBUG
-		adc_msg_unprotect(msg);
 #endif
 		msg_free(msg->cache);
 
@@ -256,21 +234,25 @@ struct adc_message* adc_msg_copy(const struct adc_message* cmd)
 	copy->length               = cmd->length;
 	copy->capacity             = 0;
 	copy->priority             = cmd->priority;
-	copy->references           = 0;
+	copy->references           = 1;
 	copy->feature_cast_include = 0;
 	copy->feature_cast_exclude = 0;
 
-	if (cmd->cache)
+	if (!adc_msg_grow(copy, copy->length))
 	{
-		if (!adc_msg_grow(copy, copy->length))
+		adc_msg_free(copy);
-		{
+		return NULL; /* OOM */
-			adc_msg_free(copy);
-			return NULL; /* OOM */
-		}
-		memcpy(copy->cache, cmd->cache, cmd->length);
-		copy->cache[copy->length] = 0;
 	}
 
+	if (!copy->cache)
+	{
+		adc_msg_free(copy);
+		return NULL;
+	}
+
+	memcpy(copy->cache, cmd->cache, cmd->length);
+	copy->cache[copy->length] = 0;
+
 	if (cmd->feature_cast_include)
 	{
 		copy->feature_cast_include = list_create();
@@ -295,9 +277,6 @@ struct adc_message* adc_msg_copy(const struct adc_message* cmd)
 
 	ADC_MSG_ASSERT(copy);
 
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_protect(copy);
-#endif
 	return copy;
 }
 
@@ -360,6 +339,7 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 
 	command->cmd = FOURCC(line[0], line[1], line[2], line[3]);
 	command->priority = 0;
+	command->references = 1;
 
 	switch (prefix)
 	{
@@ -443,7 +423,6 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 
 			if  (n == 10)
 				ok = 0;
-			
 			break;
 
 		case 'D':
@@ -510,10 +489,6 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 	}
 
 	ADC_MSG_ASSERT(command);
-
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_protect(command);
-#endif
 	return command;
 }
 
@@ -527,7 +502,6 @@ struct adc_message* adc_msg_create(const char* line)
 struct adc_message* adc_msg_construct(fourcc_t fourcc, size_t size)
 {
 	struct adc_message* msg = (struct adc_message*) msg_malloc_zero(sizeof(struct adc_message));
-	
 	if (!msg)
 		return NULL; /* OOM */
 
@@ -554,11 +528,7 @@ struct adc_message* adc_msg_construct(fourcc_t fourcc, size_t size)
 
 	msg->cmd = fourcc;
 	msg->priority = 0;
-
+	msg->references = 1;
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_protect(msg);
-#endif
-
 	return msg;
 }
 
@@ -630,7 +600,7 @@ int adc_msg_has_named_argument(struct adc_message* cmd, const char prefix_[2])
 	while (start)
 	{
 		count++;
-		if ((&start[0] - &cmd->cache[0]) < 1+cmd->length)
+		if ((size_t) (&start[0] - &cmd->cache[0]) < 1+cmd->length)
 			start = memmem(&start[1], (&cmd->cache[cmd->length] - &start[0]), prefix, 3);
 		else
 			start = NULL;
@@ -698,10 +668,6 @@ void adc_msg_terminate(struct adc_message* cmd)
 		adc_msg_cache_append(cmd, "\n", 1);
 	}
 	ADC_MSG_ASSERT(cmd);
-
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_protect(cmd);
-#endif
 }
 
 /* FIXME: this looks bogus */
@@ -709,10 +675,6 @@ void adc_msg_unterminate(struct adc_message* cmd)
 {
 	ADC_MSG_ASSERT(cmd);
 
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_unprotect(cmd);
-#endif
-	
 	if (cmd->length > 0 && cmd->cache[cmd->length-1] == '\n')
 	{
 		cmd->length--;
@@ -794,7 +756,7 @@ char* adc_msg_get_argument(struct adc_message* cmd, int offset)
 			else
 			{
 				argument = hub_strdup(&start[1]);
-				if (argument && argument[strlen(argument)-1] == '\n')
+				if (argument && *argument && argument[strlen(argument)-1] == '\n')
 					argument[strlen(argument)-1] = 0;
 			}
 
@@ -884,9 +846,6 @@ int adc_msg_unescape_length(const char* str)
 }
 
 
-
-
-
 char* adc_msg_unescape(const char* string)
 {
 	char* new_string = msg_malloc(adc_msg_unescape_length(string)+1);
@@ -905,14 +864,12 @@ char* adc_msg_unescape(const char* string)
 				*ptr++ = '\n';
 			else
 				*ptr++ = *str;
-			
 			escaped = 0;
 		} else {
 			if (*str == '\\')
 				escaped = 1;
 			else
 				*ptr++ = *str;
-				
 		}
 		str++;
 	}
@@ -924,8 +881,8 @@ char* adc_msg_unescape(const char* string)
 char* adc_msg_escape(const char* string)
 {
 	char* str = hub_malloc(adc_msg_escape_length(string)+1);
-	int n = 0;
+	size_t n = 0;
-	int i = 0;
+	size_t i = 0;
 	for (i = 0; i < strlen(string); i++)
 	{
 		switch (string[i]) {

src/adc/message.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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

src/adc/sid.c

@@ -119,7 +119,18 @@ void sid_pool_destroy(struct sid_pool* pool)
 
 sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
 {
-	sid_t n = (++pool->count);
+	sid_t n;
+
+	if (pool->count >= (pool->max - pool->min))
+	{
+#ifdef DEBUG_SID
+		LOG_DUMP("SID_POOL:  alloc, sid pool is full.");
+#endif
+		return 0;
+	}
+
+	n = ++pool->count;
+
 	for (; (pool->map[n % pool->max]); n++) ;
 
 #ifdef DEBUG_SID
@@ -140,7 +151,7 @@ void sid_free(struct sid_pool* pool, sid_t sid)
 
 struct hub_user* sid_lookup(struct sid_pool* pool, sid_t sid)
 {
-	if (!sid || (sid > pool->max))
+	if (!sid || (sid >= pool->max))
 		return 0;
 	return pool->map[sid];
 }

src/adc/sid.h

@@ -25,7 +25,6 @@
 struct sid_pool;
 struct hub_user;
 
-extern const char* BASE32_ALPHABET;
 extern char* sid_to_string(sid_t sid_);
 extern sid_t string_to_sid(const char* sid);
 

src/core/auth.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -23,23 +23,6 @@
 #define ACL_ADD_BOOL(S, L)    do { ret = check_cmd_bool(S,    L, line, line_count); if (ret != 0) return ret; } while(0)
 #define ACL_ADD_ADDR(S, L)    do { ret = check_cmd_addr(S,    L, line, line_count); if (ret != 0) return ret; } while(0)
 
-const char* get_user_credential_string(enum user_credentials cred)
-{
-	switch (cred)
-	{
-		case cred_none:         return "none";
-		case cred_bot:          return "bot";
-		case cred_guest:        return "guest";
-		case cred_user:         return "user";
-		case cred_operator:     return "operator";
-		case cred_super:        return "super";
-		case cred_admin:        return "admin";
-		case cred_link:         return "link";
-	}
-	
-	return "";
-};
-
 static int check_cmd_bool(const char* cmd, struct linked_list* list, char* line, int line_count)
 {
 	char* data;
@@ -70,7 +53,7 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 {
 	char* data;
 	char* data_extra;
-	struct hub_user_access_info* info = 0;
+	struct auth_info* info = 0;
 
 	if (!strncmp(line, cmd, strlen(cmd)))
 	{
@@ -86,7 +69,7 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 			return -1;
 		}
 
-		info = hub_malloc_zero(sizeof(struct hub_user_access_info));
+		info = hub_malloc_zero(sizeof(struct auth_info));
 
 		if (!info)
 		{
@@ -104,11 +87,11 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 			}
 		}
 
-		info->username = hub_strdup(data);
+		strncpy(info->nickname, data, MAX_NICK_LEN);
-		info->password = data_extra ? hub_strdup(data_extra) : 0;
+		strncpy(info->password, data_extra, MAX_PASS_LEN);
-		info->status = status;
+		info->credentials = status;
 		list_append(list, info);
-		LOG_DEBUG("ACL: Added user '%s' (%s)", info->username, get_user_credential_string(info->status));
+		LOG_DEBUG("ACL: Added user '%s' (%s)", info->nickname, auth_cred_to_string(info->credentials));
 		return 1;
 	}
 	return 0;
@@ -130,7 +113,7 @@ static void add_ip_range(struct linked_list* list, struct ip_range* info)
 		net_address_to_string(AF_INET6, &info->lo.internal_ip_data.in6, buf1, INET6_ADDRSTRLEN);
 		net_address_to_string(AF_INET6, &info->hi.internal_ip_data.in6, buf2, INET6_ADDRSTRLEN);
 	}
-	LOG_DEBUG("ACL: Deny access for: %s-%s", buf1, buf2);
+	LOG_DEBUG("ACL: Added ip range: %s-%s", buf1, buf2);
 
 	list_append(list, info);
 }
@@ -176,14 +159,10 @@ static int check_cmd_addr(const char* cmd, struct linked_list* list, char* line,
 
 static int acl_parse_line(char* line, int line_count, void* ptr_data)
 {
-	char* pos;
 	struct acl_handle* handle = (struct acl_handle*) ptr_data;
 	int ret;
 
-	if ((pos = strchr(line, '#')) != NULL)
+	strip_off_ini_line_comments(line, line_count);
-	{
-		pos[0] = 0;
-	}
 
 	line = strip_white_space(line);
 	if (!*line)
@@ -191,12 +170,12 @@ static int acl_parse_line(char* line, int line_count, void* ptr_data)
 
 	LOG_DEBUG("acl_parse_line: '%s'", line);
 
-	ACL_ADD_USER("bot",        handle->users, cred_bot);
+	ACL_ADD_USER("bot",        handle->users, auth_cred_bot);
-	ACL_ADD_USER("user_admin", handle->users, cred_admin);
+	ACL_ADD_USER("user_admin", handle->users, auth_cred_admin);
-	ACL_ADD_USER("user_super", handle->users, cred_super);
+	ACL_ADD_USER("user_super", handle->users, auth_cred_super);
-	ACL_ADD_USER("user_op",    handle->users, cred_operator);
+	ACL_ADD_USER("user_op",    handle->users, auth_cred_operator);
-	ACL_ADD_USER("user_reg",   handle->users, cred_user);
+	ACL_ADD_USER("user_reg",   handle->users, auth_cred_user);
-	ACL_ADD_USER("link",       handle->users, cred_link);
+	ACL_ADD_USER("link",       handle->users, auth_cred_link);
 	ACL_ADD_BOOL("deny_nick",  handle->users_denied);
 	ACL_ADD_BOOL("ban_nick",   handle->users_banned);
 	ACL_ADD_BOOL("ban_cid",    handle->cids);
@@ -247,11 +226,9 @@ int acl_initialize(struct hub_config* config, struct acl_handle* handle)
 
 static void acl_free_access_info(void* ptr)
 {
-	struct hub_user_access_info* info = (struct hub_user_access_info*) ptr;
+	struct auth_info* info = (struct auth_info*) ptr;
 	if (info)
 	{
-		hub_free(info->username);
-		hub_free(info->password);
 		hub_free(info);
 	}
 }
@@ -305,28 +282,84 @@ int acl_shutdown(struct acl_handle* handle)
 		list_destroy(handle->nat_override);
 	}
 
-	
 	memset(handle, 0, sizeof(struct acl_handle));
 	return 0;
 }
 
-
+extern int acl_register_user(struct hub_info* hub, struct auth_info* info)
-struct hub_user_access_info* acl_get_access_info(struct acl_handle* handle, const char* name)
 {
-	struct hub_user_access_info* info = (struct hub_user_access_info*) list_get_first(handle->users);
+#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';
+	data.password[0] = '\0';
+	data.credentials = auth_cred_none;
+	if (plugin_auth_delete_user(hub, &data) != st_allow)
+	{
+		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)
+	{
+		hub_free(info);
+		return NULL;
+	}
+	return info;
+#else
+	info = (struct auth_info*) list_get_first(hub->acl->users);
 	while (info)
 	{
-		if (strcasecmp(info->username, name) == 0)
+		if (strcasecmp((char*)info->nickname, name) == 0)
 		{
 			return info;
 		}
-		info = (struct hub_user_access_info*) list_get_next(handle->users);
+		info = (struct auth_info*) list_get_next(hub->acl->users);
 	}
 	return NULL;
+#endif
 }
 
 #define STR_LIST_CONTAINS(LIST, STR) \
-		char* str = (char*) list_get_first(LIST); \
+		str = (char*) list_get_first(LIST); \
 		while (str) \
 		{ \
 			if (strcasecmp(str, STR) == 0) \
@@ -337,38 +370,31 @@ struct hub_user_access_info* acl_get_access_info(struct acl_handle* handle, cons
 
 int acl_is_cid_banned(struct acl_handle* handle, const char* data)
 {
+	char* str;
 	if (!handle) return 0;
 	STR_LIST_CONTAINS(handle->cids, data);
 }
 
 int acl_is_user_banned(struct acl_handle* handle, const char* data)
 {
+	char* str;
 	if (!handle) return 0;
 	STR_LIST_CONTAINS(handle->users_banned, data);
 }
 
 int acl_is_user_denied(struct acl_handle* handle, const char* data)
 {
+	char* str;
 	if (!handle) return 0;
 	STR_LIST_CONTAINS(handle->users_denied, data);
 }
 
 int acl_user_ban_nick(struct acl_handle* handle, const char* nick)
 {
-	char* data = 0;
+	char* data = hub_strdup(nick);
-	struct hub_user_access_info* info = hub_malloc_zero(sizeof(struct hub_user_access_info));
-
-	if (!info)
-	{
-		LOG_ERROR("ACL error: Out of memory!");
-		return -1;
-	}
-
-	data = hub_strdup(nick);
 	if (!data)
 	{
 		LOG_ERROR("ACL error: Out of memory!");
-		hub_free(info);
 		return -1;
 	}
 
@@ -378,19 +404,10 @@ int acl_user_ban_nick(struct acl_handle* handle, const char* nick)
 
 int acl_user_ban_cid(struct acl_handle* handle, const char* cid)
 {
-	char* data;
+	char* data = hub_strdup(cid);
-	struct hub_user_access_info* info = hub_malloc_zero(sizeof(struct hub_user_access_info));
-	if (!info)
-	{
-		LOG_ERROR("ACL error: Out of memory!");
-		return -1;
-	}
-
-	data = hub_strdup(cid);
 	if (!data)
 	{
 		LOG_ERROR("ACL error: Out of memory!");
-		hub_free(info);
 		return -1;
 	}
 
@@ -450,7 +467,7 @@ int acl_is_ip_nat_override(struct acl_handle* handle, const char* ip_address)
  * seconds since the unix epoch (modulus 1 million)
  * and the SID of the user (0-1 million).
  */
-const char* acl_password_generate_challenge(struct acl_handle* acl, struct hub_user* user)
+const char* acl_password_generate_challenge(struct hub_info* hub, struct hub_user* user)
 {
 	char buf[64];
 	uint64_t tiger_res[3];
@@ -466,36 +483,40 @@ const char* acl_password_generate_challenge(struct acl_handle* acl, struct hub_u
 }
 
 
-int acl_password_verify(struct acl_handle* acl, struct hub_user* user, const char* password)
+int acl_password_verify(struct hub_info* hub, struct hub_user* user, const char* password)
 {
 	char buf[1024];
-	struct hub_user_access_info* access;
+	struct auth_info* access;
 	const char* challenge;
 	char raw_challenge[64];
 	char password_calc[64];
 	uint64_t tiger_res[3];
+	size_t password_len;
 
 	if (!password || !user || strlen(password) != MAX_CID_LEN)
 		return 0;
 
-	access = acl_get_access_info(acl, user->id.nick);
+	access = acl_get_access_info(hub, user->id.nick);
-	if (!access || !access->password)
+	if (!access)
 		return 0;
 
-	if (TIGERSIZE+strlen(access->password) >= 1024)
+	challenge = acl_password_generate_challenge(hub, user);
-		return 0;
-
-	challenge = acl_password_generate_challenge(acl, user);
 
 	base32_decode(challenge, (unsigned char*) raw_challenge, MAX_CID_LEN);
 
-	memcpy(&buf[0], (char*) access->password, strlen(access->password));
+	password_len = strlen(access->password);
-	memcpy(&buf[strlen(access->password)], raw_challenge, TIGERSIZE);
 	
-	tiger((uint64_t*) buf, TIGERSIZE+strlen(access->password), (uint64_t*) tiger_res);
+	memcpy(&buf[0], access->password, password_len);
+	memcpy(&buf[password_len], raw_challenge, TIGERSIZE);
+	
+	tiger((uint64_t*) buf, TIGERSIZE+password_len, (uint64_t*) tiger_res);
 	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)
 	{
 		return 1;

src/core/auth.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -21,30 +21,10 @@
 #define HAVE_UHUB_ACL_H
 
 struct hub_config;
+struct hub_info;
 struct hub_user;
 struct ip_addr_encap;
 
-enum user_credentials
-{
-	cred_none,                 /**<<< "User has no credentials (not yet logged in)" */
- 	cred_bot,                  /**<<< "User is a robot" */
-	cred_guest,                /**<<< "User is a guest (unregistered user)" */
- 	cred_user,                 /**<<< "User is identified as a registered user" */
-	cred_operator,             /**<<< "User is identified as a hub operator" */
-	cred_super,                /**<<< "User is a super user" (not used) */
-	cred_admin,                /**<<< "User is identified as a hub administrator/owner" */
- 	cred_link,                 /**<<< "User is a link (not used currently)" */
-};
-
-const char* get_user_credential_string(enum user_credentials cred);
-
-struct hub_user_access_info
-{
-	char* username;          /* name of user, cid or IP range */
-	char* password;          /* password */
-	enum user_credentials status;
-};
-
 struct acl_handle
 {
 	struct linked_list* users;          /* Known users. See enum user_status */
@@ -59,7 +39,12 @@ struct acl_handle
 extern int acl_initialize(struct hub_config* config, struct acl_handle* handle);
 extern int acl_shutdown(struct acl_handle* handle);
 
-extern struct hub_user_access_info* acl_get_access_info(struct acl_handle* handle, const char* name);
+extern struct auth_info* acl_get_access_info(struct hub_info* hub, const char* name);
+extern int acl_register_user(struct hub_info* hub, struct auth_info* info);
+extern int acl_update_user(struct hub_info* hub, struct auth_info* info);
+extern int acl_delete_user(struct hub_info* hub, const char* name);
+
+
 extern int acl_is_cid_banned(struct acl_handle* handle, const char* cid);
 extern int acl_is_ip_banned(struct acl_handle* handle, const char* ip_address);
 extern int acl_is_ip_nat_override(struct acl_handle* handle, const char* ip_address);
@@ -72,14 +57,14 @@ extern int acl_user_ban_cid(struct acl_handle* handle, const char* cid);
 extern int acl_user_unban_nick(struct acl_handle* handle, const char* nick);
 extern int acl_user_unban_cid(struct acl_handle* handle, const char* cid);
 
-extern const char* acl_password_generate_challenge(struct acl_handle* acl, struct hub_user* user);
-
 /**
  * Verify a password.
  *
  * @param password the hashed password (based on the nonce).
  * @return 1 if the password matches, or 0 if the password is incorrect.
  */
-extern int acl_password_verify(struct acl_handle* acl, struct hub_user* user, const char* password);
+extern int acl_password_verify(struct hub_info* hub, struct hub_user* user, const char* password);
+extern const char* acl_password_generate_challenge(struct hub_info* hub, struct hub_user* user);
+
 
 #endif /* HAVE_UHUB_ACL_H */

src/core/commands.h

@@ -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
@@ -19,4 +19,80 @@
 
 #include "uhub.h"
 
-extern int command_dipatcher(struct hub_info* hub, struct hub_user* user, const char* message);
+struct command_base;
+
+struct hub_command
+{
+	const char* message;
+	char* prefix;
+	size_t prefix_len;
+	struct linked_list* args;
+};
+
+typedef int (*command_handler)(struct command_base*, struct hub_user* user, struct hub_command*);
+
+
+/**
+ * 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)
+ * 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* command_origin;		/**<<< "Name of module where the command is implemented." */
+};
+
+/**
+ * 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*);
+
+/**
+ * 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*);
+
+/**
+ * Returns 1 if a command is available to a user (user has access to run it.)
+ */
+extern int command_is_available(struct command_handle*, struct hub_user* user);
+
+/**
+ * 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);

src/core/config.c

@@ -29,445 +29,44 @@
 #define INT_MIN (-0x7fffffff - 1)
 #endif
 
-#define CFG_APPLY_BOOLEAN(KEY, TARGET) \
+static int apply_boolean(const char* key, const char* data, int* target)
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		if      (strlen(data) == 1 && (data[0] == '1')) TARGET = 1; \
-		else if (strlen(data) == 1 && (data[0] == '0')) TARGET = 0; \
-		else if (strncasecmp(data, "true",  4) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "false", 5) == 0) TARGET = 0; \
-		else if (strncasecmp(data, "yes",   3) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "no",    2) == 0) TARGET = 0; \
-		else if (strncasecmp(data, "on",    2) == 0) TARGET = 1; \
-		else if (strncasecmp(data, "off",   3) == 0) TARGET = 0; \
-		else\
-		{ \
-			LOG_FATAL("Configuration error on line %d: '%s' must be either '1' or '0'", line_count, key); \
-			return -1; \
-		} \
-		TARGET |= 0x80000000; \
-		return 0; \
-	}
-
-#define CFG_APPLY_STRING(KEY, TARGET) \
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		TARGET = hub_strdup(data); \
-		return 0; \
-	}
-
-
-#define CFG_APPLY_INTEGER(KEY, TARGET) \
-	if (strcmp(KEY, key) == 0) \
-	{ \
-		char* endptr; \
-		int val; \
-		errno = 0; \
-		val = strtol(data, &endptr, 10); \
-		if (((errno == ERANGE && (val == INT_MAX || val == INT_MIN)) || (errno != 0 && val == 0)) || endptr == data) { \
-			LOG_FATAL("Configuration error on line %d: '%s' must be a number", line_count, key); \
-			return -1; \
-		} \
-		TARGET = val; \
-		return 0; \
-	}
-
-
-#define DEFAULT_STRING(KEY, VALUE) \
-{ \
-	if (config->KEY == 0) \
-		config->KEY = hub_strdup(VALUE); \
-}
-
-#define DEFAULT_INTEGER(KEY, VALUE) \
-{ \
-	if (config->KEY == 0) \
-		config->KEY = VALUE; \
-}
-
-#define DEFAULT_BOOLEAN(KEY, VALUE) \
-{ \
-	if (config->KEY & 0x80000000) \
-	{ \
-		config->KEY = config->KEY & 0x000000ff; \
-	} \
-	else \
-	{ \
-		config->KEY = VALUE; \
-	} \
-}
-
-#define GET_STR(NAME)  CFG_APPLY_STRING ( #NAME , config->NAME )
-#define GET_INT(NAME)  CFG_APPLY_INTEGER( #NAME , config->NAME )
-#define GET_BOOL(NAME) CFG_APPLY_BOOLEAN( #NAME , config->NAME )
-#define IGNORED(NAME) \
-    if (strcmp(#NAME, key) == 0) \
-    { \
-        LOG_WARN("Configuration option %s deprecated and ingnored.", key); \
-        return 0; \
-    } \
-
-/* default configuration values */
-#define DEF_SERVER_BIND_ADDR                "any"
-#define DEF_SERVER_PORT                     1511
-#define DEF_SERVER_BACKLOG                  50
-#define DEF_HUB_NAME                        "uhub"
-#define DEF_HUB_DESCRIPTION                 ""
-#define DEF_HUB_ENABLED                     1
-#define DEF_FILE_ACL                        ""
-#define DEF_FILE_MOTD                       ""
-#define DEF_MAX_USERS                       500
-#define DEF_MAX_CHAT_HISTORY                20
-#define DEF_MAX_LOGOUT_LOG                  100
-#define DEF_MAX_RECV_BUFFER                 4096
-#define DEF_MAX_SEND_BUFFER                 131072
-#define DEF_MAX_SEND_BUFFER_SOFT            98304
-#define DEF_SHOW_BANNER                     1
-#define DEF_REGISTERED_USERS_ONLY           0
-#define DEF_CHAT_ONLY                       0
-#define DEF_CHAT_IS_PRIVILEGED              0
-#define DEF_LOW_BANDWIDTH_MODE              0
-#define DEF_LIMIT_MAX_HUBS_USER             0
-#define DEF_LIMIT_MAX_HUBS_REG              0
-#define DEF_LIMIT_MAX_HUBS_OP               0
-#define DEF_LIMIT_MAX_HUBS                  0
-#define DEF_LIMIT_MIN_HUBS_USER             0
-#define DEF_LIMIT_MIN_HUBS_REG              0
-#define DEF_LIMIT_MIN_HUBS_OP               0
-#define DEF_LIMIT_MIN_SHARE                 0
-#define DEF_LIMIT_MAX_SHARE                 0
-#define DEF_LIMIT_MIN_SLOTS                 0
-#define DEF_LIMIT_MAX_SLOTS                 0
-#define DEF_TLS_ENABLE                      0
-#define DEF_TLS_REQUIRE                     1
-#define DEF_TLS_PRIVATE_KEY                 ""
-#define DEF_TLS_CERTIFICATE                 ""
-#define DEF_MSG_HUB_FULL                    "Hub is full"
-#define DEF_MSG_HUB_DISABLED                "Hub is disabled"
-#define DEF_MSG_HUB_REGISTERED_USERS_ONLY   "Hub is for registered users only"
-#define DEF_MSG_INF_ERROR_NICK_MISSING      "No nickname given"
-#define DEF_MSG_INF_ERROR_NICK_MULTIPLE     "Multiple nicknames given"
-#define DEF_MSG_INF_ERROR_NICK_INVALID      "Nickname is invalid"
-#define DEF_MSG_INF_ERROR_NICK_LONG         "Nickname too long"
-#define DEF_MSG_INF_ERROR_NICK_SHORT        "Nickname too short"
-#define DEF_MSG_INF_ERROR_NICK_SPACES       "Nickname cannot start with spaces"
-#define DEF_MSG_INF_ERROR_NICK_BAD_CHARS    "Nickname contains invalid characters"
-#define DEF_MSG_INF_ERROR_NICK_NOT_UTF8     "Nickname is not valid utf8"
-#define DEF_MSG_INF_ERROR_NICK_TAKEN        "Nickname is already in use"
-#define DEF_MSG_INF_ERROR_NICK_RESTRICTED   "Nickname cannot be used on this hub"
-#define DEF_MSG_INF_ERROR_CID_INVALID       "CID is not valid"
-#define DEF_MSG_INF_ERROR_CID_MISSING       "CID is not specified"
-#define DEF_MSG_INF_ERROR_CID_TAKEN         "CID is taken"
-#define DEF_MSG_INF_ERROR_PID_MISSING       "PID is not specified"
-#define DEF_MSG_INF_ERROR_PID_INVALID       "PID is invalid"
-#define DEF_MSG_BAN_PERMANENTLY             "Banned permanently"
-#define DEF_MSG_BAN_TEMPORARILY             "Banned temporarily"
-#define DEF_MSG_AUTH_INVALID_PASSWORD       "Password is wrong"
-#define DEF_MSG_AUTH_USER_NOT_FOUND         "User not found in password database"
-#define DEF_MSG_ERROR_NO_MEMORY             "No memory"
-#define DEF_MSG_USER_SHARE_SIZE_LOW         "User is not sharing enough"
-#define DEF_MSG_USER_SHARE_SIZE_HIGH        "User is sharing too much"
-#define DEF_MSG_USER_SLOTS_LOW              "User have too few upload slots."
-#define DEF_MSG_USER_SLOTS_HIGH             "User have too many upload slots."
-#define DEF_MSG_USER_HUB_LIMIT_LOW          "User is on too few hubs."
-#define DEF_MSG_USER_HUB_LIMIT_HIGH         "User is on too many hubs."
-
-void config_defaults(struct hub_config* config)
 {
-	DEFAULT_STRING (server_bind_addr,      DEF_SERVER_BIND_ADDR);
+	return string_to_boolean(data, target);
-	DEFAULT_STRING (hub_name,              DEF_HUB_NAME);
-	DEFAULT_STRING (hub_description,       DEF_HUB_DESCRIPTION);
-	DEFAULT_BOOLEAN(hub_enabled,           DEF_HUB_ENABLED);
-	DEFAULT_STRING (file_acl,              DEF_FILE_ACL);
-	DEFAULT_STRING (file_motd,             DEF_FILE_MOTD);
-	DEFAULT_INTEGER(server_port,           DEF_SERVER_PORT);
-	DEFAULT_INTEGER(server_listen_backlog, DEF_SERVER_BACKLOG);
-	DEFAULT_INTEGER(max_users,             DEF_MAX_USERS);
-	DEFAULT_INTEGER(max_chat_history,      DEF_MAX_CHAT_HISTORY);
-	DEFAULT_INTEGER(max_logout_log,        DEF_MAX_LOGOUT_LOG);
-	DEFAULT_INTEGER(max_recv_buffer,       DEF_MAX_RECV_BUFFER);
-	DEFAULT_INTEGER(max_send_buffer,       DEF_MAX_SEND_BUFFER);
-	DEFAULT_INTEGER(max_send_buffer_soft,  DEF_MAX_SEND_BUFFER_SOFT);
-	DEFAULT_BOOLEAN(show_banner,           DEF_SHOW_BANNER);
-	DEFAULT_BOOLEAN(chat_only,             DEF_CHAT_ONLY);
-	DEFAULT_BOOLEAN(chat_is_privileged,    DEF_CHAT_IS_PRIVILEGED);
-	DEFAULT_BOOLEAN(low_bandwidth_mode,    DEF_LOW_BANDWIDTH_MODE);
-	DEFAULT_BOOLEAN(registered_users_only, DEF_REGISTERED_USERS_ONLY);
-	
-	/* Limits enforced on users */
-	DEFAULT_INTEGER(limit_max_hubs_user,   DEF_LIMIT_MAX_HUBS_USER);
-	DEFAULT_INTEGER(limit_max_hubs_reg,    DEF_LIMIT_MAX_HUBS_REG);
-	DEFAULT_INTEGER(limit_max_hubs_op,     DEF_LIMIT_MAX_HUBS_OP);
-	DEFAULT_INTEGER(limit_min_hubs_user,   DEF_LIMIT_MIN_HUBS_USER);
-	DEFAULT_INTEGER(limit_min_hubs_reg,    DEF_LIMIT_MIN_HUBS_REG);
-	DEFAULT_INTEGER(limit_min_hubs_op,     DEF_LIMIT_MIN_HUBS_OP);
-	DEFAULT_INTEGER(limit_max_hubs,        DEF_LIMIT_MAX_HUBS);
-	DEFAULT_INTEGER(limit_min_share,       DEF_LIMIT_MIN_SHARE);
-	DEFAULT_INTEGER(limit_max_share,       DEF_LIMIT_MAX_SHARE);
-	DEFAULT_INTEGER(limit_min_slots,       DEF_LIMIT_MIN_SLOTS);
-	DEFAULT_INTEGER(limit_max_slots,       DEF_LIMIT_MAX_SLOTS);
-
-	/* Status/error strings */
-	DEFAULT_STRING (msg_hub_full,                  DEF_MSG_HUB_FULL);
-	DEFAULT_STRING (msg_hub_disabled,              DEF_MSG_HUB_DISABLED)
-	DEFAULT_STRING (msg_hub_registered_users_only, DEF_MSG_HUB_REGISTERED_USERS_ONLY);
-	DEFAULT_STRING (msg_inf_error_nick_missing,    DEF_MSG_INF_ERROR_NICK_MISSING);
-	DEFAULT_STRING (msg_inf_error_nick_multiple,   DEF_MSG_INF_ERROR_NICK_MULTIPLE);
-	DEFAULT_STRING (msg_inf_error_nick_invalid,    DEF_MSG_INF_ERROR_NICK_INVALID);
-	DEFAULT_STRING (msg_inf_error_nick_long,       DEF_MSG_INF_ERROR_NICK_LONG);
-	DEFAULT_STRING (msg_inf_error_nick_short,      DEF_MSG_INF_ERROR_NICK_SHORT);
-	DEFAULT_STRING (msg_inf_error_nick_spaces,     DEF_MSG_INF_ERROR_NICK_SPACES);
-	DEFAULT_STRING (msg_inf_error_nick_bad_chars,  DEF_MSG_INF_ERROR_NICK_BAD_CHARS);
-	DEFAULT_STRING (msg_inf_error_nick_not_utf8,   DEF_MSG_INF_ERROR_NICK_NOT_UTF8);
-	DEFAULT_STRING (msg_inf_error_nick_taken,      DEF_MSG_INF_ERROR_NICK_TAKEN);
-	DEFAULT_STRING (msg_inf_error_nick_restricted, DEF_MSG_INF_ERROR_NICK_RESTRICTED);
-	DEFAULT_STRING (msg_inf_error_cid_invalid,     DEF_MSG_INF_ERROR_CID_INVALID);
-	DEFAULT_STRING (msg_inf_error_cid_missing,     DEF_MSG_INF_ERROR_CID_MISSING);
-	DEFAULT_STRING (msg_inf_error_cid_taken,       DEF_MSG_INF_ERROR_CID_TAKEN);
-	DEFAULT_STRING (msg_inf_error_pid_missing,     DEF_MSG_INF_ERROR_PID_MISSING);
-	DEFAULT_STRING (msg_inf_error_pid_invalid,     DEF_MSG_INF_ERROR_PID_INVALID);
-	DEFAULT_STRING (msg_ban_permanently,           DEF_MSG_BAN_PERMANENTLY);
-	DEFAULT_STRING (msg_ban_temporarily,           DEF_MSG_BAN_TEMPORARILY);
-	DEFAULT_STRING (msg_auth_invalid_password,     DEF_MSG_AUTH_INVALID_PASSWORD);
-	DEFAULT_STRING (msg_auth_user_not_found,       DEF_MSG_AUTH_USER_NOT_FOUND);
-	DEFAULT_STRING (msg_error_no_memory,           DEF_MSG_ERROR_NO_MEMORY);
-	DEFAULT_STRING (msg_user_share_size_low,       DEF_MSG_USER_SHARE_SIZE_LOW);
-	DEFAULT_STRING (msg_user_share_size_high,      DEF_MSG_USER_SHARE_SIZE_HIGH);
-	DEFAULT_STRING (msg_user_slots_low,            DEF_MSG_USER_SLOTS_LOW);
-	DEFAULT_STRING (msg_user_slots_high,           DEF_MSG_USER_SLOTS_HIGH);
-	DEFAULT_STRING (msg_user_hub_limit_low,        DEF_MSG_USER_HUB_LIMIT_LOW);
-	DEFAULT_STRING (msg_user_hub_limit_high,       DEF_MSG_USER_HUB_LIMIT_HIGH);
-
-	DEFAULT_INTEGER(tls_enable,                    DEF_TLS_ENABLE);
-	DEFAULT_INTEGER(tls_require,                   DEF_TLS_REQUIRE);
-	DEFAULT_STRING (tls_certificate,               DEF_TLS_CERTIFICATE);
-	DEFAULT_STRING (tls_private_key,               DEF_TLS_PRIVATE_KEY);
 }
 
-
+static int apply_string(const char* key, const char* data, char** target, char* regexp)
-static int apply_config(struct hub_config* config, char* key, char* data, int line_count)
 {
-	GET_STR (file_acl);
+	(void) regexp;
-	GET_STR (file_motd);
+	// FIXME: Add regexp checks for correct data
-	GET_STR (server_bind_addr);
-	GET_INT (server_port);
-	GET_INT (server_listen_backlog);
-	GET_STR (hub_name);
-	GET_STR (hub_description);
-	GET_BOOL(hub_enabled);
-	GET_INT (max_users);
-	GET_INT (max_chat_history);
-	GET_INT (max_logout_log);
-	GET_INT (max_recv_buffer);
-	GET_INT (max_send_buffer);
-	GET_INT (max_send_buffer_soft);
-	GET_BOOL(show_banner);
-	GET_BOOL(chat_only);
-	GET_BOOL(chat_is_privileged);
-	GET_BOOL(low_bandwidth_mode);
-	GET_BOOL(registered_users_only);
 
-	/* Limits enforced on users */
+	if (*target)
-	GET_INT(limit_max_hubs_user);
+		hub_free(*target);
-	GET_INT(limit_max_hubs_reg);
-	GET_INT(limit_max_hubs_op);
-	GET_INT(limit_min_hubs_user);
-	GET_INT(limit_min_hubs_reg);
-	GET_INT(limit_min_hubs_op);
-	GET_INT(limit_max_hubs);
-	GET_INT(limit_min_share);
-	GET_INT(limit_max_share);
-	GET_INT(limit_min_slots);
-	GET_INT(limit_max_slots);
 
-	/* Status/error strings */
+	*target = hub_strdup(data);
-	GET_STR (msg_hub_full);
+	return 1;
-	GET_STR (msg_hub_disabled);
-	GET_STR (msg_hub_registered_users_only);
-	GET_STR (msg_inf_error_nick_missing);
-	GET_STR (msg_inf_error_nick_multiple);
-	GET_STR (msg_inf_error_nick_invalid);
-	GET_STR (msg_inf_error_nick_long);
-	GET_STR (msg_inf_error_nick_short);
-	GET_STR (msg_inf_error_nick_spaces);
-	GET_STR (msg_inf_error_nick_bad_chars);
-	GET_STR (msg_inf_error_nick_not_utf8);
-	GET_STR (msg_inf_error_nick_taken);
-	GET_STR (msg_inf_error_nick_restricted);
-	GET_STR (msg_inf_error_cid_invalid);
-	GET_STR (msg_inf_error_cid_missing);
-	GET_STR (msg_inf_error_cid_taken);
-	GET_STR (msg_inf_error_pid_missing);
-	GET_STR (msg_inf_error_pid_invalid);
-	GET_STR (msg_ban_permanently);
-	GET_STR (msg_ban_temporarily);
-	GET_STR (msg_auth_invalid_password);
-	GET_STR (msg_auth_user_not_found);
-	GET_STR (msg_error_no_memory);
-	GET_STR (msg_user_share_size_low);
-	GET_STR (msg_user_share_size_high);
-	GET_STR (msg_user_slots_low);
-	GET_STR (msg_user_slots_high);
-	GET_STR (msg_user_hub_limit_low);
-	GET_STR (msg_user_hub_limit_high);
-
-	GET_BOOL(tls_enable);
-	GET_BOOL(tls_require);
-	GET_STR (tls_certificate);
-	GET_STR (tls_private_key);
-
-    /* Still here -- unknown directive */
-	LOG_ERROR("Unknown configuration directive: '%s'", key);
-	return -1;
 }
 
-
+static int apply_integer(const char* key, const char* data, int* target, int* min, int* max)
-void free_config(struct hub_config* config)
 {
-	hub_free(config->server_bind_addr);
+	char* endptr;
-	hub_free(config->file_motd);
+	int val;
-	hub_free(config->file_acl);
+	errno = 0;
-	hub_free(config->hub_name);
+	val = strtol(data, &endptr, 10);
-	hub_free(config->hub_description);
 
-	hub_free(config->msg_hub_full);
+	if (((errno == ERANGE && (val == INT_MAX || val == INT_MIN)) || (errno != 0 && val == 0)) || endptr == data)
-	hub_free(config->msg_hub_disabled);
+			return 0;
-	hub_free(config->msg_hub_registered_users_only);
-	hub_free(config->msg_inf_error_nick_missing);
-	hub_free(config->msg_inf_error_nick_multiple);
-	hub_free(config->msg_inf_error_nick_invalid);
-	hub_free(config->msg_inf_error_nick_long);
-	hub_free(config->msg_inf_error_nick_short);
-	hub_free(config->msg_inf_error_nick_spaces);
-	hub_free(config->msg_inf_error_nick_bad_chars);
-	hub_free(config->msg_inf_error_nick_not_utf8);
-	hub_free(config->msg_inf_error_nick_taken);
-	hub_free(config->msg_inf_error_nick_restricted);
-	hub_free(config->msg_inf_error_cid_invalid);
-	hub_free(config->msg_inf_error_cid_missing);
-	hub_free(config->msg_inf_error_cid_taken);
-	hub_free(config->msg_inf_error_pid_missing);
-	hub_free(config->msg_inf_error_pid_invalid);
-	hub_free(config->msg_ban_permanently);
-	hub_free(config->msg_ban_temporarily);
-	hub_free(config->msg_auth_invalid_password);
-	hub_free(config->msg_auth_user_not_found);
-	hub_free(config->msg_error_no_memory);
-	hub_free(config->msg_user_share_size_low);
-	hub_free(config->msg_user_share_size_high);
-	hub_free(config->msg_user_slots_low);
-	hub_free(config->msg_user_slots_high);
-	hub_free(config->msg_user_hub_limit_low);
-	hub_free(config->msg_user_hub_limit_high);
 
-	hub_free(config->tls_certificate);
+	if (min && val < *min)
-	hub_free(config->tls_private_key);
+		return 0;
 
-	memset(config, 0, sizeof(struct hub_config));
+	if (max && val > *max)
-}
+		return 0;
-
+
-#define DUMP_STR(NAME, DEFAULT) \
+	*target = val;
-	if (ignore_defaults) \
+	return 1;
-	{ \
-		if (strcmp(config->NAME, DEFAULT) != 0) \
-			fprintf(stdout, "%s = \"%s\"\n", #NAME , config->NAME); \
-	} \
-	else \
-		fprintf(stdout, "%s = \"%s\"\n", #NAME , config->NAME); \
-		
-#define DUMP_INT(NAME, DEFAULT) \
-	if (ignore_defaults) \
-	{ \
-		if (config->NAME != DEFAULT) \
-			fprintf(stdout, "%s = %d\n", #NAME , config->NAME); \
-	} \
-	else \
-		fprintf(stdout, "%s = %d\n", #NAME , config->NAME); \
-
-
-#define DUMP_BOOL(NAME, DEFAULT) \
-	if (ignore_defaults) \
-	{ \
-		if (config->NAME != DEFAULT) \
-			fprintf(stdout, "%s = %s\n", #NAME , (config->NAME ? "yes" : "no")); \
-	} \
-	else \
-		fprintf(stdout, "%s = %s\n", #NAME , (config->NAME ? "yes" : "no"));
-
-void dump_config(struct hub_config* config, int ignore_defaults)
-{
-	DUMP_STR (file_acl, DEF_FILE_ACL);
-	DUMP_STR (file_motd, DEF_FILE_MOTD);
-	DUMP_STR (server_bind_addr, DEF_SERVER_BIND_ADDR);
-	DUMP_INT (server_port, DEF_SERVER_PORT);
-	DUMP_INT (server_listen_backlog, DEF_SERVER_BACKLOG);
-	DUMP_STR (hub_name, DEF_HUB_NAME);
-	DUMP_STR (hub_description, DEF_HUB_DESCRIPTION);
-	DUMP_BOOL(hub_enabled, DEF_HUB_ENABLED);
-	DUMP_INT (max_users, DEF_MAX_USERS);
-	DUMP_INT (max_chat_history, DEF_MAX_CHAT_HISTORY);
-	DUMP_INT (max_logout_log, DEF_MAX_LOGOUT_LOG);
-	DUMP_INT (max_recv_buffer, DEF_MAX_RECV_BUFFER);
-	DUMP_INT (max_send_buffer, DEF_MAX_SEND_BUFFER);
-	DUMP_INT (max_send_buffer_soft, DEF_MAX_SEND_BUFFER_SOFT);
-	DUMP_BOOL(show_banner, DEF_SHOW_BANNER);
-	DUMP_BOOL(chat_only, DEF_CHAT_ONLY);
-	DUMP_BOOL(chat_is_privileged, DEF_CHAT_IS_PRIVILEGED);
-	DUMP_BOOL(low_bandwidth_mode, DEF_LOW_BANDWIDTH_MODE);
-	DUMP_BOOL(registered_users_only, DEF_REGISTERED_USERS_ONLY);
-
-#ifdef SSL_SUPPORT
-	DUMP_BOOL(tls_enable, DEF_TLS_ENABLE);
-	DUMP_BOOL(tls_require, DEF_TLS_REQUIRE);
-	DUMP_STR (tls_certificate, DEF_TLS_CERTIFICATE);
-	DUMP_STR (tls_private_key, DEF_TLS_PRIVATE_KEY);
-#endif
-
-	/* Limits enforced on users */
-	DUMP_INT(limit_max_hubs_user, DEF_LIMIT_MAX_HUBS_USER);
-	DUMP_INT(limit_max_hubs_reg, DEF_LIMIT_MAX_HUBS_REG);
-	DUMP_INT(limit_max_hubs_op, DEF_LIMIT_MAX_HUBS_OP);
-	DUMP_INT(limit_min_hubs_user, DEF_LIMIT_MIN_HUBS_USER);
-	DUMP_INT(limit_min_hubs_reg, DEF_LIMIT_MIN_HUBS_REG);
-	DUMP_INT(limit_min_hubs_op, DEF_LIMIT_MIN_HUBS_OP);
-	DUMP_INT(limit_max_hubs, DEF_LIMIT_MAX_HUBS);
-	DUMP_INT(limit_min_share, DEF_LIMIT_MIN_SHARE);
-	DUMP_INT(limit_max_share, DEF_LIMIT_MAX_SHARE);
-	DUMP_INT(limit_min_slots, DEF_LIMIT_MIN_SLOTS);
-	DUMP_INT(limit_max_slots, DEF_LIMIT_MAX_SLOTS);
-	
-	/* Status/error strings */
-	DUMP_STR (msg_hub_full, DEF_MSG_HUB_FULL);
-	DUMP_STR (msg_hub_disabled, DEF_MSG_HUB_DISABLED);
-	DUMP_STR (msg_hub_registered_users_only, DEF_MSG_HUB_REGISTERED_USERS_ONLY);
-	DUMP_STR (msg_inf_error_nick_missing, DEF_MSG_INF_ERROR_NICK_MISSING);
-	DUMP_STR (msg_inf_error_nick_multiple, DEF_MSG_INF_ERROR_NICK_MULTIPLE);
-	DUMP_STR (msg_inf_error_nick_invalid, DEF_MSG_INF_ERROR_NICK_INVALID);
-	DUMP_STR (msg_inf_error_nick_long, DEF_MSG_INF_ERROR_NICK_LONG);
-	DUMP_STR (msg_inf_error_nick_short, DEF_MSG_INF_ERROR_NICK_SHORT);
-	DUMP_STR (msg_inf_error_nick_spaces, DEF_MSG_INF_ERROR_NICK_SPACES);
-	DUMP_STR (msg_inf_error_nick_bad_chars, DEF_MSG_INF_ERROR_NICK_BAD_CHARS);
-	DUMP_STR (msg_inf_error_nick_not_utf8, DEF_MSG_INF_ERROR_NICK_NOT_UTF8);
-	DUMP_STR (msg_inf_error_nick_taken, DEF_MSG_INF_ERROR_NICK_TAKEN);
-	DUMP_STR (msg_inf_error_nick_restricted, DEF_MSG_INF_ERROR_NICK_RESTRICTED);
-	DUMP_STR (msg_inf_error_cid_invalid, DEF_MSG_INF_ERROR_CID_INVALID);
-	DUMP_STR (msg_inf_error_cid_missing, DEF_MSG_INF_ERROR_CID_MISSING);
-	DUMP_STR (msg_inf_error_cid_taken, DEF_MSG_INF_ERROR_CID_TAKEN);
-	DUMP_STR (msg_inf_error_pid_missing, DEF_MSG_INF_ERROR_PID_MISSING);
-	DUMP_STR (msg_inf_error_pid_invalid, DEF_MSG_INF_ERROR_PID_INVALID);
-	DUMP_STR (msg_ban_permanently, DEF_MSG_BAN_PERMANENTLY);
-	DUMP_STR (msg_ban_temporarily, DEF_MSG_BAN_TEMPORARILY);
-	DUMP_STR (msg_auth_invalid_password, DEF_MSG_AUTH_INVALID_PASSWORD);
-	DUMP_STR (msg_auth_user_not_found, DEF_MSG_AUTH_USER_NOT_FOUND);
-	DUMP_STR (msg_error_no_memory, DEF_MSG_ERROR_NO_MEMORY);
-	DUMP_STR (msg_user_share_size_low, DEF_MSG_USER_SHARE_SIZE_LOW);
-	DUMP_STR (msg_user_share_size_high, DEF_MSG_USER_SHARE_SIZE_HIGH);
-	DUMP_STR (msg_user_slots_low, DEF_MSG_USER_SLOTS_LOW);
-	DUMP_STR (msg_user_slots_high, DEF_MSG_USER_SLOTS_HIGH);
-	DUMP_STR (msg_user_hub_limit_low, DEF_MSG_USER_HUB_LIMIT_LOW);
-	DUMP_STR (msg_user_hub_limit_high, DEF_MSG_USER_HUB_LIMIT_HIGH);
 }
 
+#include "gen_config.c"
 
 static int config_parse_line(char* line, int line_count, void* ptr_data)
 {
@@ -476,10 +75,7 @@ static int config_parse_line(char* line, int line_count, void* ptr_data)
 	char* data;
 	struct hub_config* config = (struct hub_config*) ptr_data;
 
-	if ((pos = strchr(line, '#')) != NULL)
+	strip_off_ini_line_comments(line, line_count);
-	{
-		pos[0] = 0;
-	}
 	
 	if (!*line) return 0;
 
@@ -504,6 +100,7 @@ static int config_parse_line(char* line, int line_count, void* ptr_data)
 
 	key = strip_white_space(key);
 	data = strip_white_space(data);
+	data = strip_off_quotes(data);
 
 	if (!*key || !*data)
 	{
@@ -522,6 +119,7 @@ int read_config(const char* file, struct hub_config* config, int allow_missing)
 	int ret;
 
 	memset(config, 0, sizeof(struct hub_config));
+	config_defaults(config);
 
 	ret = file_read_lines(file, config, &config_parse_line);
 	if (ret < 0)
@@ -536,7 +134,6 @@ int read_config(const char* file, struct hub_config* config, int allow_missing)
 		}
 	}
 
-	config_defaults(config);
 	return 0;
 }
 

src/core/config.h

@@ -20,78 +20,7 @@
 #ifndef HAVE_UHUB_CONFIG_H
 #define HAVE_UHUB_CONFIG_H
 
-struct hub_config
+#include "gen_config.h"
-{
-	int server_port;             /**<<< "Server port to bind to (default: 1511)" */
-	char* server_bind_addr;      /**<<< "Server bind address (default: '0.0.0.0' or '::')" */
-	int server_listen_backlog;   /**<<< "Server listen backlog (default: 50)" */
-	int hub_enabled;             /**<<< "Is server enabled (default: 1)" */
-	int show_banner;             /**<<< "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 chat_only;               /**<<< "Allow chat only operation on hub (default: 0)" */
-	int chat_is_privileged;      /**<<< "Allow chat for operators and above only (default: 0) */
-	char* file_motd;             /**<<< "File containing the 'message of the day' (default: '' - no motd)" */
-	char* file_acl;              /**<<< "File containing user database (default: '' - no known users)" */
-	char* hub_name;              /**<<< "Name of hub (default: 'My uhub hub')" */
-	char* hub_description;       /**<<< "Name of hub (default: 'no description')" */
-	int max_recv_buffer;         /**<<< "Max read buffer before parse, per user (default: 4096)" */
-	int max_send_buffer;         /**<<< "Max send buffer before disconnect, per user (default: 128K)" */
-	int max_send_buffer_soft;    /**<<< "Max send buffer before message drops, per user (default: 96K)" */
-	int low_bandwidth_mode;      /**<<< "If this is enabled, the hub will strip off elements from each user's info message to reduce bandwidth usage" */
-
-	int max_chat_history;        /**<<< "Number of chat messages kept in history (default: 20)" */
-	int max_logout_log;          /**<<< "Number of log entries for people leaving the hub. (default: 100) */
-
-	/* Limits enforced on users */
-	int limit_max_hubs_user;     /**<<< "Max concurrent hubs as a user. (0=off, default: 10)" */
-	int limit_max_hubs_reg;      /**<<< "Max concurrent hubs as registered user. (0=off, default: 10)" */
-	int limit_max_hubs_op;       /**<<< "Max concurrent hubs as operator. (0=off, default: 10)" */
-	int limit_min_hubs_user;     /**<<< "Min concurrent hubs as a user. (0=off, default: 0)" */
-	int limit_min_hubs_reg;      /**<<< "Min concurrent hubs as registered user. (0=off, default: 0)" */
-	int limit_min_hubs_op;       /**<<< "Min concurrent hubs as operator. (0=off, default: 0)" */
-	int limit_max_hubs;          /**<<< "Max total hub connections allowed, user/reg/op combined. (0=off, default: 25)" */
-	int limit_min_share;         /**<<< "Limit minimum share size in megabytes (MiB) (0=off, default: 0)" */
-	int limit_max_share;         /**<<< "Limit maximum share size in megabytes (MiB) (0=off, default: 0)" */
-	int limit_min_slots;         /**<<< "Limit minimum number of slots open per user (0=off, default: 0)" */
-	int limit_max_slots;         /**<<< "Limit maximum number of slots open per user (0=off, default: 0)" */
-
-	/* Messages that can be sent to a user */
-	char* msg_hub_full;                   /**<<< "hub is full" */
-	char* msg_hub_disabled;               /**<<< "hub is disabled" */
-	char* msg_hub_registered_users_only;  /**<<< "hub is for registered users only" */
-	char* msg_inf_error_nick_missing;     /**<<< "no nickname given" */
-	char* msg_inf_error_nick_multiple;    /**<<< "multiple nicknames given" */
-	char* msg_inf_error_nick_invalid;     /**<<< "generic/unkown" */
-	char* msg_inf_error_nick_long;        /**<<< "nickname too long" */
-	char* msg_inf_error_nick_short;       /**<<< "nickname too short" */
-	char* msg_inf_error_nick_spaces;      /**<<< "nickname cannot start with spaces" */
-	char* msg_inf_error_nick_bad_chars;   /**<<< "nickname contains chars below ascii 32" */
-	char* msg_inf_error_nick_not_utf8;    /**<<< "nickname is not valid utf8" */
-	char* msg_inf_error_nick_taken;       /**<<< "nickname is in use" */
-	char* msg_inf_error_nick_restricted;  /**<<< "nickname cannot be used on this hub" */
-	char* msg_inf_error_cid_invalid;      /**<<< "CID is not valid" */
-	char* msg_inf_error_cid_missing;      /**<<< "CID is not specified" */
-	char* msg_inf_error_cid_taken;        /**<<< "CID is taken" */
-	char* msg_inf_error_pid_missing;      /**<<< "PID is not specified" */
-	char* msg_inf_error_pid_invalid;      /**<<< "PID is invalid" */
-	char* msg_ban_permanently;            /**<<< "Banned permanently" */
-	char* msg_ban_temporarily;            /**<<< "Banned temporarily" */
-	char* msg_auth_invalid_password;      /**<<< "Password is wrong" */
-	char* msg_auth_user_not_found;        /**<<< "User not found in password database" */
-	char* msg_error_no_memory;            /**<<< "No memory" */
-	char* msg_user_share_size_low;        /**<<< "User is not sharing enough" */
-	char* msg_user_share_size_high;       /**<<< "User is sharing too much" */
-	char* msg_user_slots_low;             /**<<< "User have too few upload slots." */
-	char* msg_user_slots_high;            /**<<< "User have too many upload slots." */
-	char* msg_user_hub_limit_low;         /**<<< "User is on too few hubs." */
-	char* msg_user_hub_limit_high;        /**<<< "User is on too many hubs." */
-
-	int tls_enable;                      /**<<< "Enable SSL/TLS support (default: 0)" */
-	int tls_require;                     /**<<< "If SSL/TLS enabled, should it be required (default: 0) */
-	char* tls_certificate;               /**<<< "Certificate file (PEM)" */
-	char* tls_private_key;               /**<<< "Private key" */
-};
 
 /**
  * This initializes the configuration variables, and sets the default

src/core/config.pl

@@ -0,0 +1,241 @@
+#!/usr/bin/perl -w
+
+use strict;
+use XML::Twig;
+
+sub write_c_header(@);
+sub write_c_impl_defaults(@);
+sub write_c_impl_apply(@);
+sub write_c_impl_free(@);
+sub write_c_impl_dump(@);
+sub get_data($);
+
+# initialize parser and read the file
+my $input = "./config.xml";
+my $parser = XML::Twig->new();
+my $tree = $parser->parsefile($input) || die "Unable to parse XML file.";
+
+# Write header file
+open GENHEAD, ">gen_config.h" || die "Unable to write header file";
+print GENHEAD "/* THIS FILE IS AUTOGENERATED - DO NOT CHANGE IT! */\n\nstruct hub_config\n{\n";
+foreach my $p ($tree->root->children("option"))
+{
+	write_c_header(get_data($p));
+}
+print GENHEAD "};\n\n";
+
+# Write c source file
+open GENIMPL, ">gen_config.c" || die "Unable to write source file";
+print GENIMPL "/* THIS FILE IS AUTOGENERATED - DO NOT CHANGE IT! */\n\n";
+
+# The defaults function
+print GENIMPL "void config_defaults(struct hub_config* config)\n{\n";
+foreach my $p ($tree->root->children("option"))
+{
+	write_c_impl_defaults(get_data($p));
+}
+print GENIMPL "}\n\n";
+
+# apply function
+print GENIMPL "static int apply_config(struct hub_config* config, char* key, char* data, int line_count)\n{\n\tint max = 0;\n\tint min = 0;\n\n";
+
+foreach my $p ($tree->root->children("option"))
+{
+	write_c_impl_apply(get_data($p));
+}
+print GENIMPL "\t/* Still here -- unknown directive */\n";
+print GENIMPL "\tLOG_ERROR(\"Unknown configuration directive: '%s'\", key);\n";
+print GENIMPL "\t\treturn -1;\n";
+print GENIMPL "}\n\n";
+
+# free function (for strings)
+print GENIMPL "void free_config(struct hub_config* config)\n{\n";
+foreach my $p ($tree->root->children("option"))
+{
+	write_c_impl_free(get_data($p));
+}
+print GENIMPL "}\n\n";
+
+# dump function
+print GENIMPL "void dump_config(struct hub_config* config, int ignore_defaults)\n{\n";
+foreach my $p ($tree->root->children("option"))
+{
+	write_c_impl_dump(get_data($p));
+}
+print GENIMPL "}\n\n";
+
+
+
+sub write_c_header(@)
+{
+	my @output = @_;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+
+	print GENHEAD "\t";
+	print GENHEAD "int  " if ($type eq "int");
+	print GENHEAD "int  " if ($type eq "boolean");
+	print GENHEAD "char*" if ($type =~ /(string|file|message)/);
+	print GENHEAD " " . $name . ";";
+
+	my $comment = "";
+	if ($type eq "message")
+	{
+		$comment = "\"" . $default . "\"";
+	}
+	elsif (defined $short && length $short > 0)
+	{
+		$comment = $short;
+		$comment .= " (default: " . $default . ")" if (defined $default);
+	}
+
+	if (length $comment > 0)
+	{
+		my $pad = "";
+		for (my $i = length $name; $i < 32; $i++)
+		{
+			$pad .= " ";
+		}
+		$comment = $pad . "/*<<< " . $comment . " */";
+	}
+
+	print GENHEAD $comment . "\n";
+}
+
+sub write_c_impl_defaults(@)
+{
+	my @output = @_;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+	my $prefix = "";
+	my $suffix = "";
+
+	print GENIMPL "\tconfig->$name = ";
+	if ($type =~ /(string|file|message)/)
+	{
+		$prefix = "hub_strdup(\"";
+		$suffix = "\")"
+	}
+	print GENIMPL $prefix . $default . $suffix . ";\n";
+}
+
+sub write_c_impl_apply(@)
+{
+	my @output = @_;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example, $p) = @output;
+
+	my $min;
+	my $max;
+	my $regexp;
+
+	if (defined $p)
+	{
+		$min = $p->att("min");
+		$max = $p->att("max");
+		$regexp = $p->att("regexp");
+
+		print "'check' is defined for option $name";
+		print ", min=$min" if (defined $min);
+		print ", max=$max" if (defined $max);
+		print ", regexp=\"$regexp\"" if (defined $regexp);
+		print "\n";
+	}
+
+	print GENIMPL "\tif (!strcmp(key, \"" . $name . "\"))\n\t{\n";
+
+	if ($type eq "int")
+	{
+		if (defined $min)
+		{
+			print GENIMPL "\t\tmin = $min;\n"
+		}
+		if (defined $max)
+		{
+			print GENIMPL "\t\tmax = $max;\n"
+		}
+
+		print GENIMPL "\t\tif (!apply_integer(key, data, &config->$name, ";
+
+		if (defined $min)
+		{
+			print GENIMPL "&min";
+		}
+		else
+		{
+			print GENIMPL "0";
+		}
+
+		print GENIMPL ", ";
+
+		if (defined $max)
+		{
+			print GENIMPL "&max";
+		}
+		else
+		{
+			print GENIMPL "0";
+		}
+
+		print GENIMPL "))\n";
+	}
+	elsif ($type eq "boolean")
+	{
+		print GENIMPL "\t\tif (!apply_boolean(key, data, &config->$name))\n";
+	}
+	elsif ($type =~ /(string|file|message)/)
+	{
+		print GENIMPL "\t\tif (!apply_string(key, data, &config->$name, (char*) \"\"))\n";
+	}
+
+	print GENIMPL "\t\t{\n" .
+				  "\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\n" .
+				  "\t\t\treturn -1;\n" .
+				  "\t\t}\n" .
+				  "\t\treturn 0;\n" .
+				  "\t}\n\n";
+}
+
+sub write_c_impl_free(@)
+{
+	my @output = @_;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+
+	if ($type =~ /(string|file|message)/)
+	{
+		print GENIMPL "\thub_free(config->" . $name . ");\n\n" 
+	}
+}
+
+sub write_c_impl_dump(@)
+{
+	my @output = @_;
+	my ($type, $name, $default, $advanced, $short, $desc, $since, $example) = @output;
+	my $out;
+	my $val = "config->$name";
+	my $test = "config->$name != $default";
+
+	if ($type eq "int")
+	{
+		$out = "%d";
+	}
+	elsif ($type eq "boolean")
+	{
+		$out = "%s";
+		$val = "config->$name ? \"yes\" : \"no\"";
+	}
+	elsif ($type =~ /(string|file|message)/)
+	{
+		$out = "\\\"%s\\\"";
+		$test = "strcmp(config->$name, \"$default\") != 0";
+	}
+
+	print GENIMPL "\tif (!ignore_defaults || $test)\n";
+	print GENIMPL "\t\tfprintf(stdout, \"$name = $out\\n\", $val);\n\n";
+}
+
+sub get_data($)
+{
+	my $p = shift;
+	my $check = $p->first_child_matches("check");
+	my @data = ($p->att("type"), $p->att("name"), $p->att("default"), $p->att("advanced"), $p->children_text("short"), $p->children_text("description"), $p->children_text("since"), $p->children_text("example"), $check);
+	return @data;
+}
+

src/core/config.xml

@@ -0,0 +1,687 @@
+<?xml version='1.0' standalone="yes" ?>
+<config>
+
+	<option name="hub_enabled" type="boolean" default="1">
+		<short>Is server enabled</short>
+		<description><![CDATA[
+			Use this to disable the hub for a while.
+		]]></description>
+		<since>0.1.3</since>
+	</option>
+
+	<option name="server_port" type="int" default="1511">
+		<check min="1" max="65535" />
+		<since>0.1.0</since>
+		<short>Server port to bind to</short>
+		<description><![CDATA[This is specifies the port number the hub should listen on.]]></description>
+	</option>
+
+	<option name="server_bind_addr" type="string" default="any">
+		<check regexp="(\d\.\d\.\d\.\d\)|(any)|(loopback)|(.*)" /><!-- FIXME: add better IPv6 regexp in the future! -->
+		<short>Server bind address</short>
+		<description><![CDATA[
+			Specify the IP address the local hub should bind to. This can be an IPv4 or IPv6 address, or one of the special addresses "any" or "loopback". <br />
+			When "any" or "loopback" is used, the hub will automatically detect if IPv6 is supported and prefer that.
+		]]></description>
+		<syntax>
+			IPv4 address, IPv6 address, "any" or "loopback"
+		</syntax>
+		<since>0.1.2</since>
+		<example><![CDATA[
+				<p>
+				To listen to a specific IP:<br />
+				server_bind_addr = "192.168.12.69"
+				</p>
+				<p>
+				To listen to any IPv4 address:<br />
+				server_bind_addr = "0.0.0.0"
+				</p>
+				<p>
+				Or to listen to any address including IPv6 (if supported):<br />
+				server_bind_addr = "any"
+				</p>
+		]]></example>
+	</option>
+
+	<option name="server_listen_backlog" type="int" default="50">
+		<check min="5" />
+		<short>Server listen backlog</short>
+		<description><![CDATA[
+			<p>
+			This specifies the number of connections the hub will be able to accept in the backlog before they must be processed by the hub.
+			</p>
+			<p>
+			A too low number here will mean the hub will not accept connections fast enough when users are reconnecting really fast. The hub should under normal circumstances be able to empty the listen backlog several times per second.
+			</p>
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="server_alt_ports" type="string" default="">
+		<check regexp="((\d+)(,(\d+))*)?" />
+		<short>Comma separated list of alternative ports to listen to</short>
+		<description><![CDATA[
+		In addition to the server_port the hub can listen to a list of alternative ports.
+		]]></description>
+		<example><![CDATA[
+			server_alt_ports = 1295,1512,53990
+		]]></example>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="show_banner" type="boolean" default="1">
+		<short>Show banner on connect</short>
+		<description><![CDATA[
+			If enabled, the hub will announce the software version running to clients when they connect with a message like: "Powered by uhub/0.x.y"
+		]]></description>
+		<since>0.1.0</since>
+	</option>
+
+	<option name="show_banner_sys_info" type="boolean" default="1">
+		<short>Show banner on connect</short>
+		<description><![CDATA[
+			If enabled, the hub will announce the operating system and CPU architecture to clients when they join.<br />
+			This option has no effect if show_banner is disabled.
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="max_users" type="int" default="500">
+		<check min="1" max="1048576" />
+		<short>Maximum number of users allowed on the hub</short>
+		<description><![CDATA[
+			The maximum amount of users allowed on the hub.
+			No new users will be allowed to enter the hub if this number is exceeded, however privileged users (operators, admins, etc) are still able to log in.
+		]]></description>
+		<since>0.1.0</since>
+		<example><![CDATA[
+			To run a hub for max 25 users:<br />
+				max_users = 25
+		]]></example>
+	</option>
+
+	<option name="registered_users_only" type="boolean" default="0">
+		<short>Allow registered users only</short>
+		<description><![CDATA[
+			If this is enabled only registered users will be able to use the hub. A user must be registered in the acl file (file_acl).
+		]]></description>
+		<since>0.1.1</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[
+			If this is enabled users using old ADC clients are allowed to enter the hub,
+			however they cannot log in using passwords since the protocols are incompatible.
+		]]></description>
+		<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[
+			If enabled only operators and admins are allowed to chat in the main chat.
+		]]></description>
+		<since>0.2.4</since>
+	</option>
+
+	<option name="hub_name" type="string" default="uhub">
+		<short>Name of hub</short>
+		<description><![CDATA[
+		Configures the name of the hub
+		]]></description>
+		<since>0.1.0</since>
+		<example><![CDATA[
+			hub_name = "my hub"
+		]]></example>
+	</option>
+
+	<option name="hub_description" type="string" default="no description">
+		<short>Short hub description, topic or subject.</short>
+		<description><![CDATA[
+		This is the description of the hub, as seen by users and hub lists.
+		]]></description>
+		<since>0.1.0</since>
+		<example><![CDATA[
+			hub_description = "a friendly hub for friendly people"
+		]]></example>
+	</option>
+
+	<option name="redirect_addr" type="string" default="">
+		<check regexp="(adc|adcs|dchub)://.*" />
+		<short>A common hub redirect address.</short>
+		<description><![CDATA[
+		This is the redirect address used when the hub wants to redirect a client for not fulfilling some requirements.
+		]]></description>
+		<since>0.3.2</since>
+	</option>
+
+
+	<option name="max_recv_buffer" type="int" default="4096" advanced="true" >
+		<check min="1024" max="1048576" />
+		<short>Max read buffer before parse, per user</short>
+		<description><![CDATA[
+			Maximum receive buffer allowed before commands are procesed. If a single ADC message exceeds this limit, it will be discarded by the hub. Use with caution.
+		]]></description>
+		<since>0.1.3</since>
+	</option>
+
+	<option name="max_send_buffer" type="int" default="131072" advanced="true" >
+		<check min="2048" />
+		<short>Max send buffer before disconnect, per user</short>
+		<description><![CDATA[
+			Maximum amount of bytes allowed to be queued for sending to any particular user before the hub will disconnect the user. The lower the limit, the more aggressive the hub will be to disconnect slow clients. Use with caution.
+		]]></description>
+		<since>0.1.3</since>
+	</option>
+
+	<option name="max_send_buffer_soft" type="int" default="98304" advanced="true" >
+		<check min="1024" />
+		<short>Max send buffer before message drops, per user</short>
+		<description><![CDATA[
+			Same as max_send_buffer, however low priority messages may be discarded if this limit is reached. Use with caution.
+		]]></description>
+		<since>0.1.3</since>
+	</option>
+
+	<option name="low_bandwidth_mode" type="boolean" default="0" advanced="true" >
+		<short>Enable bandwidth saving measures</short>
+		<description><![CDATA[
+			If this is enabled the hub will remove excessive information from each user's info message before broadcasting to all connected users.
+			Description, e-mail address will be removed. This saves upload bandwidth for the hub.
+		]]></description>
+		<since>0.2.2</since>
+	</option>
+
+	<option name="max_chat_history" type="int" default="20">
+		<check min="0" max="250" />
+		<short>Number of chat messages kept in history</short>
+		<description><![CDATA[
+			This specifies the number of main chat messages that are kept in the history buffer.
+			Users can use the "!history" command to list these messages.
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="max_logout_log" type="int" default="20">
+		<check min="0" max="2000" />
+		<short>Number of log entries for people leaving the hub</short>
+		<description><![CDATA[
+			Operators can use the "!log" command to list users who have recently left the hub.
+			This option specifies the maximum size of this log.
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="limit_max_hubs_user" type="int" default="10">
+		<check min="0" />
+		<short>Max concurrent hubs as a guest user</short>
+		<description><![CDATA[
+		This limits the number of hubs a user can be logged into as a guest user. If this number is exceeded, the user will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_max_hubs_reg" type="int" default="10">
+		<check min="0" />
+		<short>Max concurrent hubs as a registered user</short>
+		<description><![CDATA[
+		This limits the number of hubs a user can be logged into as a registered user. If this number is exceeded, the user will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_max_hubs_op" type="int" default="10">
+		<check min="0" />
+		<short>Max concurrent hubs as a operator (or admin)</short>
+		<description><![CDATA[
+		This limits the number of hubs a user can be logged into as an operator. If this number is exceeded, the user will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_max_hubs" type="int" default="25">
+		<check min="0" />
+		<short>Max total hub connections allowed, user/reg/op combined.</short>
+		<description><![CDATA[
+		Limit the number of hubs a user can be logged into in total regardless of registrations or privileges.
+		If this number is exceeded, the user will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_min_hubs_user" type="int" default="0">
+		<check min="0" />
+		<short>Minimum concurrent hubs as a guest user</short>
+		<description><![CDATA[
+		Only allow users that are logged into other hubs with guest privileges to enter this hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_min_hubs_reg" type="int" default="0">
+		<check min="0" />
+		<short>Minimum concurrent hubs as a registered user</short>
+		<description><![CDATA[
+		Only allow users that are logged into other hubs as a registered user to enter this hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_min_hubs_op" type="int" default="0">
+		<check min="0" />
+		<short>Minimum concurrent hubs as a operator (or admin)</short>
+		<description><![CDATA[
+		Only allow users that are logged into other hubs with operator privileges to enter this hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_min_share" type="int" default="0">
+		<check min="0" />
+		<short>Limit minimum share size in megabytes</short>
+		<description><![CDATA[
+		Minimum share limit in megabytes (MiB). Users sharing less than this will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+		<example><![CDATA[
+			To require users to share at least 1 GB in order to enter the hub:<br />
+			limit_min_share = 1024
+		]]></example>
+	</option>
+
+	<option name="limit_max_share" type="int" default="0">
+		<check min="0" />
+		<short>Limit maximum share size in megabytes</short>
+		<description><![CDATA[
+		Maximum share limit in megabytes (MiB). Users sharing more than this will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+
+	<option name="limit_min_slots" type="int" default="0">
+		<check min="0" />
+		<short>Limit minimum number of upload slots open per user</short>
+		<description><![CDATA[
+		Minimum number of upload slots required. Users with less than this will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="limit_max_slots" type="int" default="0">
+		<check min="0" />
+		<short>Limit minimum number of upload slots open per user</short>
+		<description><![CDATA[
+		Maximum number of upload slots allowed. Users with more than this will not be allowed to enter the hub.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="flood_ctl_interval" type="int" default="0">
+		<check min="1" max="60" />
+		<short>Time interval in seconds for flood control check.</short>
+		<description><![CDATA[
+			This is the time interval that will be used for all flood control calculations.
+			If this is 0 then all flood control is disabled.
+		]]></description>
+		<example><![CDATA[
+			To limit maximum chat messages to 5 messages on 10 seconds: <br />
+			flood_ctl_interval = 10 <br />
+			flood_ctl_chat = 5<br />
+		]]></example>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="flood_ctl_chat" type="int" default="0">
+		<short>Max chat messages allowed in time interval</short>
+		<description><![CDATA[
+			If this is 0 then no flood control is disabled for chat messages.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="flood_ctl_connect" type="int" default="0">
+		<short>Max connections requests allowed in time interval</short>
+		<description><![CDATA[
+			If this is 0 then no flood control is disabled for connection requests.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="flood_ctl_search" type="int" default="0">
+		<short>Max search requests allowed in time interval</short>
+		<description><![CDATA[
+			If this is 0 then no flood control is disabled for search requests.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+
+	<option name="flood_ctl_update" type="int" default="0">
+		<short>Max updates allowed in time interval</short>
+		<description><![CDATA[
+			If this is 0 then no flood control is disabled for info updates (INF messages).
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="flood_ctl_extras" type="int" default="0">
+		<short>Max extra messages allowed in time interval</short>
+		<description><![CDATA[
+			Extra messages are messages that don't fit into the category of chat, search, update or connect.
+		]]></description>
+		<syntax>0 = off</syntax>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="tls_enable" type="boolean" default="0">
+		<short>Enable SSL/TLS support</short>
+		<description><![CDATA[
+			Enables/disables TLS/SSL support. tls_certificate and tls_private_key must be set if this is enabled.
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="tls_require" type="boolean" default="0">
+		<short>If SSL/TLS enabled, should it be required (default: 0)</short>
+		<description><![CDATA[
+			If TLS/SSL support is enabled it can either be optional or mandatory.
+			If this option is disabled then SSL/TLS is not required to enter the hub, however it is possible to enter either with or without.
+			This option has no effect unless tls_enable is enabled.
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="tls_certificate" type="file" default="">
+		<short>Certificate file</short>
+		<description><![CDATA[
+			Path to a TLS/SSL certificate (PEM format).
+		]]></description>
+		<since>0.3.0</since>
+	</option>
+
+	<option name="tls_private_key" type="file" default="">
+		<short>Private key file</short>
+		<description><![CDATA[
+			Path to a TLS/SSL private key (PEM format).
+		]]></description>
+		<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[
+			This is an access control list (acl) file.
+			In this file all registered users, bans, etc should be stored.
+			If the file is missing, or empty no registered users, or ban records are used.
+		]]></description>
+		<since>0.1.3</since>
+		<example><![CDATA[
+			<p>
+			Unix users: <br />
+				file_acl = "/etc/uhub/users.conf"
+			</p>
+			<p>
+			Windows users: <br />
+				file_acl = "c:\uhub\users.conf"
+			</p>
+		]]></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[
+			Plugin configuration file.
+		]]></description>
+		<since>0.3.3</since>
+		<example><![CDATA[
+			<p>
+				file_plugins = "/etc/uhub/plugins.conf"
+			</p>
+		]]></example>
+	</option>
+
+	<option name="msg_hub_full" type="message" default="Hub is full" >
+		<description><![CDATA[This will be sent if the hub is full]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_hub_disabled" type="message" default="Hub is disabled" >
+		<description><![CDATA[This will be sent if the hub is disabled (hub_enable = off)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_hub_registered_users_only" type="message" default="Hub is for registered users only" >
+		<description><![CDATA[This will be sent if the hub is configured to only accept registered users (registered_users_only = yes)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_missing" type="message" default="No nickname given">
+		<description><![CDATA[This is an error message that will be sent to clients that do not provide a nickname.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_multiple" type="message" default="Multiple nicknames given">
+		<description><![CDATA[This is an error message that will be sent to clients that provide multiple nicknames.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_invalid" type="message" default="Nickname is invalid">
+		<description><![CDATA[This is an error message that will be sent to clients that provides an invalid nickname.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_long" type="message" default="Nickname too long">
+		<description><![CDATA[This is an error message that will be sent to clients that provides a too long nickname.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_short" type="message" default="Nickname too short">
+		<description><![CDATA[This is an error message that will be sent to clients that provides a too short nickname.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_spaces" type="message" default="Nickname cannot start with spaces">
+		<description><![CDATA[This is an error message that will be sent to clients that provides a nickname that starts with a space.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_bad_chars" type="message" default="Nickname contains invalid characters">
+		<description><![CDATA[This is an error message that will be sent to clients that provides invalid characters in the nickname.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_not_utf8" type="message" default="Nickname is not valid UTF-8">
+		<description><![CDATA[This is an error message that will be sent to clients that provides a nick name that is not valid UTF-8 encoded.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_taken" type="message" default="Nickname is already in use">
+		<description><![CDATA[This message will be sent to clients if their provided nickname is alredy in use on the hub.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_nick_restricted" type="message" default="Nickname cannot be used on this hub">
+		<description><![CDATA[This message will be sent to clients if they provide a restricted nickname. Restricted names can be configured in the acl.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_cid_invalid" type="message" default="CID is not valid">
+		<description><![CDATA[This is an error message that will be sent to clients that provides an invalid client ID (CID)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_cid_missing" type="message" default="CID is not specified">
+		<description><![CDATA[This is an error message that will be sent to clients that does not provide a client ID (CID)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_cid_taken" type="message" default="CID is taken">
+		<description><![CDATA[This is an error message that will be sent to clients that provides a client ID (CID) already in use on the hub.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_pid_missing" type="message" default="PID is not specified">
+		<description><![CDATA[This is an error message that will be sent to clients that does not provide a private ID (PID)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_inf_error_pid_invalid" type="message" default="PID is invalid">
+		<description><![CDATA[This is an error message that will be sent to clients that provides an invalid private ID (PID)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_ban_permanently" type="message" default="Banned permanently">
+		<description><![CDATA[This message is sent to users if they are banned (see acl)]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_ban_temporarily"  type="message" default="Banned temporarily">
+		<description><![CDATA[This message is sent to users if they are banned temporarily]]></description>
+		<since>0.2.0</since>
+	</option>
+
+
+	<option name="msg_auth_invalid_password" type="message" default="Password is wrong">
+		<description><![CDATA[This message is sent to users if they provide a wrong password.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_auth_user_not_found" type="message" default="User not found in password database">
+		<description><![CDATA[This message is used if a user cannot be found in the password database.]]></description>
+		<since>0.2.0</since> <!-- FIXME? -->
+	</option>
+
+	<option name="msg_error_no_memory" type="message" default="No memory">
+		<description><![CDATA[]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_share_size_low" type="message" default="User is not sharing enough">
+		<description><![CDATA[This message is sent to users if they are not sharing enough.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_share_size_high" type="message" default="User is sharing too much">
+		<description><![CDATA[This message is sent to users if they are sharing too much.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_slots_low" type="message" default="User have too few upload slots.">
+		<description><![CDATA[This message is sent to users if they do not have enough upload slots.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_slots_high" type="message" default="User have too many upload slots.">
+		<description><![CDATA[This message is sent to users if they have too many upload slots.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_hub_limit_low" type="message" default="User is on too few hubs.">
+		<description><![CDATA[This message is sent to users if they are on too few other hubs.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_hub_limit_high" type="message" default="User is on too many hubs.">
+		<description><![CDATA[This message is sent to users if they are on too many other hubs.]]></description>
+		<since>0.2.0</since>
+	</option>
+
+	<option name="msg_user_flood_chat" type="message" default="Chat flood detected, messages are dropped.">
+		<description><![CDATA[This message is sent once to users who are flooding the chat.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_user_flood_connect" type="message" default="Connect flood detected, connection refused.">
+		<description><![CDATA[This message is sent once to users who are sending too many connect requests too fast.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_user_flood_search" type="message" default="Search flood detected, search is stopped.">
+		<description><![CDATA[This message is sent once to users who are sending too many search requests too fast.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_user_flood_update" type="message" default="Update flood detected.">
+		<description><![CDATA[This message is sent once to users who are sending too many updates too fast.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_user_flood_extras" type="message" default="Flood detected.">
+		<description><![CDATA[This message is sent once to users who are sending too many messages to the hub that neither are chat, searhes, updates nor connection requests..]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_proto_no_common_hash" type="message" default="No common hash algorithm.">
+		<description><![CDATA[This message is sent if a client connects that does support ADC/1.0 but not a hash algorithm that the hub supports.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+	<option name="msg_proto_obsolete_adc0" type="message" default="Client is using an obsolete ADC protocol version.">
+		<description><![CDATA[This message is sent if a client connects that does not support ADC/1.0, but rather the obsolete ADC/0.1 version.]]></description>
+		<since>0.3.1</since>
+	</option>
+
+</config>

src/core/gen_config.h

@@ -0,0 +1,88 @@
+/* THIS FILE IS AUTOGENERATED - DO NOT CHANGE IT! */
+
+struct hub_config
+{
+	int   hub_enabled;                     /*<<< Is server enabled (default: 1) */
+	int   server_port;                     /*<<< Server port to bind to (default: 1511) */
+	char* server_bind_addr;                /*<<< Server bind address (default: any) */
+	int   server_listen_backlog;           /*<<< Server listen backlog (default: 50) */
+	char* server_alt_ports;                /*<<< Comma separated list of alternative ports to listen to (default: ) */
+	int   show_banner;                     /*<<< Show banner on connect (default: 1) */
+	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   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) */
+	char* redirect_addr;                   /*<<< A common hub redirect address. (default: ) */
+	int   max_recv_buffer;                 /*<<< Max read buffer before parse, per user (default: 4096) */
+	int   max_send_buffer;                 /*<<< Max send buffer before disconnect, per user (default: 131072) */
+	int   max_send_buffer_soft;            /*<<< Max send buffer before message drops, per user (default: 98304) */
+	int   low_bandwidth_mode;              /*<<< Enable bandwidth saving measures (default: 0) */
+	int   max_chat_history;                /*<<< Number of chat messages kept in history (default: 20) */
+	int   max_logout_log;                  /*<<< Number of log entries for people leaving the hub (default: 20) */
+	int   limit_max_hubs_user;             /*<<< Max concurrent hubs as a guest user (default: 10) */
+	int   limit_max_hubs_reg;              /*<<< Max concurrent hubs as a registered user (default: 10) */
+	int   limit_max_hubs_op;               /*<<< Max concurrent hubs as a operator (or admin) (default: 10) */
+	int   limit_max_hubs;                  /*<<< Max total hub connections allowed, user/reg/op combined. (default: 25) */
+	int   limit_min_hubs_user;             /*<<< Minimum concurrent hubs as a guest user (default: 0) */
+	int   limit_min_hubs_reg;              /*<<< Minimum concurrent hubs as a registered user (default: 0) */
+	int   limit_min_hubs_op;               /*<<< Minimum concurrent hubs as a operator (or admin) (default: 0) */
+	int   limit_min_share;                 /*<<< Limit minimum share size in megabytes (default: 0) */
+	int   limit_max_share;                 /*<<< Limit maximum share size in megabytes (default: 0) */
+	int   limit_min_slots;                 /*<<< Limit minimum number of upload slots open per user (default: 0) */
+	int   limit_max_slots;                 /*<<< Limit minimum number of upload slots open per user (default: 0) */
+	int   flood_ctl_interval;              /*<<< Time interval in seconds for flood control check. (default: 0) */
+	int   flood_ctl_chat;                  /*<<< Max chat messages allowed in time interval (default: 0) */
+	int   flood_ctl_connect;               /*<<< Max connections requests allowed in time interval (default: 0) */
+	int   flood_ctl_search;                /*<<< Max search requests allowed in time interval (default: 0) */
+	int   flood_ctl_update;                /*<<< Max updates allowed in time interval (default: 0) */
+	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_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" */
+	char* msg_hub_registered_users_only;   /*<<< "Hub is for registered users only" */
+	char* msg_inf_error_nick_missing;      /*<<< "No nickname given" */
+	char* msg_inf_error_nick_multiple;     /*<<< "Multiple nicknames given" */
+	char* msg_inf_error_nick_invalid;      /*<<< "Nickname is invalid" */
+	char* msg_inf_error_nick_long;         /*<<< "Nickname too long" */
+	char* msg_inf_error_nick_short;        /*<<< "Nickname too short" */
+	char* msg_inf_error_nick_spaces;       /*<<< "Nickname cannot start with spaces" */
+	char* msg_inf_error_nick_bad_chars;    /*<<< "Nickname contains invalid characters" */
+	char* msg_inf_error_nick_not_utf8;     /*<<< "Nickname is not valid UTF-8" */
+	char* msg_inf_error_nick_taken;        /*<<< "Nickname is already in use" */
+	char* msg_inf_error_nick_restricted;   /*<<< "Nickname cannot be used on this hub" */
+	char* msg_inf_error_cid_invalid;       /*<<< "CID is not valid" */
+	char* msg_inf_error_cid_missing;       /*<<< "CID is not specified" */
+	char* msg_inf_error_cid_taken;         /*<<< "CID is taken" */
+	char* msg_inf_error_pid_missing;       /*<<< "PID is not specified" */
+	char* msg_inf_error_pid_invalid;       /*<<< "PID is invalid" */
+	char* msg_ban_permanently;             /*<<< "Banned permanently" */
+	char* msg_ban_temporarily;             /*<<< "Banned temporarily" */
+	char* msg_auth_invalid_password;       /*<<< "Password is wrong" */
+	char* msg_auth_user_not_found;         /*<<< "User not found in password database" */
+	char* msg_error_no_memory;             /*<<< "No memory" */
+	char* msg_user_share_size_low;         /*<<< "User is not sharing enough" */
+	char* msg_user_share_size_high;        /*<<< "User is sharing too much" */
+	char* msg_user_slots_low;              /*<<< "User have too few upload slots." */
+	char* msg_user_slots_high;             /*<<< "User have too many upload slots." */
+	char* msg_user_hub_limit_low;          /*<<< "User is on too few hubs." */
+	char* msg_user_hub_limit_high;         /*<<< "User is on too many hubs." */
+	char* msg_user_flood_chat;             /*<<< "Chat flood detected, messages are dropped." */
+	char* msg_user_flood_connect;          /*<<< "Connect flood detected, connection refused." */
+	char* msg_user_flood_search;           /*<<< "Search flood detected, search is stopped." */
+	char* msg_user_flood_update;           /*<<< "Update flood detected." */
+	char* msg_user_flood_extras;           /*<<< "Flood detected." */
+	char* msg_proto_no_common_hash;        /*<<< "No common hash algorithm." */
+	char* msg_proto_obsolete_adc0;         /*<<< "Client is using an obsolete ADC protocol version." */
+};
+

src/core/hub.h

@@ -53,6 +53,10 @@ enum status_message
 	status_msg_user_hub_limit_low        = -44, /* Use is on too few hubs. */
 	status_msg_user_hub_limit_high       = -45, /* Use is on too many hubs. */
 
+	status_msg_proto_no_common_hash      = -50, /* No common hash algorithms */
+	status_msg_proto_obsolete_adc0       = -51, /* Client is using an obsolete protocol version */
+	
+
 };
 
 
@@ -91,10 +95,7 @@ struct hub_logout_info
 struct hub_info
 {
 	struct net_connection* server;
-#ifdef USE_LIBEVENT
+	struct linked_list* server_alt_ports;
-	struct event ev_accept;
-	struct event ev_timer;
-#endif
 	struct hub_stats stats;
 	struct event_queue* queue;
 	struct hub_config* config;
@@ -103,6 +104,7 @@ struct hub_info
 	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;
@@ -112,6 +114,12 @@ struct hub_info
 	struct linked_list* chat_history;    /* Chat history */
 	struct linked_list* logout_info;     /* Log of people logging out. */
 
+	struct command_base* commands;       /* Hub command handler */
+
+#ifdef PLUGIN_SUPPORT
+	struct uhub_plugins* plugins;
+#endif
+
 #ifdef SSL_SUPPORT
 	SSL_METHOD* ssl_method;
 	SSL_CTX* ssl_ctx;
@@ -203,8 +211,15 @@ 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 void hub_send_motd(struct hub_info* hub, struct hub_user* u);
+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.
@@ -218,6 +233,11 @@ extern void hub_send_password_challenge(struct hub_info* hub, struct hub_user* u
  */
 extern void hub_send_status(struct hub_info*, struct hub_user* user, enum status_message msg, enum msg_status_level level);
 
+/**
+ * Warn user about flooding.
+ */
+extern void hub_send_flood_warning(struct hub_info*, struct hub_user* user, const char* message);
+
 /**
  * Allocates memory, initializes the hub based on the configuration,
  * and returns a hub handle.

src/core/hubevent.c

@@ -18,10 +18,12 @@
  */
 
 #include "uhub.h"
+#include "plugin_api/handle.h"
 
+#ifndef PLUGIN_SUPPORT
 static void log_user_login(struct hub_user* u)
 {
-	const char* cred = get_user_credential_string(u->credentials);
+	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);
 }
@@ -33,6 +35,13 @@ static void log_user_login_error(struct hub_user* u, enum status_message 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);
@@ -44,7 +53,7 @@ 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 */
 void on_login_success(struct hub_info* hub, struct hub_user* u)
@@ -57,8 +66,12 @@ 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))
@@ -68,29 +81,58 @@ void on_login_success(struct hub_info* hub, struct hub_user* u)
 	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);
+
 	/* reset timeout */
 	net_con_clear_timeout(u->connection);
 }
 
 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);
+}
+
 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
 	}
 }
 
 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/hubevent.h

@@ -29,6 +29,7 @@ extern void on_login_success(struct hub_info* hub, struct hub_user* u);
  * This event is triggered whenever a user failed to log in to the hub.
  */
 extern void on_login_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg);
+extern void on_update_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg);
 
 /**
  * This event is triggered whenever a previously logged in user leaves the hub.

src/core/hubio.c

@@ -126,6 +126,7 @@ void hub_sendq_add(struct hub_sendq* q, struct adc_message* msg_)
 #ifdef DEBUG_SENDQ
 	debug_msg("hub_sendq_add", msg);
 #endif
+	assert(msg->cache && *msg->cache);
 	list_append(q->queue, msg);
 	q->size += msg->length;
 }
@@ -143,10 +144,11 @@ void hub_sendq_remove(struct hub_sendq* q, struct adc_message* msg)
 
 int hub_sendq_send(struct hub_sendq* q, struct hub_user* user)
 {
+	int ret;
 	struct adc_message* msg = list_get_first(q->queue);
 	if (!msg) return 0;
-
+	assert(msg->cache && *msg->cache);
-	int ret = net_con_send(user->connection, msg->cache + q->offset, msg->length - q->offset);
+	ret = net_con_send(user->connection, msg->cache + q->offset, msg->length - q->offset);
 
 	if (ret > 0)
 	{

src/core/inf.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -187,7 +187,7 @@ static int check_required_login_flags(struct hub_info* hub, struct hub_user* use
  * remove any wrong address, and replace it with the correct one
  * as seen by the hub.
  */
-int check_network(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_network(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
 {
 	const char* address = user_get_address(user);
 	
@@ -223,7 +223,7 @@ int check_network(struct hub_info* hub, struct hub_user* user, struct adc_messag
 	return 0;
 }
 
-void strip_network(struct hub_user* user, struct adc_message* cmd)
+static void strip_network(struct hub_user* user, struct adc_message* cmd)
 {
 	adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR);
 	adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_UDP_PORT);
@@ -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);
 		}
 	}
@@ -429,7 +429,7 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_SHARED_FILES);
 	if (arg)
 	{
-		ssize_t shared_files = atoll(arg);
+		int shared_files = atoi(arg);
 		if (shared_files < 0)
 			shared_files = 0;
 
@@ -446,7 +446,7 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_COUNT_HUB_NORMAL);
 	if (arg)
 	{
-		ssize_t num = atoll(arg);
+		int num = atoi(arg);
 		if (num < 0) num = 0;
 		user->limits.hub_count_user = num;
 		hub_free(arg);
@@ -456,7 +456,7 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_COUNT_HUB_REGISTER);
 	if (arg)
 	{
-		ssize_t num = atoll(arg);
+		int num = atoi(arg);
 		if (num < 0) num = 0;
 		user->limits.hub_count_registered = num;
 		hub_free(arg);
@@ -466,7 +466,7 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_COUNT_HUB_OPERATOR);
 	if (arg)
 	{
-		ssize_t num = atoll(arg);
+		int num = atoi(arg);
 		if (num < 0) num = 0;
 		user->limits.hub_count_operator = num;
 		hub_free(arg);
@@ -476,7 +476,7 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_UPLOAD_SLOTS);
 	if (arg)
 	{
-		ssize_t num = atoll(arg);
+		int num = atoi(arg);
 		if (num < 0) num = 0;
 		user->limits.upload_slots = num;
 		hub_free(arg);
@@ -526,7 +526,6 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 	return 0;
 }
 
-
 /*
  * Set the expected credentials, and returns 1 if authentication is needed,
  * or 0 if not.
@@ -536,48 +535,48 @@ static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_
 static int set_credentials(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
 {
 	int ret = 0;
-	struct hub_user_access_info* info = acl_get_access_info(hub->acl, user->id.nick);
+	struct auth_info* info = acl_get_access_info(hub, user->id.nick);
 	
 	if (info)
 	{
-		user->credentials = info->status;
+		user->credentials = info->credentials;
 		ret = 1;
 	}
 	else
 	{
-		user->credentials = cred_guest;
+		user->credentials = auth_cred_guest;
 	}
 	
 	switch (user->credentials)
 	{
-		case cred_none:
+		case auth_cred_none:
 			break;
 			
-		case cred_bot:
+		case auth_cred_bot:
 			adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_BOT);
 			break;
 			
-		case cred_guest:
+		case auth_cred_guest:
 			/* Nothing to be added to the info message */
 			break;
 
-		case cred_user:
+		case auth_cred_user:
 			adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_REGISTERED_USER);
 			break;
 
-		case cred_operator:
+		case auth_cred_operator:
 			adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_OPERATOR);
 			break;
 			
-		case cred_super:
+		case auth_cred_super:
 			adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_SUPER_USER);
 			break;
 
-		case cred_admin:
+		case auth_cred_admin:
 			adc_msg_add_argument(cmd, ADC_INF_FLAG_CLIENT_TYPE ADC_CLIENT_TYPE_ADMIN);
 			break;
 
-		case cred_link:
+		case auth_cred_link:
 			break;
  	}
 	
@@ -592,7 +591,7 @@ static int check_is_hub_full(struct hub_info* hub, struct hub_user* user)
 	 * If hub is full, don't let users in, but we still want to allow
 	 * operators and admins to enter the hub.
 	 */
-	if (hub->config->max_users && hub->users->count >= hub->config->max_users && !user_is_protected(user))
+	if (hub->config->max_users && hub->users->count >= (size_t) hub->config->max_users && !user_is_protected(user))
 	{
 		return 1;
 	}
@@ -648,7 +647,7 @@ static int hub_handle_info_low_bandwidth(struct hub_info* hub, struct hub_user*
 			return ret; \
 	} while(0)
 
-int hub_perform_login_checks(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int hub_perform_login_checks(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
 {
 	/* Make syntax checks.  */
 	INF_CHECK(check_required_login_flags, hub, user, cmd);
@@ -675,7 +674,6 @@ int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct ad
 	/* Private ID must never be broadcasted - drop it! */
 	adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_PRIVATE_ID);
 
-	
 	code = set_credentials(hub, user, cmd);
 
 	/* Note: this must be done *after* set_credentials. */
@@ -715,6 +713,7 @@ int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct ad
  */
 int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct adc_message* cmd_unmodified)
 {
+	int ret;
 	struct adc_message* cmd = adc_msg_copy(cmd_unmodified);
 	if (!cmd) return -1; /* OOM */
 
@@ -737,7 +736,7 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 			return 0;
 		}
 
-		int ret = hub_handle_info_login(hub, user, cmd);
+		ret = hub_handle_info_login(hub, user, cmd);
 		if (ret < 0)
 		{
 			on_login_failure(hub, user, ret);
@@ -775,8 +774,14 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 				adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_NICK);
 		}
 
-		/* FIXME - What if limits are not met ? */
+		ret = check_limits(hub, user, cmd);
-		check_limits(hub, user, cmd);
+		if (ret < 0)
+		{
+			on_update_failure(hub, user, ret);
+			adc_msg_free(cmd);
+			return -1;
+		}
+
 		strip_network(user, cmd);
 		hub_handle_info_low_bandwidth(hub, user, cmd);
 
@@ -792,3 +797,5 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 
 	return 0;
 }
+
+

src/core/inf.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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

src/core/main.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
@@ -19,7 +19,6 @@
 
 #include "uhub.h"
 
-
 static int arg_verbose = 5;
 static int arg_fork    = 0;
 static int arg_check_config = 0;
@@ -33,13 +32,13 @@ static const char* arg_pid = 0;
 static int arg_log_syslog = 0;
 
 
-#if !defined(WIN32) && defined(USE_LIBEVENT)
+#if !defined(WIN32)
-void hub_handle_signal(int fd, short events, void* arg)
+extern struct hub_info* g_hub;
+void hub_handle_signal(int sig)
 {
-	struct hub_info* hub = (struct hub_info*) arg;
+	struct hub_info* hub = g_hub;
-	int signal = fd;
 
-	switch (signal)
+	switch (sig)
 	{
 		case SIGINT:
 			LOG_INFO("Interrupted. Shutting down...");
@@ -65,7 +64,6 @@ void hub_handle_signal(int fd, short events, void* arg)
 	}
 }
 
-static struct event signal_events[10];
 static int signals[] =
 {
 	SIGINT,  /* Interrupt the application */
@@ -77,11 +75,18 @@ static int signals[] =
 
 void setup_signal_handlers(struct hub_info* hub)
 {
-	int i = 0;
+	sigset_t sig_set;
+	struct sigaction act;
+	int i;
+
+	sigemptyset(&sig_set);
+	act.sa_mask = sig_set;
+	act.sa_flags = SA_ONSTACK | SA_RESTART;
+	act.sa_handler = hub_handle_signal;
+	
 	for (i = 0; signals[i]; i++)
 	{
-		signal_set(&signal_events[i], signals[i], hub_handle_signal, hub);
+		if (sigaction(signals[i], &act, 0) != 0)
-		if (signal_add(&signal_events[i], NULL))
 		{
 			LOG_ERROR("Error setting signal handler %d", signals[i]);
 		}
@@ -90,14 +95,8 @@ void setup_signal_handlers(struct hub_info* hub)
 
 void shutdown_signal_handlers(struct hub_info* hub)
 {
-	int i = 0;
-	for (i = 0; signals[i]; i++)
-	{
-		signal_del(&signal_events[i]);
-	}
 }
-
+#endif /* !WIN32 */
-#endif /* !WIN32 && USE_LIBEVENT*/
 
 
 int main_loop()
@@ -115,6 +114,11 @@ int main_loop()
 		{
 			LOG_INFO("Reloading configuration files...");
 			LOG_DEBUG("Hub status: %d", (int) hub->status);
+
+			/* Reinitialize logs */
+			hub_log_shutdown();
+			hub_log_initialize(arg_log, arg_log_syslog);
+			hub_set_log_verbosity(arg_verbose);
 		}
 	
 		if (read_config(arg_config, &configuration, !arg_have_config) == -1)
@@ -133,7 +137,7 @@ int main_loop()
 			hub = hub_start_service(&configuration);
 			if (!hub)
 				return -1;
-#if !defined(WIN32) && defined(USE_LIBEVENT)
+#if !defined(WIN32)
 			setup_signal_handlers(hub);
 #endif
 		}
@@ -148,7 +152,7 @@ int main_loop()
 
 	} while (hub->status == hub_status_restart);
 
-#if !defined(WIN32) && defined(USE_LIBEVENT)
+#if !defined(WIN32)
 	shutdown_signal_handlers(hub);
 #endif
 	
@@ -190,8 +194,8 @@ int check_configuration(int dump)
 
 void print_version()
 {
-	fprintf(stdout, "" PRODUCT " " VERSION "\n");
+	fprintf(stdout, PRODUCT_STRING "\n");
-	fprintf(stdout, "Copyright (C) 2007-2009, Jan Vidar Krey <janvidar@extatic.org>\n"
+	fprintf(stdout, COPYRIGHT "\n"
 			"This is free software with ABSOLUTELY NO WARRANTY.\n\n");
 	exit(0);
 }

src/core/netevent.c

@@ -24,41 +24,16 @@
 /* FIXME: This should not be needed! */
 extern struct hub_info* g_hub;
 
-#ifdef DEBUG_SENDQ
-void debug_sendq_send(struct hub_user* user, int sent, int total)
-{
-	LOG_DUMP("SEND: sd=%d, %d/%d bytes\n", user->net.connection.sd, sent, total);
-	if (sent == -1)
-	{
-		int err = net_error();
-		LOG_DUMP("    errno: %d - %s\n", err, net_error_string(err));
-	}
-}
-
-void debug_sendq_recv(struct hub_user* user, int received, int max, const char* buffer)
-{
-	LOG_DUMP("RECV: %d/%d bytes\n", received, (int) max);
-	if (received == -1)
-	{
-		int err = net_error();
-		LOG_DUMP("    errno: %d - %s\n", err, net_error_string(err));
-	}
-	else if (received > 0)
-	{
-		char* data = hub_malloc_zero(received + 1);
-		memcpy(data, buffer, received);
-		LOG_DUMP("RECV: \"%s\"\n", data);
-		hub_free(data);
-	}
-}
-#endif
-
 int handle_net_read(struct hub_user* user)
 {
 	static char buf[MAX_RECV_BUF];
 	struct hub_recvq* q = user->recv_queue;
 	size_t buf_size = hub_recvq_get(q, buf, MAX_RECV_BUF);
-	ssize_t size = net_con_recv(user->connection, buf, MAX_RECV_BUF);
+	ssize_t size;
+
+	if (user_flag_get(user, flag_maxbuf))
+		buf_size = 0;
+	size = net_con_recv(user->connection, buf + buf_size, MAX_RECV_BUF - buf_size);
 
 	if (size > 0)
 		buf_size += size;
@@ -113,7 +88,7 @@ int handle_net_read(struct hub_user* user)
 
 		if (lastPos || remaining)
 		{
-			if (remaining < g_hub->config->max_recv_buffer)
+			if (remaining < (size_t) g_hub->config->max_recv_buffer)
 			{
 				hub_recvq_set(q, lastPos ? lastPos : buf, remaining);
 			}
@@ -162,26 +137,16 @@ void net_event(struct net_connection* con, int event, void *arg)
 	int flag_close = 0;
 
 #ifdef DEBUG_SENDQ
-	LOG_TRACE("net_event() : fd=%d, ev=%d, arg=%p", fd, (int) event, arg);
+	LOG_TRACE("net_event() : fd=%d, ev=%d, arg=%p", con->sd, (int) event, arg);
 #endif
 
-	if (event == NET_EVENT_SOCKERROR)
+	if (event == NET_EVENT_TIMEOUT)
-	{
-		hub_disconnect_user(g_hub, user, quit_socket_error);
-		return;
-	}
-	else if (event == NET_EVENT_CLOSED)
-	{
-		hub_disconnect_user(g_hub, user, quit_disconnected);
-		return;
-	}
-	else if (event == NET_EVENT_TIMEOUT)
 	{
 		if (user_is_connecting(user))
 		{
 			hub_disconnect_user(g_hub, user, quit_timeout);
-			return;
 		}
+		return;
 	}
 
 	if (event & NET_EVENT_READ)
@@ -210,8 +175,10 @@ void net_on_accept(struct net_connection* con, int event, void *arg)
 	struct hub_info* hub = (struct hub_info*) arg;
 	struct hub_probe* probe = 0;
 	struct ip_addr_encap ipaddr;
-	const char* addr;
 	int server_fd = net_con_get_sd(con);
+#ifdef PLUGIN_SUPPORT
+	plugin_st status;
+#endif
 
 	for (;;)
 	{
@@ -229,19 +196,18 @@ void net_on_accept(struct net_connection* con, int event, void *arg)
 			}
 		}
 
-		addr = ip_convert_to_string(&ipaddr); 
+#ifdef PLUGIN_SUPPORT
-
+		status = plugin_check_ip_early(hub, &ipaddr);
-		/* FIXME: Should have a plugin log this */
+		if (status == st_deny)
-		LOG_TRACE("Got connection from %s", addr);
-
-		/* FIXME: A plugin should perform this check: is IP banned? */
-		if (acl_is_ip_banned(hub->acl, addr))
 		{
-			LOG_INFO("Denied      [%s] (IP banned)", addr);
+			plugin_log_connection_denied(hub, &ipaddr);
 			net_close(fd);
 			continue;
 		}
 
+		plugin_log_connection_accepted(hub, &ipaddr);
+#endif
+
 		probe = probe_create(hub, fd, &ipaddr);
 		if (!probe)
 		{

src/core/plugincallback.c

@@ -0,0 +1,84 @@
+/*
+ * 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"
+
+struct plugin_callback_data
+{
+	struct linked_list* commands;
+};
+
+/*
+static struct plugin_callback_data* get_callback_data(struct plugin_handle* plugin)
+{
+	uhub_assert(plugin && plugin->handle && plugin->handle->callback_data);
+	struct plugin_callback_data* data = (struct plugin_callback_data*) plugin->handle->callback_data;
+	return 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_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);
+	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);
+	return 0;
+}
+
+
+void plugin_register_callback_functions(struct plugin_handle* handle)
+{
+	handle->hub.send_message = cbfunc_send_message;
+	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,28 @@
+/*
+ * 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;
+
+extern void plugin_register_callback_functions(struct plugin_handle* handle);
+extern void plugin_unregister_callback_functions(struct plugin_handle* handle);
+
+#endif /* HAVE_UHUB_PLUGIN_CALLBACK_H */

src/core/plugininvoke.c

@@ -0,0 +1,190 @@
+/*
+ * 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/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 INVOKE(HUB, FUNCNAME, CODE) \
+	PLUGIN_DEBUG(HUB, # FUNCNAME) \
+	if (HUB->plugins && HUB->plugins->loaded) \
+	{ \
+		struct plugin_handle* plugin = (struct plugin_handle*) list_get_first(HUB->plugins->loaded); \
+		while (plugin) \
+		{ \
+			if (plugin->funcs.FUNCNAME) \
+				CODE \
+			plugin = (struct plugin_handle*) list_get_next(HUB->plugins->loaded); \
+		} \
+	}
+
+#define PLUGIN_INVOKE_STATUS_1(HUB, FUNCNAME, ARG1) \
+	do { \
+		plugin_st status = st_default; \
+		INVOKE(HUB, FUNCNAME, { \
+			status = plugin->funcs.FUNCNAME(plugin, ARG1); \
+			if (status != st_default) \
+				break; \
+		}); \
+		return status; \
+	} while(0)
+
+#define PLUGIN_INVOKE_STATUS_2(HUB, FUNCNAME, ARG1, ARG2) \
+	do { \
+		plugin_st status = st_default; \
+		INVOKE(HUB, FUNCNAME, { \
+			status = plugin->funcs.FUNCNAME(plugin, ARG1, ARG2); \
+			if (status != st_default) \
+				break; \
+		}); \
+		return status; \
+	} while(0)
+
+#define PLUGIN_INVOKE_STATUS_3(HUB, FUNCNAME, ARG1, ARG2, ARG3) \
+	do { \
+		plugin_st status = st_default; \
+		INVOKE(HUB, FUNCNAME, { \
+			status = plugin->funcs.FUNCNAME(plugin, ARG1, ARG2, ARG3); \
+			if (status != st_default) \
+				break; \
+		}); \
+		return status; \
+	} while(0)
+
+#define PLUGIN_INVOKE_1(HUB, FUNCNAME, ARG1) INVOKE(HUB, FUNCNAME, { plugin->funcs.FUNCNAME(plugin, ARG1); })
+#define PLUGIN_INVOKE_2(HUB, FUNCNAME, ARG1, ARG2) INVOKE(HUB, FUNCNAME, { plugin->funcs.FUNCNAME(plugin, ARG1, ARG2); })
+#define PLUGIN_INVOKE_3(HUB, FUNCNAME, ARG1, ARG2, ARG3) INVOKE(HUB, FUNCNAME, { plugin->funcs.FUNCNAME(plugin, ARG1, ARG2, ARG3); })
+
+
+static struct plugin_user* convert_user_type(struct hub_user* user)
+{
+	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)
+{
+	PLUGIN_INVOKE_STATUS_1(hub, login_check_ip_early, addr);
+}
+
+plugin_st plugin_check_ip_late(struct hub_info* hub, struct ip_addr_encap* addr)
+{
+	PLUGIN_INVOKE_STATUS_1(hub, login_check_ip_late, addr);
+}
+
+void plugin_log_connection_accepted(struct hub_info* hub, struct ip_addr_encap* ipaddr)
+{
+	PLUGIN_INVOKE_1(hub, on_connection_accepted, ipaddr);
+}
+
+void plugin_log_connection_denied(struct hub_info* hub, struct ip_addr_encap* ipaddr)
+{
+	PLUGIN_INVOKE_1(hub, on_connection_refused, ipaddr);
+}
+
+void plugin_log_user_login_success(struct hub_info* hub, struct hub_user* who)
+{
+	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(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(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(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(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(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(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 = 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(from);
+	PLUGIN_INVOKE_STATUS_2(hub, on_search, user, data);
+}
+
+plugin_st plugin_handle_connect(struct hub_info* hub, struct hub_user* from, struct hub_user* to)
+{
+	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 = 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)
+{
+	PLUGIN_INVOKE_STATUS_2(hub, auth_get_user, nickname, info);
+}
+
+plugin_st plugin_auth_register_user(struct hub_info* hub, struct auth_info* info)
+{
+	PLUGIN_INVOKE_STATUS_1(hub, auth_register_user, info);
+}
+
+plugin_st plugin_auth_update_user(struct hub_info* hub, struct auth_info* info)
+{
+	PLUGIN_INVOKE_STATUS_1(hub, auth_update_user, info);
+}
+
+plugin_st plugin_auth_delete_user(struct hub_info* hub, struct auth_info* info)
+{
+	PLUGIN_INVOKE_STATUS_1(hub, auth_delete_user, info);
+}

src/core/plugininvoke.h

@@ -0,0 +1,69 @@
+/*
+ * 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_INVOKE_H
+#define HAVE_UHUB_PLUGIN_INVOKE_H
+
+#include "uhub.h"
+#include "plugin_api/handle.h"
+
+#ifdef PLUGIN_SUPPORT
+
+struct hub_info;
+struct ip_addr_encap;
+
+/* All log related functions */
+void plugin_log_connection_accepted(struct hub_info* hub, struct ip_addr_encap* addr);
+void plugin_log_connection_denied(struct hub_info* hub, struct ip_addr_encap* addr);
+void plugin_log_user_login_success(struct hub_info* hub, struct hub_user* user);
+void plugin_log_user_login_error(struct hub_info* hub, struct hub_user* user, const char* reason);
+void plugin_log_user_logout(struct hub_info* hub, struct hub_user* user, const char* reason);
+void plugin_log_user_nick_change(struct hub_info* hub, struct hub_user* user, const char* new_nick);
+void plugin_log_user_update_error(struct hub_info* hub, struct hub_user* user, const char* reason);
+void plugin_log_chat_message(struct hub_info* hub, struct hub_user* from, const char* message, int flags);
+
+/* IP ban related */
+plugin_st plugin_check_ip_early(struct hub_info* hub, struct ip_addr_encap* addr);
+plugin_st plugin_check_ip_late(struct hub_info* hub, struct ip_addr_encap* addr);
+
+/* Nickname allow/deny handling */
+plugin_st plugin_check_nickname_valid(struct hub_info* hub, const char* nick);
+plugin_st plugin_check_nickname_reserved(struct hub_info* hub, const char* nick);
+
+/* Handle chat messages */
+plugin_st plugin_handle_chat_message(struct hub_info* hub, struct hub_user* from, const char* message, int flags);
+plugin_st plugin_handle_private_message(struct hub_info* hub, struct hub_user* from, struct hub_user* to, const char* message, int flags);
+
+/* Handle searches */
+plugin_st plugin_handle_search(struct hub_info* hub, struct hub_user* user, const char* data);
+
+/* Handle p2p connections */
+plugin_st plugin_handle_connect(struct hub_info* hub, struct hub_user* from, struct hub_user* to);
+plugin_st plugin_handle_revconnect(struct hub_info* hub, struct hub_user* from, struct hub_user* to);
+
+/* Authentication related */
+plugin_st plugin_auth_get_user(struct hub_info* hub, const char* nickname, struct auth_info* info);
+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

@@ -0,0 +1,235 @@
+/*
+ * 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"
+
+#ifdef PLUGIN_SUPPORT
+#include "plugin_api/handle.h"
+
+struct plugin_hub_internals
+{
+	struct hub_info* hub;
+	plugin_unregister_f unregister;
+};
+
+static struct plugin_hub_internals* get_internals(struct plugin_handle* handle)
+{
+	assert(handle && handle->handle && handle->handle->internals);
+	struct plugin_hub_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));
+	if (!plugin)
+	{
+		return 0;
+	}
+
+	plugin->handle = dlopen(filename, RTLD_LAZY);
+
+	if (!plugin->handle)
+	{
+		LOG_ERROR("Unable to open plugin %s: %s", filename, dlerror());
+		hub_free(plugin);
+		return 0;
+	}
+
+	plugin->internals = hub_malloc_zero(sizeof(struct plugin_hub_internals));
+
+	return plugin;
+#else
+	return 0;
+#endif
+}
+
+void plugin_close(struct uhub_plugin* plugin)
+{
+	hub_free(plugin->internals);
+#ifdef HAVE_DLOPEN
+	dlclose(plugin->handle);
+	hub_free(plugin);
+#endif
+}
+
+void* plugin_lookup_symbol(struct uhub_plugin* plugin, const char* symbol)
+{
+#ifdef HAVE_DLOPEN
+	void* addr = dlsym(plugin->handle, symbol);
+	return addr;
+#else
+	return 0;
+#endif
+}
+
+
+
+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 uhub_plugin* plugin = plugin_open(filename);
+	struct plugin_hub_internals* internals;
+
+	if (!plugin)
+		return NULL;
+
+	if (!handle)
+	{
+		plugin_close(plugin);
+		return NULL;
+	}
+
+	handle->handle = plugin;
+	register_f = plugin_lookup_symbol(plugin, "plugin_register");
+	unregister_f = plugin_lookup_symbol(plugin, "plugin_unregister");
+
+	plugin_register_callback_functions(handle);
+
+	internals = (struct plugin_hub_internals*) plugin->internals;
+
+	if (register_f && unregister_f)
+	{
+		ret = register_f(handle, config);
+		if (ret == 0)
+		{
+			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);
+
+				// Set hub internals
+				internals->unregister = unregister_f;
+				internals->hub = hub;
+
+				return handle;
+			}
+			else
+			{
+				LOG_ERROR("Unable to load plugin: %s - API version mistmatch", filename);
+			}
+		}
+		else
+		{
+			LOG_ERROR("Unable to load plugin: %s - Failed to initialize: %s", filename, handle->error_msg);
+		}
+	}
+
+	plugin_close(plugin);
+	hub_free(handle);
+	return NULL;
+}
+
+void plugin_unload(struct plugin_handle* plugin)
+{
+	struct plugin_hub_internals* internals = get_internals(plugin);
+	plugin_unregister_callback_functions(plugin);
+	internals->unregister(plugin);
+	plugin_close(plugin->handle);
+}
+
+static int plugin_parse_line(char* line, int line_count, void* ptr_data)
+{
+	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)
+	{
+		cfg_tokens_free(tokens);
+		return 0;
+	}
+
+	if (cfg_token_count(tokens) < 2)
+	{
+		cfg_tokens_free(tokens);
+		return -1;
+	}
+
+	directive = cfg_token_get_first(tokens);
+	soname    = cfg_token_get_next(tokens);
+	params    = cfg_token_get_next(tokens);
+
+	if (strcmp(directive, "plugin") == 0 && soname && *soname)
+	{
+		if (!params)
+			params = "";
+
+		LOG_TRACE("Load plugin: \"%s\", params=\"%s\"", soname, params);
+		plugin = plugin_load(soname, params, hub);
+		if (plugin)
+		{
+			list_append(handle->loaded, plugin);
+			cfg_tokens_free(tokens);
+			return 0;
+		}
+	}
+
+	cfg_tokens_free(tokens);
+	return -1;
+}
+
+int plugin_initialize(struct hub_config* config, struct hub_info* hub)
+{
+	int ret;
+
+	hub->plugins->loaded = list_create();
+	if (!hub->plugins->loaded)
+		return -1;
+
+	if (config)
+	{
+		if (!*config->file_plugins)
+			return 0;
+
+		ret = file_read_lines(config->file_plugins, hub, &plugin_parse_line);
+		if (ret == -1)
+			return -1;
+	}
+	return 0;
+}
+
+void plugin_shutdown(struct uhub_plugins* handle)
+{
+	struct plugin_handle* plugin = (struct plugin_handle*) list_get_first(handle->loaded);
+	while (plugin)
+	{
+		list_remove(handle->loaded, plugin);
+		plugin_unload(plugin);
+		plugin = (struct plugin_handle*) list_get_first(handle->loaded);
+	}
+
+	list_destroy(handle->loaded);
+}
+
+// Used internally only
+struct hub_info* plugin_get_hub(struct plugin_handle* plugin)
+{
+	struct plugin_hub_internals* data = get_internals(plugin);
+	return data->hub;
+}
+
+#endif /* PLUGIN_SUPPORT */

src/core/pluginloader.h

@@ -0,0 +1,59 @@
+/*
+ * 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_LOADER_H
+#define HAVE_UHUB_PLUGIN_LOADER_H
+
+#include "plugin_api/handle.h"
+
+struct hub_config;
+struct hub_info;
+struct linked_list;
+struct plugin_handle;
+
+struct uhub_plugin
+{
+	void* handle;
+	void* internals;      // Hub internal stuff
+	void* callback_data;  // Hub internal stuff
+};
+
+struct uhub_plugins
+{
+	struct linked_list* loaded;
+};
+
+// High level plugin loader ode
+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 hub_info* hub);
+extern void plugin_shutdown(struct uhub_plugins* handle);
+
+// Low level plugin loader code (used internally)
+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

@@ -26,8 +26,7 @@ static char probe_recvbuf[PROBE_RECV_SIZE];
 static void probe_net_event(struct net_connection* con, int events, void *arg)
 {
 	struct hub_probe* probe = (struct hub_probe*) net_con_get_ptr(con);
-
+	if (events == NET_EVENT_TIMEOUT)
-	if (events == NET_EVENT_SOCKERROR || events == NET_EVENT_CLOSED || events == NET_EVENT_TIMEOUT)
 	{
 		probe_destroy(probe);
 		return;
@@ -47,6 +46,13 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 			if (memcmp(probe_recvbuf, "HSUP", 4) == 0)
 			{
 				LOG_TRACE("Probed ADC");
+#ifdef SSL_SUPPORT
+				if (probe->hub->config->tls_enable && probe->hub->config->tls_require)
+				{
+					LOG_TRACE("Not TLS connection - closing connection.");
+				}
+				else
+#endif
 				if (user_create(probe->hub, probe->connection, &probe->addr))
 				{
 					probe->connection = 0;
@@ -86,9 +92,10 @@ static void probe_net_event(struct net_connection* con, int events, void *arg)
 				net_con_ssl_handshake(con, net_con_ssl_mode_server, probe->hub->ssl_ctx);
 				return;
 			}
-#endif
+#else
 			probe_destroy(probe);
 			return;
+#endif
 		}
 	}
 }

src/core/route.c

@@ -57,7 +57,7 @@ int route_message(struct hub_info* hub, struct hub_user* u, struct adc_message*
 	return 0;
 }
 
-static inline size_t get_max_send_queue(struct hub_info* hub)
+static size_t get_max_send_queue(struct hub_info* hub)
 {
 	/* TODO: More dynamic send queue limit, for instance:
 	 * return MAX(hub->config->max_send_buffer, (hub->config->max_recv_buffer * hub_get_user_count(hub)));
@@ -65,7 +65,7 @@ static inline size_t get_max_send_queue(struct hub_info* hub)
 	return hub->config->max_send_buffer;
 }
 
-static inline size_t get_max_send_queue_soft(struct hub_info* hub)
+static size_t get_max_send_queue_soft(struct hub_info* hub)
 {
 	return hub->config->max_send_buffer_soft;
 }
@@ -75,7 +75,7 @@ static inline size_t get_max_send_queue_soft(struct hub_info* hub)
  *         -1 if send queue is overflowed
  *         0 if soft send queue is overflowed (not implemented at the moment)
  */
-static inline int check_send_queue(struct hub_info* hub, struct hub_user* user, struct adc_message* msg)
+static int check_send_queue(struct hub_info* hub, struct hub_user* user, struct adc_message* msg)
 {
 	if (user_flag_get(user, flag_user_list))
 		return 1;
@@ -106,6 +106,8 @@ int route_to_user(struct hub_info* hub, struct hub_user* user, struct adc_messag
 	if (!user->connection)
 		return 0;
 
+	assert(msg->cache && *msg->cache);
+
 	if (hub_sendq_is_empty(user->send_queue) && !user_flag_get(user, flag_pipeline))
 	{
 		/* Perform oportunistic write */

src/core/user.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -54,6 +54,12 @@ struct hub_user* user_create(struct hub_info* hub, struct net_connection* con, s
 
 	memcpy(&user->id.addr, addr, sizeof(struct ip_addr_encap));
 	user_set_state(user, state_protocol);
+
+	flood_control_reset(&user->flood_chat);
+	flood_control_reset(&user->flood_connect);
+	flood_control_reset(&user->flood_search);
+	flood_control_reset(&user->flood_update);
+	flood_control_reset(&user->flood_extras);
 	return user;
 }
 
@@ -83,7 +89,14 @@ void user_set_state(struct hub_user* user, enum user_state state)
 void user_set_info(struct hub_user* user, struct adc_message* cmd)
 {
 	adc_msg_free(user->info);
-	user->info = adc_msg_incref(cmd);
+	if (cmd)
+	{
+		user->info = adc_msg_incref(cmd);
+	}
+	else
+	{
+		user->info = 0;
+	}
 }
 
 void user_update_info(struct hub_user* u, struct adc_message* cmd)
@@ -127,10 +140,9 @@ static int convert_support_fourcc(int fourcc)
 {
 	switch (fourcc)
 	{
-		case FOURCC('B','A','S','0'): /* Obsolete */
+		case FOURCC('B','A','S','0'):
-#ifndef OLD_ADC_SUPPORT
+			return feature_bas0;
-			return 0;
+
-#endif
 		case FOURCC('B','A','S','E'):
 			return feature_base;
 
@@ -276,18 +288,7 @@ int user_is_disconnecting(struct hub_user* user)
 
 int user_is_protected(struct hub_user* user)
 {
-	switch (user->credentials)
+	return auth_cred_is_protected(user->credentials);
-	{
-		case cred_bot:
-		case cred_operator:
-		case cred_super:
-		case cred_admin:
-		case cred_link:
-			return 1;
-		default:
-			break;
-	}
-	return 0;
 }
 
 /**
@@ -297,19 +298,7 @@ int user_is_protected(struct hub_user* user)
  */
 int user_is_registered(struct hub_user* user)
 {
-	switch (user->credentials)
+	return auth_cred_is_registered(user->credentials);
-	{
-		case cred_bot:
-		case cred_user:
-		case cred_operator:
-		case cred_super:
-		case cred_admin:
-		case cred_link:
-			return 1;
-		default:
-			break;
-	}
-	return 0;
 }
 
 void user_net_io_want_write(struct hub_user* user)
@@ -336,6 +325,7 @@ const char* user_get_quit_reason_string(enum user_quit_reason reason)
 		case quit_socket_error:     return "socket error";   break;
 		case quit_protocol_error:   return "protocol error"; break;
 		case quit_logon_error:      return "login error";    break;
+		case quit_update_error:     return "update error";   break;
 		case quit_hub_disabled:     return "hub disabled";   break;
 		case quit_ghost_timeout:    return "ghost";          break;
 	}

src/core/user.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, Jan Vidar Krey
+ * 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
@@ -22,6 +22,7 @@
 
 struct hub_info;
 struct hub_iobuf;
+struct flood_control;
 
 enum user_state
 {
@@ -45,6 +46,9 @@ enum user_flags
 	feature_ping    = 0x00000080, /** PING: Hub pinger information extension */
 	feature_link    = 0x00000100, /** LINK: Hub link (not supported) */
 	feature_adcs    = 0x00000200, /** ADCS: ADC over TLS/SSL */
+	feature_bas0    = 0x00000400, /** BAS0: Obsolete pre-ADC/1.0 protocol version */
+	flag_flood      = 0x00400000, /** User has been notified about flooding. */
+	flag_muted      = 0x00800000, /** User is muted (cannot chat) */
 	flag_ignore     = 0x01000000, /** Ignore further reads */
 	flag_maxbuf     = 0x02000000, /** Hit max buf read, ignore msg */
 	flag_choke      = 0x04000000, /** Choked: Cannot send, waiting for write event */ 
@@ -67,8 +71,9 @@ enum user_quit_reason
 	quit_socket_error   = 7,     /** A socket error occured */
 	quit_protocol_error = 8,     /** Fatal protocol error */
 	quit_logon_error    = 9,     /** Unable to login (wrong password, CID/PID, etc) */
-	quit_hub_disabled   = 10,    /** Hub is disabled. No new connections allowed */
+	quit_update_error   = 10,    /** Update error. INF update changed share/slot info and no longer satisfies the hub limits. */
-	quit_ghost_timeout  = 11,    /** The user is a ghost, and trying to login from another connection */
+	quit_hub_disabled   = 11,    /** Hub is disabled. No new connections allowed */
+	quit_ghost_timeout  = 12,    /** The user is a ghost, and trying to login from another connection */
 };
 
 /** Returns an apropriate string for the given quit reason */
@@ -77,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 */
 };
 
@@ -100,11 +106,10 @@ struct hub_user_limits
 
 struct hub_user
 {
-	enum user_state         state;              /** see enum user_state */
-	enum user_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 */
@@ -114,6 +119,11 @@ struct hub_user
 	struct hub_user_limits  limits;             /** Data used for limitation */
 	enum user_quit_reason   quit_reason;        /** Quit reason (see user_quit_reason) */
 
+	struct flood_control   flood_chat;
+	struct flood_control   flood_connect;
+	struct flood_control   flood_search;
+	struct flood_control   flood_update;
+	struct flood_control   flood_extras;
 };
 
 

src/core/usermanager.c

@@ -19,8 +19,6 @@
 
 #include "uhub.h"
 
-#define USERMANAGER_TIMER
-
 /*
  * This callback function is used to clear user objects from the userlist.
  * Should only be used in uman_shutdown().
@@ -35,12 +33,11 @@ static void clear_user_list_callback(void* ptr)
 		 * This prevents the hub from trying to send
 		 * quit messages to other users.
 		 */
-		u->credentials = cred_none;
+		u->credentials = auth_cred_none;
 		user_destroy(u);
 	}
 }
 
-
 void uman_update_stats(struct hub_info* hub)
 {
 	const int factor = TIMEOUT_STATS;
@@ -58,7 +55,6 @@ void uman_update_stats(struct hub_info* hub)
 	net_stats_reset();
 }
 
-
 void uman_print_stats(struct hub_info* hub)
 {
 	LOG_INFO("Statistics  users=" PRINTF_SIZE_T " (peak_users=" PRINTF_SIZE_T "), net_tx=%d KB/s, net_rx=%d KB/s (peak_tx=%d KB/s, peak_rx=%d KB/s)",
@@ -70,28 +66,16 @@ void uman_print_stats(struct hub_info* hub)
 		(int) hub->stats.net_rx_peak / 1024);
 }
 
-#ifdef USERMANAGER_TIMER
+static void timer_statistics(struct timeout_evt* t)
-#ifdef USE_LIBEVENT
-static void timer_statistics(int fd, short ev, void *arg)
 {
-	struct hub_info* hub = (struct hub_info*) arg;
+	struct hub_info* hub = (struct hub_info*) t->ptr;
-	struct timeval timeout = { TIMEOUT_STATS, 0 };
 	uman_update_stats(hub);
-	evtimer_set(&hub->ev_timer, timer_statistics, hub);
+	timeout_queue_reschedule(net_backend_get_timeout_queue(), hub->users->timeout, TIMEOUT_STATS);
-	evtimer_add(&hub->ev_timer, &timeout);
 }
-#endif
-#endif
-
 
 int uman_init(struct hub_info* hub)
 {
 	struct hub_user_manager* users = NULL;
-#ifdef USERMANAGER_TIMER
-#ifdef USE_LIBEVENT
-	struct timeval timeout = { TIMEOUT_STATS, 0 };
-#endif
-#endif
 	if (!hub)
 		return -1;
 
@@ -109,17 +93,14 @@ int uman_init(struct hub_info* hub)
 		return -1;
 	}
 
-	hub->users = users;
+	if (net_backend_get_timeout_queue())
-
-#ifdef USERMANAGER_TIMER
-#ifdef USE_LIBEVENT
-	if (net_get_evbase())
 	{
-		evtimer_set(&hub->ev_timer, timer_statistics, hub);
+		users->timeout = hub_malloc_zero(sizeof(struct timeout_evt));
-		evtimer_add(&hub->ev_timer, &timeout);
+		timeout_evt_initialize(users->timeout, timer_statistics, hub);
+		timeout_queue_insert(net_backend_get_timeout_queue(), users->timeout, TIMEOUT_STATS);
 	}
-#endif
+
-#endif // 0
+	hub->users = users;
 	return 0;
 }
 
@@ -129,12 +110,11 @@ int uman_shutdown(struct hub_info* hub)
 	if (!hub || !hub->users)
 		return -1;
 
-#ifdef USERMANAGER_TIMER
+	if (net_backend_get_timeout_queue())
-#ifdef USE_LIBEVENT
+	{
-	if (evtimer_pending(&hub->ev_timer, 0))
+		timeout_queue_remove(net_backend_get_timeout_queue(), hub->users->timeout);
-		evtimer_del(&hub->ev_timer);
+		hub_free(hub->users->timeout);
-#endif
+	}
-#endif
 
 	if (hub->users->list)
 	{
@@ -145,6 +125,7 @@ int uman_shutdown(struct hub_info* hub)
 	hub_free(hub->users);
 	hub->users = 0;
 
+
 	return 0;
 }
 
@@ -243,8 +224,9 @@ size_t uman_get_user_by_addr(struct hub_info* hub, struct linked_list* users, st
 int uman_send_user_list(struct hub_info* hub, struct hub_user* target)
 {
 	int ret = 1;
+	struct hub_user* user;
 	user_flag_set(target, flag_user_list);
-	struct hub_user* user = (struct hub_user*) list_get_first(hub->users->list); /* iterate users - only on INF or PAS msg */
+	user = (struct hub_user*) list_get_first(hub->users->list); /* iterate users - only on INF or PAS msg */
 	while (user)
 	{
 		if (user_is_logged_in(user))
@@ -266,7 +248,6 @@ int uman_send_user_list(struct hub_info* hub, struct hub_user* target)
 	return ret;
 }
 
-
 void uman_send_quit_message(struct hub_info* hub, struct hub_user* leaving)
 {
 	struct adc_message* command = adc_msg_construct(ADC_CMD_IQUI, 6);
@@ -280,7 +261,6 @@ void uman_send_quit_message(struct hub_info* hub, struct hub_user* leaving)
 	adc_msg_free(command);
 }
 
-
 sid_t uman_get_free_sid(struct hub_info* hub, struct hub_user* user)
 {
 	sid_t sid = sid_alloc(hub->users->sids, user);

src/core/usermanager.h

@@ -28,6 +28,7 @@ struct hub_user_manager
 	uint64_t shared_size;           /**<< "The total number of shared bytes among fully connected users." */
 	uint64_t shared_files;          /**<< "The total number of shared files among fully connected users." */
 	struct linked_list* list;       /**<< "Contains all logged in users" */
+	struct timeout_evt* timeout;    /**<< "Timeout handler for statistics" */
 };
 
 /**

src/network/backend.c

@@ -0,0 +1,220 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+#include "network/connection.h"
+
+struct net_backend;
+struct net_connection;
+
+struct net_cleanup_handler
+{
+	size_t num;
+	size_t max;
+	struct net_connection** queue;
+};
+
+struct net_backend
+{
+	struct net_backend_common common;
+	time_t now; /* the time now (used for timeout handling) */
+	struct timeout_queue timeout_queue; /* used for timeout handling */
+	struct net_cleanup_handler* cleaner; /* handler to cleanup connections at a safe point */
+	struct net_backend_handler handler; /* backend event handler */
+	struct net_backend* data; /* backend specific data */
+};
+
+static struct net_backend* g_backend;
+
+
+#ifdef USE_EPOLL
+extern struct net_backend* net_backend_init_epoll(struct net_backend_handler*, struct net_backend_common*);
+#endif
+
+#ifdef USE_KQUEUE
+extern struct net_backend* net_backend_init_kqueue(struct net_backend_handler*, struct net_backend_common*);
+#endif
+
+#ifdef USE_SELECT
+extern struct net_backend* net_backend_init_select(struct net_backend_handler*, struct net_backend_common*);
+#endif
+
+static net_backend_init_t net_backend_init_funcs[] = {
+#ifdef USE_EPOLL
+	net_backend_init_epoll,
+#endif
+#ifdef USE_KQUEUE
+	net_backend_init_kqueue,
+#endif
+#ifdef USE_SELECT
+	net_backend_init_select,
+#endif
+	0
+};
+
+int net_backend_init()
+{
+	size_t n;
+	g_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);
+	timeout_queue_initialize(&g_backend->timeout_queue, g_backend->now, 120); /* FIXME: max 120 secs! */
+	g_backend->cleaner = net_cleanup_initialize(g_backend->common.max);
+
+	for (n = 0; net_backend_init_funcs[n]; n++)
+	{
+		g_backend->data = net_backend_init_funcs[n](&g_backend->handler, &g_backend->common);
+		if (g_backend->data)
+		{
+			LOG_DEBUG("Initialized %s network backend.", g_backend->handler.backend_name());
+			return 1;
+		}
+	}
+	LOG_FATAL("Unable to find a suitable network backend");
+	return 0;
+}
+
+void net_backend_shutdown()
+{
+	g_backend->handler.backend_shutdown(g_backend->data);
+	timeout_queue_shutdown(&g_backend->timeout_queue);
+	net_cleanup_shutdown(g_backend->cleaner);
+	hub_free(g_backend);
+	g_backend = 0;
+}
+
+
+void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events)
+{
+	con->callback = callback;
+	con->ptr = (void*) ptr;
+	net_con_update(con, events);
+}
+
+void net_con_update(struct net_connection* con, int events)
+{
+	g_backend->handler.con_mod(g_backend->data, con, events);
+}
+
+struct net_connection* net_con_create()
+{
+	return g_backend->handler.con_create(g_backend->data);
+}
+
+struct timeout_queue* net_backend_get_timeout_queue()
+{
+	if (!g_backend)
+		return 0;
+	return &g_backend->timeout_queue;
+}
+
+
+/**
+ * Process the network backend.
+ */
+int net_backend_process()
+{
+	int res;
+	size_t secs = timeout_queue_get_next_timeout(&g_backend->timeout_queue, g_backend->now);
+
+	res = g_backend->handler.backend_poll(g_backend->data, secs * 1000);
+
+	g_backend->now = time(0);
+	timeout_queue_process(&g_backend->timeout_queue, g_backend->now);
+
+	if (res == -1)
+	{
+		LOG_WARN("backend error.");
+		return 0;
+	}
+
+	g_backend->handler.backend_process(g_backend->data, res);
+
+	net_cleanup_process(g_backend->cleaner);
+	return 1;
+}
+
+time_t net_get_time()
+{
+	return g_backend->now;
+}
+
+
+void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int events)
+{
+	g_backend->handler.con_init(g_backend->data, con, sd, callback, ptr);
+
+	net_set_nonblocking(con->sd, 1);
+	net_set_nosigpipe(con->sd, 1);
+
+	g_backend->handler.con_add(g_backend->data, con, events);
+	g_backend->common.num++;
+}
+
+void net_con_close(struct net_connection* con)
+{
+	if (con->flags & NET_CLEANUP)
+		return;
+
+	g_backend->common.num--;
+	net_con_clear_timeout(con);
+
+	g_backend->handler.con_del(g_backend->data, con);
+
+	net_close(con->sd);
+	con->sd = -1;
+
+	net_cleanup_delayed_free(g_backend->cleaner, con);
+}
+
+struct net_cleanup_handler* net_cleanup_initialize(size_t max)
+{
+	struct net_cleanup_handler* handler = (struct net_cleanup_handler*) hub_malloc(sizeof(struct net_cleanup_handler));
+	handler->num = 0;
+	handler->max = max;
+	handler->queue = hub_malloc_zero(sizeof(struct net_connection*) * max);
+	return handler;
+}
+
+void net_cleanup_shutdown(struct net_cleanup_handler* handler)
+{
+	hub_free(handler->queue);
+	hub_free(handler);
+}
+
+void net_cleanup_delayed_free(struct net_cleanup_handler* handler, struct net_connection* con)
+{
+	handler->queue[handler->num++] = con;
+	con->flags |= NET_CLEANUP;
+}
+
+void net_cleanup_process(struct net_cleanup_handler* handler)
+{
+	size_t n;
+	for (n = 0; n < handler->num; n++)
+	{
+		struct net_connection* con = handler->queue[n];
+		LOG_TRACE("net_cleanup_process: free: %p", con);
+		hub_free(con);
+	}
+	handler->num = 0;
+}
+

src/network/backend.h

@@ -20,11 +20,50 @@
 #ifndef HAVE_UHUB_NETWORK_BACKEND_H
 #define HAVE_UHUB_NETWORK_BACKEND_H
 
+struct net_backend;
+struct net_backend_common;
+struct net_backend_handler;
+struct net_cleanup_handler;
+struct net_connection;
+typedef void (*net_connection_cb)(struct net_connection*, int event, void* ptr);
+
+
+typedef struct net_backend* (*net_backend_init_t)(struct net_backend_handler* handler, struct net_backend_common* common);
+typedef int (*net_backend_poll)(struct net_backend*, int ms);
+typedef void (*net_backend_proc)(struct net_backend*, int res);
+typedef void (*net_backend_destroy)(struct net_backend*);
+
+typedef struct net_connection* (*net_con_backend_create)(struct net_backend*);
+typedef void (*net_con_backend_init)(struct net_backend*, struct net_connection*, int sd, net_connection_cb callback, const void* ptr);
+typedef void (*net_con_backend_add)(struct net_backend*, struct net_connection*, int mask);
+typedef void (*net_con_backend_mod)(struct net_backend*, struct net_connection*, int mask);
+typedef void (*net_con_backend_del)(struct net_backend*,struct net_connection*);
+typedef const char* (*net_con_backend_name)();
+
+struct net_backend_handler
+{
+	net_con_backend_name backend_name;
+	net_backend_poll backend_poll;
+	net_backend_proc backend_process;
+	net_backend_destroy backend_shutdown;
+	net_con_backend_create con_create;
+	net_con_backend_init con_init;
+	net_con_backend_add con_add;
+	net_con_backend_mod con_mod;
+	net_con_backend_del con_del;
+};
+
+struct net_backend_common
+{
+	size_t num; /* number of connections monitored by the backend */
+	size_t max; /* max number of connections that can be monitored */
+};
+
 /**
  * Initialize the network backend.
  * Returns 1 on success, or 0 on failure.
  */
-extern int net_backend_initialize();
+extern int net_backend_init();
 
 /**
  * Shutdown the network connection backend.
@@ -36,4 +75,20 @@ extern void net_backend_shutdown();
  */
 extern int net_backend_process();
 
+/**
+ * Get the current time.
+ */
+time_t net_get_time();
+
+extern struct timeout_queue* net_backend_get_timeout_queue();
+
+struct net_cleanup_handler* net_cleanup_initialize(size_t max);
+
+void net_cleanup_shutdown(struct net_cleanup_handler* handler);
+
+void net_cleanup_delayed_free(struct net_cleanup_handler* handler, struct net_connection* con);
+
+void net_cleanup_process(struct net_cleanup_handler* handler);
+
+
 #endif /* HAVE_UHUB_NETWORK_BACKEND_H */

src/network/common.h

@@ -1,37 +1,51 @@
+/*
+ * 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/>.
+ *
+ */
 
 #define NET_WANT_READ             NET_EVENT_READ
 #define NET_WANT_WRITE            NET_EVENT_WRITE
-#define NET_WANT_ACCEPT           0x0008
+#define NET_WANT_ACCEPT           NET_EVENT_READ
 #define NET_WANT_SSL_READ         0x0010
 #define NET_WANT_SSL_WRITE        0x0020
 #define NET_WANT_SSL_ACCEPT       0x0040
 #define NET_WANT_SSL_CONNECT      0x0080
 #define NET_WANT_SSL_X509_LOOKUP  0x0100
 
-#define NET_PROCESSING_BUSY       0x8000
+#define NET_CLEANUP               0x8000
-#define NET_CLEANUP               0x4000
-#define NET_INITIALIZED           0x2000
-#define NET_TIMER_ENABLED         0x1000
-
-/* FIXME: Meant for debugging */
-#define NET_EVENT_SET             0x0800
 
 #define NET_CON_STRUCT_BASIC \
 	int                  sd;        /** socket descriptor */ \
 	uint32_t             flags;     /** Connection flags */ \
 	void*                ptr;       /** data pointer */ \
 	net_connection_cb    callback;  /** Callback function */ \
+	struct timeout_evt*  timeout;   /** timeout event handler */
 
 #define NET_CON_STRUCT_SSL \
 	SSL*                 ssl;       /** SSL handle */ \
+	uint32_t             ssl_state; /** SSL state */ \
 	size_t               write_len; /** Length of last SSL_write(), only used if flags is NET_WANT_SSL_READ. */ \
 
-#ifdef USE_SSL
+#ifdef SSL_SUPPORT
 #define NET_CON_STRUCT_COMMON \
 	NET_CON_STRUCT_BASIC \
 	NET_CON_STRUCT_SSL
 #else
 #define NET_CON_STRUCT_COMMON \
 	NET_CON_STRUCT_BASIC
-#endif
+#endif /* SSL_SUPPORT */
 

src/network/connection.c

@@ -21,39 +21,39 @@
 #include "network/common.h"
 
 #ifdef SSL_SUPPORT
+
+enum uhub_tls_state
+{
+	tls_st_none,
+	tls_st_error,
+	tls_st_accepting,
+	tls_st_connecting,
+	tls_st_connected,
+	tls_st_disconnecting,
+};
+
 static int handle_openssl_error(struct net_connection* con, int ret)
 {
 	uhub_assert(con);
 
-	int error = SSL_get_error(net_con_get_ssl(con), ret);
+	int error = SSL_get_error(con->ssl, ret);
 	switch (error)
 	{
 		case SSL_ERROR_ZERO_RETURN:
 			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_ZERO_RETURN", ret, error);
+			con->ssl_state = tls_st_error;
 			return -1;
 
 		case SSL_ERROR_WANT_READ:
 			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_WANT_READ", ret, error);
-			net_con_update(con, NET_EVENT_READ | NET_WANT_SSL_READ);
+			con->flags |= NET_WANT_SSL_READ;
+			net_con_update(con, NET_EVENT_READ);
 			return 0;
 
 		case SSL_ERROR_WANT_WRITE:
 			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_WANT_WRITE", ret, error);
-			net_con_update(con, NET_EVENT_READ | NET_EVENT_WRITE | NET_WANT_SSL_WRITE);
+			con->flags |= NET_WANT_SSL_WRITE;
-			return 0;
+			net_con_update(con, NET_EVENT_READ | NET_EVENT_WRITE);
-
-		case SSL_ERROR_WANT_CONNECT:
-			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_WANT_CONNECT", ret, error);
-			net_con_update(con, NET_EVENT_READ | NET_EVENT_WRITE | NET_WANT_SSL_CONNECT);
-			return 0;
-
-		case SSL_ERROR_WANT_ACCEPT:
-			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_WANT_ACCEPT", ret, error);
-			net_con_update(con, NET_EVENT_READ | NET_EVENT_WRITE | NET_WANT_SSL_ACCEPT);
-			return 0;
-
-		case SSL_ERROR_WANT_X509_LOOKUP:
-			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_WANT_X509_LOOKUP", ret, error);
 			return 0;
 
 		case SSL_ERROR_SYSCALL:
@@ -67,6 +67,7 @@ static int handle_openssl_error(struct net_connection* con, int ret)
 		case SSL_ERROR_SSL:
 			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_SSL", ret, error);
 			/* internal openssl error */
+			con->ssl_state = tls_st_error;
 			return -1;
 	}
 
@@ -76,14 +77,15 @@ static int handle_openssl_error(struct net_connection* con, int ret)
 ssize_t net_con_ssl_accept(struct net_connection* con)
 {
 	uhub_assert(con);
-
+	con->ssl_state = tls_st_accepting;
-	ssize_t ret = SSL_accept(net_con_get_ssl(con));
+	ssize_t ret = SSL_accept(con->ssl);
 #ifdef NETWORK_DUMP_DEBUG
 	LOG_PROTO("SSL_accept() ret=%d", ret);
 #endif
 	if (ret > 0)
 	{
 		net_con_update(con, NET_EVENT_READ);
+		con->ssl_state = tls_st_connected;
 	}
 	else
 	{
@@ -96,12 +98,14 @@ ssize_t net_con_ssl_connect(struct net_connection* con)
 {
 	uhub_assert(con);
 
-	ssize_t ret = SSL_connect(net_con_get_ssl(con));
+	con->ssl_state = tls_st_connecting;
+	ssize_t ret = SSL_connect(con->ssl);
 #ifdef NETWORK_DUMP_DEBUG
 	LOG_PROTO("SSL_connect() ret=%d", ret);
 #endif
 	if (ret > 0)
 	{
+		con->ssl_state = tls_st_connected;
 		net_con_update(con, NET_EVENT_READ);
 	}
 	else
@@ -119,14 +123,14 @@ 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);
-		SSL_set_fd(ssl, net_con_get_sd(con));
+		SSL_set_fd(ssl, con->sd);
 		net_con_set_ssl(con, ssl);
 		return net_con_ssl_accept(con);
 	}
 	else
 	{
 		ssl = SSL_new(SSL_CTX_new(TLSv1_method()));
-		SSL_set_fd(ssl, net_con_get_sd(con));
+		SSL_set_fd(ssl, con->sd);
 		net_con_set_ssl(con, ssl);
 		return net_con_ssl_connect(con);
 	}
@@ -136,28 +140,42 @@ ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode
 
 ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
 {
-	int ret = net_send(net_con_get_sd(con), buf, len, UHUB_SEND_SIGNAL);
+	int ret;
-	if (ret == -1)
+#ifdef SSL_SUPPORT
+	if (!con->ssl)
 	{
-		if (net_error() == EWOULDBLOCK || net_error() == EINTR)
+#endif
-			return 0;
+		ret = net_send(con->sd, buf, len, UHUB_SEND_SIGNAL);
-		return -1;
+		if (ret == -1)
+		{
+			if (net_error() == EWOULDBLOCK || net_error() == EINTR)
+				return 0;
+			return -1;
+		}
+#ifdef SSL_SUPPORT
 	}
+	else
+	{
+		con->write_len = len;
+		ret = SSL_write(con->ssl, buf, 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);
+		}
+	}
+#endif
 	return ret;
 }
 
 ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 {
-	uhub_assert(con);
+	int ret;
-
 #ifdef SSL_SUPPORT
 	if (!net_con_is_ssl(con))
 	{
 #endif
-		int ret = net_recv(net_con_get_sd(con), buf, len, 0);
+		ret = net_recv(con->sd, buf, len, 0);
-#ifdef NETWORK_DUMP_DEBUG
-		LOG_PROTO("net_recv: ret=%d", ret);
-#endif
 		if (ret == -1)
 		{
 			if (net_error() == EWOULDBLOCK || net_error() == EINTR)
@@ -168,16 +186,15 @@ ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 		{
 			return -1;
 		}
-
-		return ret;
 #ifdef SSL_SUPPORT
 	}
 	else
 	{
-		int ret = SSL_read(net_con_get_ssl(con), buf, len);
+		if (con->ssl_state == tls_st_error)
-#ifdef NETWORK_DUMP_DEBUG
+			return -1;
-		LOG_PROTO("net_recv: ret=%d", ret);
+
-#endif
+		ret = SSL_read(con->ssl, buf, len);
+		LOG_PROTO("SSL_read(con=%p, buf=%p, len=" PRINTF_SIZE_T ") => %d", con, buf, len, ret);
 		if (ret > 0)
 		{
 			net_con_update(con, NET_EVENT_READ);
@@ -186,14 +203,14 @@ ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len)
 		{
 			return -handle_openssl_error(con, ret);
 		}
-		return ret;
 	}
 #endif
+	return ret;
 }
 
 ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len)
 {
-	int ret = net_recv(net_con_get_sd(con), buf, len, MSG_PEEK);
+	int ret = net_recv(con->sd, buf, len, MSG_PEEK);
 	if (ret == -1)
 	{
 		if (net_error() == EWOULDBLOCK || net_error() == EINTR)
@@ -205,6 +222,107 @@ ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len)
 	return ret;
 }
 
+#ifdef SSL_SUPPORT
+int net_con_is_ssl(struct net_connection* con)
+{
+	return con->ssl != 0;
+}
 
+SSL* net_con_get_ssl(struct net_connection* con)
+{
+	return con->ssl;
+}
 
+void net_con_set_ssl(struct net_connection* con, SSL* ssl)
+{
+	con->ssl = ssl;
+}
+#endif /* SSL_SUPPORT */
+
+int net_con_get_sd(struct net_connection* con)
+{
+	return con->sd;
+}
+
+void* net_con_get_ptr(struct net_connection* con)
+{
+	return con->ptr;
+}
+
+void net_con_destroy(struct net_connection* con)
+{
+	hub_free(con);
+}
+
+void net_con_callback(struct net_connection* con, int events)
+{
+	if (con->flags & NET_CLEANUP)
+		return;
+
+	if (events == NET_EVENT_TIMEOUT)
+	{
+		LOG_TRACE("net_con_callback(%p, TIMEOUT", con);
+		con->callback(con, events, con->ptr);
+		return;
+	}
+
+#ifdef SSL_SUPPORT
+	if (!con->ssl)
+	{
+#endif
+		con->callback(con, events, con->ptr);
+#ifdef SSL_SUPPORT
+	}
+	else
+	{
+#ifdef NETWORK_DUMP_DEBUG
+		LOG_PROTO("net_con_event: events=%d, con=%p, state=%d", events, con, con->ssl_state);
+#endif
+		switch (con->ssl_state)
+		{
+			case tls_st_none:
+				con->callback(con, events, con->ptr);
+				break;
+
+			case tls_st_error:
+				con->callback(con, NET_EVENT_READ, con->ptr);
+				break;
+
+			case tls_st_accepting:
+				if (net_con_ssl_accept(con) < 0)
+				{
+					con->callback(con, NET_EVENT_READ, con->ptr);
+				}
+				break;
+
+			case tls_st_connecting:
+				if (net_con_ssl_connect(con) < 0)
+				{
+					con->callback(con, NET_EVENT_READ, con->ptr);
+				}
+				break;
+
+			case tls_st_connected:
+				LOG_PROTO("tls_st_connected, events=%s%s, ssl_flags=%s%s", (events & NET_EVENT_READ ? "R" : ""), (events & NET_EVENT_WRITE ? "W" : ""), con->flags & NET_WANT_SSL_READ ? "R" : "", con->flags & NET_WANT_SSL_WRITE ? "W" : "");
+				if (events & NET_EVENT_WRITE && con->flags & NET_WANT_SSL_READ)
+				{
+					con->callback(con, events & NET_EVENT_READ, con->ptr);
+					return;
+				}
+
+				if (events & NET_EVENT_READ && con->flags & NET_WANT_SSL_WRITE)
+				{
+					con->callback(con, events & NET_EVENT_READ, con->ptr);
+					return;
+				}
+
+				con->callback(con, events, con->ptr);
+				break;
+
+			case tls_st_disconnecting:
+				return;
+		}
+	}
+#endif
+}
 

src/network/connection.h

@@ -21,16 +21,17 @@
 #define HAVE_UHUB_NETWORK_CONNECTION_H
 
 #include "uhub.h"
+#include "network/common.h"
 #include "network/backend.h"
 
 #define NET_EVENT_TIMEOUT         0x0001
 #define NET_EVENT_READ            0x0002
 #define NET_EVENT_WRITE           0x0004
-#define NET_EVENT_SOCKERROR       0x1000 /* Socket error, closed */
-#define NET_EVENT_CLOSED          0x2000 /* Socket closed */
 
-struct net_connection;
+struct net_connection
-typedef void (*net_connection_cb)(struct net_connection*, int event, void* ptr);
+{
+	NET_CON_STRUCT_COMMON
+};
 
 extern int   net_con_get_sd(struct net_connection* con);
 extern void* net_con_get_ptr(struct net_connection* con);
@@ -40,14 +41,14 @@ extern void net_con_destroy(struct net_connection*);
 extern void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int events);
 extern void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events);
 extern void net_con_update(struct net_connection* con, int events);
+extern void net_con_callback(struct net_connection* con, int events);
 
 /**
  * Close the connection.
  * This will ensure a connection is closed properly and will generate a NET_EVENT_DESTROYED event which indicates
  * that the con can safely be deleted (or set to NULL).
- * @returns 1 if the memory pointed to by con can be freed immediately, or 0 if it needs to go through the NET_EVENT_DESTROYED event.
  */
-extern int net_con_close(struct net_connection* con);
+extern void net_con_close(struct net_connection* con);
 
 /**
  * Send data

src/network/epoll.c

@@ -27,280 +27,161 @@
 
 #define EPOLL_EVBUFFER 512
 
-struct net_connection
+struct net_connection_epoll
 {
-	int                  sd;
+	NET_CON_STRUCT_COMMON
-	uint32_t             flags;
+	struct epoll_event ev;
-	net_connection_cb    callback;
-	void*                ptr;
-	struct epoll_event   ev;
-	struct timeout_evt*  timeout;
-#ifdef SSL_SUPPORT
-	SSL*                 ssl;
-	size_t               write_len; /** Length of last SSL_write(), only used if flags is NET_WANT_SSL_READ. */
-#endif
 };
 
-struct net_backend
+struct net_backend_epoll
 {
 	int epfd;
-	size_t num;
+	struct net_connection_epoll** conns;
-	size_t max;
-	struct net_connection** conns;
 	struct epoll_event events[EPOLL_EVBUFFER];
-	time_t now;
+	struct net_backend_common* common;
-	struct timeout_queue timeout_queue;
 };
 
-static struct net_backend* g_backend = 0;
+static void net_backend_set_handlers(struct net_backend_handler* handler);
 
-static void net_con_print(const char* prefix, struct net_connection* con)
+const char* net_backend_name_epoll()
 {
-	char buf[512];
+	return "epoll";
-	int off = snprintf(buf, 512, "%s: net_connection={ sd=%d, flags=%u, callback=%p, ptr=%p, ev={ events=%s%s, data.ptr=%p }",
-		prefix, con->sd, con->flags, con->callback, con->ptr, (con->ev.events & EPOLLIN ? "R" : ""),(con->ev.events & EPOLLOUT ? "W" : "") , con->ev.data.ptr);
-	if (con->timeout)
-	{
-		sprintf(buf + off, ", timeout={ %d seconds left }", (int) (con->timeout->timestamp - g_backend->now));
-	}
-	else
-	{
-		sprintf(buf + off, ", timeout=NULL");
-	}
-	LOG_TRACE(buf);
 }
 
-/**
+int net_backend_poll_epoll(struct net_backend* data, int ms)
- * Initialize the network backend.
- * Returns 1 on success, or 0 on failure.
- */
-int net_backend_initialize()
 {
-	size_t max = net_get_max_sockets();
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
-	g_backend = hub_malloc(sizeof(struct net_backend));
+	int res = epoll_wait(backend->epfd, backend->events, MIN(backend->common->num, EPOLL_EVBUFFER), ms);
-	g_backend->epfd = epoll_create(max);
+	if (res == -1 && errno == EINTR)
-	if (g_backend->epfd == -1)
-	{
-		LOG_WARN("Unable to create epoll socket.");
 		return 0;
-	}
+	return res;
-	
-	g_backend->num = 0;
-	g_backend->max = max;
-	g_backend->conns = hub_malloc_zero(sizeof(struct net_connection*) * max);
-	memset(g_backend->events, 0, sizeof(g_backend->events));
-
-	g_backend->now = time(0);
-	timeout_queue_initialize(&g_backend->timeout_queue, g_backend->now, 600); /* look max 10 minutes into the future. */
-	return 1;
 }
 
-/**
+void net_backend_process_epoll(struct net_backend* data, int res)
- * Shutdown the network connection backend.
- */
-void net_backend_shutdown()
 {
-	close(g_backend->epfd);
+	int n, ev;
-	hub_free(g_backend->conns);
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
-	hub_free(g_backend);
-}
-
-/**
- * Process the network backend.
- */
-int net_backend_process()
-{
-	int n;
-	LOG_TRACE("epoll_wait: fd=%d, events=%x, max=%zu", g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER));
-	int res = epoll_wait(g_backend->epfd, g_backend->events, MIN(g_backend->num, EPOLL_EVBUFFER), 1000);
-	if (res == -1)
-	{
-		LOG_WARN("epoll_wait returned -1");
-		return 0;
-	}
-
 	for (n = 0; n < res; n++)
 	{
-		struct net_connection* con = (struct net_connection*) g_backend->events[n].data.ptr;
+		struct net_connection_epoll* con = backend->conns[backend->events[n].data.fd];
-		int ev = 0;
+		if (con)
-		if (g_backend->events[n].events & EPOLLIN)  ev |= NET_EVENT_READ;
+		{
-		if (g_backend->events[n].events & EPOLLOUT) ev |= NET_EVENT_WRITE;
+			ev = 0;
-		con->callback(con, ev, con->ptr);
+			if (backend->events[n].events & EPOLLIN)  ev |= NET_EVENT_READ;
+			if (backend->events[n].events & EPOLLOUT) ev |= NET_EVENT_WRITE;
+			net_con_callback((struct net_connection*) con, ev);
+		}
 	}
-	return 1;
 }
 
-
+struct net_connection* net_con_create_epoll(struct net_backend* data)
-struct net_connection* net_con_create()
 {
-	struct net_connection* con = (struct net_connection*) hub_malloc_zero(sizeof(struct net_connection));
+	struct net_connection* con = (struct net_connection*) hub_malloc_zero(sizeof(struct net_connection_epoll));
 	con->sd = -1;
 	return con;
 }
 
-void net_con_destroy(struct net_connection* con)
+void net_con_initialize_epoll(struct net_backend* data, struct net_connection* con_, int sd, net_connection_cb callback, const void* ptr)
-{
-	hub_free(con);
-}
-
-void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int events)
 {
+	struct net_connection_epoll* con = (struct net_connection_epoll*) con_;
 	con->sd = sd;
-	con->flags = NET_INITIALIZED;
+	con->flags = 0;
 	con->callback = callback;
 	con->ev.events = 0;
 	con->ptr = (void*) ptr;
-	con->ev.data.ptr = (void*) con;
+	con->ev.data.fd = sd;
+}
 
-	net_set_nonblocking(con->sd, 1);
+void net_con_backend_add_epoll(struct net_backend* data, struct net_connection* con_, int events)
-	net_set_nosigpipe(con->sd, 1);
+{
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
+	struct net_connection_epoll* con = (struct net_connection_epoll*) con_;
 
-	if (events & NET_EVENT_READ) con->ev.events |= EPOLLIN;
+	backend->conns[con->sd] = con;
+
+	if (events & NET_EVENT_READ)  con->ev.events |= EPOLLIN;
 	if (events & NET_EVENT_WRITE) con->ev.events |= EPOLLOUT;
 
-	g_backend->conns[sd] = con;
+	if (epoll_ctl(backend->epfd, EPOLL_CTL_ADD, con->sd, &con->ev) == -1)
-	g_backend->num++;
-
-	if (epoll_ctl(g_backend->epfd, EPOLL_CTL_ADD, con->sd, &con->ev) == -1)
 	{
 		LOG_TRACE("epoll_ctl() add failed.");
 	}
-
-	net_con_print("ADD", con);
 }
 
-void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events)
+void net_con_backend_mod_epoll(struct net_backend* data, struct net_connection* con_, int events)
 {
-	con->callback = callback;
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
-	con->ptr = (void*) ptr;
+	struct net_connection_epoll* con = (struct net_connection_epoll*) con_;
-	net_con_update(con, events);
-}
 
-void net_con_update(struct net_connection* con, int events)
+	int newev = 0;
-{
+	if (events & NET_EVENT_READ)  newev |= EPOLLIN;
-	con->ev.events = 0;
+	if (events & NET_EVENT_WRITE) newev |= EPOLLOUT;
-	if (events & NET_EVENT_READ) con->ev.events |= EPOLLIN;
-	if (events & NET_EVENT_WRITE) con->ev.events |= EPOLLOUT;
 
-#ifdef SSL_SUPPORT
+	if (newev == con->ev.events)
-	if (events & NET_WANT_SSL_WRITE)
+		return;
-		con->flags |= NET_WANT_SSL_WRITE;
-	else
-		con->flags &= ~NET_WANT_SSL_WRITE;
 
-	if (events & NET_WANT_SSL_READ)
+	con->ev.events = newev;
-		con->flags |= NET_WANT_SSL_READ;
+	if (epoll_ctl(backend->epfd, EPOLL_CTL_MOD, con->sd, &con->ev) == -1)
-	else
-		con->flags &= ~NET_WANT_SSL_READ;
-
-	if (events & NET_WANT_SSL_ACCEPT)
-		con->flags |= NET_WANT_SSL_ACCEPT;
-	else
-		con->flags &= ~NET_WANT_SSL_ACCEPT;
-
-	if (events & NET_WANT_SSL_CONNECT)
-		con->flags |= NET_WANT_SSL_CONNECT;
-	else
-		con->flags &= ~NET_WANT_SSL_CONNECT;
-#endif /* SSL_SUPPORT */
-
-	if (epoll_ctl(g_backend->epfd, EPOLL_CTL_MOD, con->sd, &con->ev) == -1)
 	{
 		LOG_TRACE("epoll_ctl() modify failed.");
 	}
-	net_con_print("MOD", con);
 }
 
-int net_con_close(struct net_connection* con)
+void net_con_backend_del_epoll(struct net_backend* data, struct net_connection* con_)
 {
-	if (!(con->flags & NET_INITIALIZED))
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
-		return 0;
+	struct net_connection_epoll* con = (struct net_connection_epoll*) con_;
 
-	con->flags &= ~NET_INITIALIZED;
+	backend->conns[con->sd] = 0;
 
-	if (con->sd != -1)
+	if (epoll_ctl(backend->epfd, EPOLL_CTL_DEL, con->sd, &con->ev) == -1)
-	{
-		g_backend->conns[con->sd] = 0;
-		g_backend->num--;
-	}
-
-	if (timeout_evt_is_scheduled(con->timeout))
-	{
-		timeout_queue_remove(&g_backend->timeout_queue, con->timeout);
-		hub_free(con->timeout);
-		con->timeout = 0;
-	}
-
-	if (epoll_ctl(g_backend->epfd, EPOLL_CTL_DEL, con->sd, &con->ev) == -1)
 	{
 		LOG_WARN("epoll_ctl() delete failed.");
 	}
-	net_con_print("DEL", con);
-	return 0;
 }
 
-#ifdef SSL_SUPPORT
+void net_backend_shutdown_epoll(struct net_backend* data)
-int net_con_is_ssl(struct net_connection* con)
 {
-
+	struct net_backend_epoll* backend = (struct net_backend_epoll*) data;
-	return con->ssl != 0;
+	close(backend->epfd);
+	hub_free(backend->conns);
+	hub_free(backend);
 }
 
-SSL* net_con_get_ssl(struct net_connection* con)
+struct net_backend* net_backend_init_epoll(struct net_backend_handler* handler, struct net_backend_common* common)
 {
-	return con->ssl;
+	struct net_backend_epoll* backend;
-}
 
-void net_con_set_ssl(struct net_connection* con, SSL* ssl)
+	if (getenv("EVENT_NOEPOLL"))
-{
+		return 0;
-	con->ssl = ssl;
-}
-#endif
 
-int net_con_get_sd(struct net_connection* con)
+	backend = hub_malloc_zero(sizeof(struct net_backend_epoll));
-{
+	backend->epfd = epoll_create(common->max);
-	return con->sd;
+	if (backend->epfd == -1)
-}
-
-void* net_con_get_ptr(struct net_connection* con)
-{
-	return con->ptr;
-}
-
-
-void timeout_evt_initialize(struct timeout_evt*, timeout_evt_cb, void* ptr);
-void timeout_evt_reset(struct timeout_evt*);
-int  timeout_evt_is_scheduled(struct timeout_evt*);
-
-static void timeout_callback(struct timeout_evt* evt)
-{
-	struct net_connection* con = (struct net_connection*) evt->ptr;
-	con->callback(con, NET_EVENT_TIMEOUT, con->ptr);
-}
-
-
-void net_con_set_timeout(struct net_connection* con, int seconds)
-{
-	if (!con->timeout)
 	{
-		con->timeout = hub_malloc_zero(sizeof(struct timeout_evt));
+		LOG_WARN("Unable to create epoll socket.");
-		timeout_evt_initialize(con->timeout, timeout_callback, con);
+		hub_free(backend);
-		timeout_queue_insert(&g_backend->timeout_queue, con->timeout, seconds);
+		return 0;
-	}
-	else
-	{
-		timeout_queue_reschedule(&g_backend->timeout_queue, con->timeout, seconds);
 	}
+
+	backend->conns = hub_malloc_zero(sizeof(struct net_connection_epoll*) * common->max);
+	backend->common = common;
+
+	net_backend_set_handlers(handler);
+	return (struct net_backend*) backend;
 }
 
-void net_con_clear_timeout(struct net_connection* con)
+static void net_backend_set_handlers(struct net_backend_handler* handler)
 {
-	if (con->timeout && timeout_evt_is_scheduled(con->timeout))
+	handler->backend_name = net_backend_name_epoll;
-	{
+	handler->backend_poll = net_backend_poll_epoll;
-		timeout_queue_remove(&g_backend->timeout_queue, con->timeout);
+	handler->backend_process = net_backend_process_epoll;
-		hub_free(con->timeout);
+	handler->backend_shutdown = net_backend_shutdown_epoll;
-		con->timeout = 0;
+	handler->con_create = net_con_create_epoll;
-	}
+	handler->con_init = net_con_initialize_epoll;
+	handler->con_add = net_con_backend_add_epoll;
+	handler->con_mod = net_con_backend_mod_epoll;
+	handler->con_del = net_con_backend_del_epoll;
 }
 
 #endif /* USE_EPOLL */

src/network/kqueue.c

@@ -0,0 +1,278 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+#ifdef USE_KQUEUE
+
+#include "network/connection.h"
+#include "network/common.h"
+#include "network/backend.h"
+
+#define KQUEUE_EVBUFFER 512
+
+struct net_connection_kqueue
+{
+	NET_CON_STRUCT_COMMON
+	struct kevent ev_r;
+	struct kevent ev_w;
+	int change;
+};
+
+struct net_backend_kqueue
+{
+	int kqfd;
+	struct net_connection_kqueue** conns;
+	struct kevent* changes;
+	int* change_list;
+	size_t change_list_len;
+	struct kevent events[KQUEUE_EVBUFFER];
+	struct net_backend_common* common;
+};
+
+#define CHANGE_ACTION_ADD       0x0001
+#define CHANGE_ACTION_MOD       0x0002
+#define CHANGE_ACTION_DEL       0x0004
+#define CHANGE_OP_WANT_READ     0x0100
+#define CHANGE_OP_WANT_WRITE    0x0200
+
+static void net_backend_set_handlers(struct net_backend_handler* handler);
+static void add_change(struct net_backend_kqueue* backend, struct net_connection_kqueue* con, int actions);
+static size_t create_change_list(struct net_backend_kqueue* backend);
+
+const char* net_backend_name_kqueue()
+{
+	return "kqueue";
+}
+
+int net_backend_poll_kqueue(struct net_backend* data, int ms)
+{
+	int res;
+	struct timespec tspec = { 0, };
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+	size_t changes;
+
+	tspec.tv_sec = (ms / 1000);
+	tspec.tv_nsec = ((ms % 1000) * 1000000);
+
+	changes = create_change_list(backend);
+	res = kevent(backend->kqfd, backend->changes, changes, backend->events, KQUEUE_EVBUFFER, &tspec);
+
+	if (res == -1 && errno == EINTR)
+		return 0;
+	return res;
+}
+
+void net_backend_process_kqueue(struct net_backend* data, int res)
+{
+	int n;
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+
+	for (n = 0; n < res; n++)
+	{
+		struct net_connection_kqueue* con = (struct net_connection_kqueue*) backend->events[n].udata;
+		if (con && con->sd >= 0 && backend->conns[con->sd])
+		{
+			int ev = 0;
+			if (backend->events[n].filter == EVFILT_READ) ev = NET_EVENT_READ;
+			else if (backend->events[n].filter == EVFILT_WRITE) ev = NET_EVENT_WRITE;
+			net_con_callback((struct net_connection*) con, ev);
+		}
+	}
+}
+
+struct net_connection* net_con_create_kqueue(struct net_backend* data)
+{
+	struct net_connection* con = (struct net_connection*) hub_malloc_zero(sizeof(struct net_connection_kqueue));
+	con->sd = -1;
+	return con;
+}
+
+void net_con_initialize_kqueue(struct net_backend* data, struct net_connection* con_, int sd, net_connection_cb callback, const void* ptr)
+{
+	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
+	con->sd = sd;
+	con->flags = 0;
+	con->callback = callback;
+	con->ptr = (void*) ptr;
+}
+
+void net_con_backend_add_kqueue(struct net_backend* data, struct net_connection* con_, int events)
+{
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
+	int operation;
+
+	backend->conns[con->sd] = con;
+
+	operation = CHANGE_ACTION_ADD;
+
+	if (events & NET_EVENT_READ)
+	  operation |= CHANGE_OP_WANT_READ;
+
+	if (events & NET_EVENT_WRITE)
+	  operation |= CHANGE_OP_WANT_WRITE;
+
+	add_change(backend, con, operation);
+}
+
+void net_con_backend_mod_kqueue(struct net_backend* data, struct net_connection* con_, int events)
+{
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
+
+	int operation = CHANGE_ACTION_ADD;
+
+	if (events & NET_EVENT_READ)
+	  operation |= CHANGE_OP_WANT_READ;
+
+	if (events & NET_EVENT_WRITE)
+	  operation |= CHANGE_OP_WANT_WRITE;
+
+	add_change(backend, con, operation);
+}
+
+void net_con_backend_del_kqueue(struct net_backend* data, struct net_connection* con_)
+{
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+	struct net_connection_kqueue* con = (struct net_connection_kqueue*) con_;
+
+	/* No need to remove it from the kqueue filter, the kqueue man page says
+	   it is automatically removed when the descriptor is closed... */
+	add_change(backend, con, CHANGE_ACTION_DEL);
+
+	// Unmap the socket descriptor.
+	backend->conns[con->sd] = 0;
+}
+
+void net_backend_shutdown_kqueue(struct net_backend* data)
+{
+	struct net_backend_kqueue* backend = (struct net_backend_kqueue*) data;
+	close(backend->kqfd);
+	hub_free(backend->conns);
+	hub_free(backend->changes);
+	hub_free(backend->change_list);
+	hub_free(backend);
+}
+
+struct net_backend* net_backend_init_kqueue(struct net_backend_handler* handler, struct net_backend_common* common)
+{
+	struct net_backend_kqueue* backend;
+
+	if (getenv("EVENT_NOKQUEUE"))
+		return 0;
+
+	backend = hub_malloc_zero(sizeof(struct net_backend_kqueue));
+	backend->kqfd = kqueue();
+	if (backend->kqfd == -1)
+	{
+		LOG_WARN("Unable to create kqueue socket.");
+		return 0;
+	}
+
+	backend->conns = hub_malloc_zero(sizeof(struct net_connection_kqueue*) * common->max);
+	backend->changes = hub_malloc_zero(sizeof(struct kevent) * common->max * 2);
+	backend->change_list = hub_malloc_zero(sizeof(int) * common->max);
+	backend->common = common;
+
+	net_backend_set_handlers(handler);
+	return (struct net_backend*) backend;
+}
+
+static void net_backend_set_handlers(struct net_backend_handler* handler)
+{
+	handler->backend_name = net_backend_name_kqueue;
+	handler->backend_poll = net_backend_poll_kqueue;
+	handler->backend_process = net_backend_process_kqueue;
+	handler->backend_shutdown = net_backend_shutdown_kqueue;
+	handler->con_create = net_con_create_kqueue;
+	handler->con_init = net_con_initialize_kqueue;
+	handler->con_add = net_con_backend_add_kqueue;
+	handler->con_mod = net_con_backend_mod_kqueue;
+	handler->con_del = net_con_backend_del_kqueue;
+}
+
+static void add_change(struct net_backend_kqueue* backend, struct net_connection_kqueue* con, int actions)
+{
+	if (actions && !con->change)
+	{
+		backend->change_list[backend->change_list_len++] = con->sd;
+		con->change = actions;
+	}
+}
+
+static size_t create_change_list(struct net_backend_kqueue* backend)
+{
+	size_t n = 0;
+	size_t changes = 0;
+	int sd;
+	struct net_connection_kqueue* con;
+	unsigned short flags_r = 0;
+	unsigned short flags_w = 0;
+
+	for (; n < backend->change_list_len; n++)
+	{
+		sd = backend->change_list[n];
+		con = backend->conns[sd];
+		if (con)
+		{
+			flags_r = 0;
+			flags_w = 0;
+
+			if (con->change & CHANGE_ACTION_ADD)
+			{
+				flags_r |= EV_ADD;
+				flags_w |= EV_ADD;
+			}
+
+			if (con->change & CHANGE_OP_WANT_READ)
+				flags_r |= EV_ENABLE;
+			else
+				flags_r |= EV_DISABLE;
+
+			if (con->change & CHANGE_OP_WANT_WRITE)
+				flags_w |= EV_ENABLE;
+			else
+				flags_w |= EV_DISABLE;
+
+			if (con->ev_r.flags != flags_r)
+			{
+				EV_SET(&con->ev_r, sd, EVFILT_READ, flags_r, 0, 0, con);
+				memcpy(&backend->changes[changes++], &con->ev_r, sizeof(struct kevent));
+			}
+
+			if (con->ev_w.flags != flags_w)
+			{
+				EV_SET(&con->ev_w, sd, EVFILT_WRITE, flags_w, 0, 0, con);
+				memcpy(&backend->changes[changes++], &con->ev_w, sizeof(struct kevent));
+			}
+
+			con->change = 0;
+		}
+		else
+		{
+			EV_SET(&backend->changes[changes++], sd, EVFILT_READ, EV_DELETE, 0, 0, 0);
+			EV_SET(&backend->changes[changes++], sd, EVFILT_READ, EV_DELETE, 0, 0, 0);
+		}
+	}
+	backend->change_list_len = 0;
+	return changes;
+}
+
+#endif /* USE_KQUEUE */

src/network/libevent.c

@@ -1,399 +0,0 @@
-/*
- * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2009, 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/>.
- *
- */
-
-#ifdef USE_LIBEVENT
-
-struct net_connection
-{
-	NET_CON_STRUCT_COMMON
-	struct event         event;     /** libevent struct for read/write events */
-	struct event         timeout;   /** Used for internal timeout handling */
-};
-
-struct net_timer
-{
-	unsigned int         initialized;
-	struct event         timeout;
-	net_timeout_cb       callback;
-	void*                ptr;
-};
-
-int net_con_get_sd(struct net_connection* con)
-{
-	return con->sd;
-}
-
-void* net_con_get_ptr(struct net_connection* con)
-{
-	return con->ptr;
-}
-
-struct net_connection* net_con_create()
-{
-	struct net_connection* con = (struct net_connection*) hub_malloc(sizeof(struct net_connection));
-	return con;
-}
-
-static inline int net_con_flag_get(struct net_connection* con, unsigned int flag)
-{
-    return con->flags & flag;
-}
-
-static inline void net_con_flag_set(struct net_connection* con, unsigned int flag)
-{
-    con->flags |= flag;
-}
-
-static inline void net_con_flag_unset(struct net_connection* con, unsigned int flag)
-{
-    con->flags &= ~flag;
-}
-
-void net_con_destroy(struct net_connection* con)
-{
-	hub_free(con);
-}
-
-static inline int net_con_convert_to_libevent_mask(int ev)
-{
-	int events = 0;
-	if (ev & NET_EVENT_READ)  events |= EV_READ;
-	if (ev & NET_EVENT_WRITE) events |= EV_WRITE;
-	return events;
-}
-
-static inline int net_con_convert_from_libevent_mask(int ev)
-{
-	int events = 0;
-	if (ev & EV_TIMEOUT)    events |= NET_EVENT_TIMEOUT;
-	if (ev & EV_READ)       events |= NET_EVENT_READ;
-	if (ev & EV_WRITE)      events |= NET_EVENT_WRITE;
-	return events;
-}
-
-static void net_con_event(int fd, short ev, void *arg);
-
-
-int net_con_close(struct net_connection* con)
-{
-	uhub_assert(con);
-
-	con->ptr = 0;
-
-	if (net_con_flag_get(con, NET_CLEANUP))
-		return 0;
-
-	if (net_con_flag_get(con, NET_PROCESSING_BUSY))
-	{
-		net_con_flag_set(con, NET_CLEANUP);
-		return 0;
-	}
-
-	net_con_after_close(con);
-	return 1;
-}
-
-static void net_con_set(struct net_connection* con)
-{
-	uhub_assert(con);
-
-	int ev = 0;
-	if (net_con_flag_get(con, NET_WANT_READ | NET_WANT_SSL_READ))   ev |= EV_READ;
-	if (net_con_flag_get(con, NET_WANT_WRITE | NET_WANT_SSL_WRITE)) ev |= EV_WRITE;
-
-	if (net_con_flag_get(con, NET_EVENT_SET) != 0)
-	{
-		event_del(&con->event);
-	}
-	net_con_flag_set(con, NET_EVENT_SET);
-
-	LOG_MEMORY("SET: set+add: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev);
-	event_set(&con->event, con->sd, ev, net_con_event, con);
-	event_add(&con->event, 0);
-
-	net_con_flag_set(con, NET_INITIALIZED);
-}
-
-static void net_con_after_close(struct net_connection* con)
-{
-	if (net_con_flag_get(con, NET_INITIALIZED))
-	{
-		LOG_MEMORY("DEL:   close: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, -1);
-		net_con_flag_unset(con, NET_EVENT_SET);
-
-		event_del(&con->event);
-		net_con_flag_unset(con, NET_INITIALIZED);
-	}
-
-	net_con_clear_timeout(con);
-	net_close(con->sd);
-	con->sd = -1;
-
-	hub_free(con);
-}
-
-void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int ev)
-{
-	uhub_assert(con);
-
-	int events = net_con_convert_to_libevent_mask(ev);
-	if (ev & NET_EVENT_READ)  net_con_flag_set(con, NET_WANT_READ);
-	if (ev & NET_EVENT_WRITE) net_con_flag_set(con, NET_WANT_WRITE);
-
-	con->sd = sd;
-	con->flags = 0;
-	con->ptr = (void*) ptr;
-	con->callback = callback;
-	con->last_send = time(0);
-	con->last_recv = con->last_send;
-
-	if (ev)
-	{
-		uhub_assert(net_con_flag_get(con, NET_EVENT_SET) == 0);
-		net_con_flag_set(con, NET_EVENT_SET);
-
-		LOG_MEMORY("SET:    init: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev);
-		event_set(&con->event, con->sd, events, net_con_event, con);
-		event_add(&con->event, 0);
-		net_con_flag_set(con, NET_INITIALIZED);
-	}
-
-	net_set_nonblocking(sd, 1);
-	net_set_nosigpipe(sd, 1);
-
-#ifdef SSL_SUPPORT
-	con->ssl = NULL;
-	con->write_len = 0;
-#endif
-}
-
-void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events)
-{
-	uhub_assert(con);
-	con->callback = callback;
-	con->ptr = (void*) ptr;
-	net_con_update(con, events);
-}
-
-void net_con_update(struct net_connection* con, int ev)
-{
-	uhub_assert(con);
-
-	if (ev & NET_EVENT_READ)
-		net_con_flag_set(con, NET_EVENT_READ);
-	else
-		net_con_flag_unset(con, NET_EVENT_READ);
-
-	if (ev & NET_EVENT_WRITE)
-		net_con_flag_set(con, NET_EVENT_WRITE);
-	else
-		net_con_flag_unset(con, NET_EVENT_WRITE);
-
-	if (!net_con_flag_get(con, NET_PROCESSING_BUSY))
-	{
-		net_con_set(con);
-	}
-}
-
-#define CALLBACK(CON, EVENTS) \
-	if (CON->callback) \
-		CON->callback(con, EVENTS, CON->ptr);
-
-static void net_con_event(int fd, short ev, void *arg)
-{
-	struct net_connection* con = (struct net_connection*) arg;
-	int events = net_con_convert_from_libevent_mask(ev);
-
-	if (!net_con_flag_get(con, NET_INITIALIZED))
-	{
-		return;
-	}
-
-	if (net_con_flag_get(con, NET_CLEANUP))
-	{
-		net_con_after_close(con);
-		return;
-	}
-
-	net_con_flag_set(con, NET_PROCESSING_BUSY);
-
-// 	uhub_assert(net_con_flag_get(con, NET_EVENT_SET) != 0);
-	net_con_flag_unset(con, NET_EVENT_SET);
-
-	LOG_MEMORY("EVT: process: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, (int) ev);
-
-#ifdef SSL_SUPPORT
-	if (!con->ssl)
-	{
-#endif
-		CALLBACK(con, events);
-#ifdef SSL_SUPPORT
-	}
-	else
-	{
-#ifdef NETWORK_DUMP_DEBUG
-		LOG_PROTO("net_con_event: events=%d, con=%p", ev, con);
-#endif
-		if (ev & (EV_READ | EV_WRITE))
-		{
-			if (net_con_flag_get(con, NET_WANT_SSL_ACCEPT))
-			{
-				if (net_con_ssl_accept(con) < 0)
-					CALLBACK(con, NET_EVENT_SOCKERROR);
-			}
-			else if (net_con_flag_get(con, NET_WANT_SSL_CONNECT))
-			{
-				if (net_con_ssl_connect(con) < 0)
-					CALLBACK(con, NET_EVENT_SOCKERROR);
-			}
-			else if (ev == EV_READ && net_con_flag_get(con, NET_WANT_SSL_READ))
-			{
-				CALLBACK(con, NET_EVENT_WRITE);
-			}
-			else if (ev == EV_WRITE && net_con_flag_get(con, NET_WANT_SSL_WRITE))
-			{
-				CALLBACK(con, events & NET_EVENT_READ);
-			}
-			else
-			{
-				CALLBACK(con, events);
-			}
-		}
-		else
-		{
-			CALLBACK(con, events);
-		}
-	}
-#endif
-	net_con_flag_unset(con, NET_PROCESSING_BUSY);
-
-	if (net_con_flag_get(con, NET_CLEANUP))
-	{
-		net_con_after_close(con);
-	}
-	else
-	{
-		net_con_set(con);
-	}
-}
-
-
-static void net_timer_event(int fd, short ev, void *arg)
-{
-	struct net_timer* timer = (struct net_timer*) arg;
-	timer->callback(timer, timer->ptr);
-}
-
-void net_timer_initialize(struct net_timer* timer, net_timeout_cb callback, void* ptr)
-{
-	timer->initialized = 0;
-	timer->callback = callback;
-	timer->ptr = ptr;
-}
-
-void net_timer_reset(struct net_timer* timer, int seconds)
-{
-	struct timeval timeout = { seconds, 0 };
-	if (timer->initialized)
-	{
-		evtimer_del(&timer->timeout);
-		timer->initialized = 0;
-	}
-	evtimer_set(&timer->timeout, net_timer_event, timer);
-	evtimer_add(&timer->timeout, &timeout);
-}
-
-void net_timer_shutdown(struct net_timer* timer)
-{
-	if (timer->initialized)
-	{
-		evtimer_del(&timer->timeout);
-		timer->initialized = 0;
-	}
-	timer->callback = 0;
-	timer->ptr = 0;
-}
-
-
-void net_con_set_timeout(struct net_connection* con, int seconds)
-{
-	uhub_assert(con);
-
-	struct timeval timeout = { seconds, 0 };
-	net_con_clear_timeout(con);
-
-	evtimer_set(&con->timeout, net_con_event, con);
-	evtimer_add(&con->timeout, &timeout);
-	net_con_flag_set(con, NET_TIMER_ENABLED);
-}
-
-void net_con_clear_timeout(struct net_connection* con)
-{
-	uhub_assert(con);
-
-	if (net_con_flag_get(con, NET_TIMER_ENABLED))
-	{
-		evtimer_del(&con->timeout);
-		net_con_flag_unset(con, NET_TIMER_ENABLED);
-	}
-}
-
-static struct event_base g_evbase = 0;
-
-/**
- * Initialize the network backend.
- * Returns 1 on success, or 0 on failure.
- */
-int net_backend_initialize()
-{
-	g_evbase = event_init();
-	if (!g_evbase)
-	{
-		LOG_ERROR("Unable to initialize libevent.");
-		return 0;
-	}
-	LOG_DEBUG("Using libevent %s, backend: %s", event_get_version(), event_get_method());
-	return 1;
-}
-
-/**
- * Shutdown the network connection backend.
- */
-void net_backend_shutdown()
-{
-	event_base_free(g_evbase);
-}
-
-/**
- * Process the network backend.
- */
-int net_backend_process()
-{
-	int ret = event_base_loop(g_evbase, EVLOOP_ONCE);
-	if (ret != 0)
-	{
-		LOG_DEBUG("event_base_loop returned: %d", (int) ret);
-	}
-	if (ret < 0)
-		return 0;
-	return 1;
-}
-
-
-#endif /* USE_LIBEVENT */

src/network/network.c

@@ -34,12 +34,14 @@ static struct net_statistics stats_total;
 
 int net_initialize()
 {
+#ifdef WINSOCK
+	struct WSAData wsa;
+#endif
 	if (!net_initialized)
 	{
 		LOG_TRACE("Initializing network monitor.");
 
 #ifdef WINSOCK
-		struct WSAData wsa;
 		if (WSAStartup(MAKEWORD(2, 2), &wsa) != NO_ERROR)
 		{
 			LOG_ERROR("Unable to initialize winsock.");
@@ -47,7 +49,13 @@ int net_initialize()
 		}
 #endif /* WINSOCK */
 
-		net_backend_initialize();
+		if (!net_backend_init())
+		{
+#ifdef WINSOCK
+			WSACleanup();
+#endif
+			return -1;
+		}
 		net_stats_initialize();
 
 #ifdef SSL_SUPPORT
@@ -69,14 +77,13 @@ size_t net_get_max_sockets()
 	struct rlimit limits;
 	if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
 	{
-		return limits.rlim_max;
+		return MIN(limits.rlim_max, 65536);
 	}
 	LOG_ERROR("getrlimit() failed");
 	return 1024;
 #else
 #ifdef WIN32
-	LOG_WARN("Windows system, limited to 4096 connections.");
+	return FD_SETSIZE;
-	return 4096;
 #else
 	LOG_WARN("System does not have getrlimit(): constrained to 1024 sockets");
 	return 1024;
@@ -351,6 +358,9 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
 	{
 		switch (net_error())
 		{
+#if defined(__HAIKU__)
+			case ETIMEDOUT:
+#endif
 #if defined(__linux__)
 			case ENETDOWN:
 			case EPROTO:
@@ -376,16 +386,16 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
 		if (ipaddr)
 		{
 			memset(ipaddr, 0, sizeof(struct ip_addr_encap));
-			ipaddr->af = addr4->sin_family;
+			ipaddr->af = addr.ss_family;;
 			if (ipaddr->af == AF_INET6)
 			{
 				char address[INET6_ADDRSTRLEN+1] = { 0, };
 				net_address_to_string(AF_INET6, (void*) &addr6->sin6_addr, address, INET6_ADDRSTRLEN+1);
-				if (!strncmp(address, "::ffff:", 7))
+				if (strchr(address, '.'))
 				{
 					/* Hack to convert IPv6 mapped IPv4 addresses to true IPv4 addresses */
-					net_string_to_address(AF_INET, address + 7, (void*) &ipaddr->internal_ip_data.in);
 					ipaddr->af = AF_INET;
+					net_string_to_address(AF_INET, address, (void*) &ipaddr->internal_ip_data.in);
 				}
 				else
 				{
@@ -519,14 +529,22 @@ const char* net_address_to_string(int af, const void* src, char* dst, socklen_t
 			return NULL;
 	}
 	
-	if (WSAAddressToString(addr, size, NULL, dst, &len) == 0)
+	if (WSAAddressToStringA(addr, size, NULL, dst, &len) == 0)
 	{
 		return dst;
 	}
 
 	return NULL;
 #else
-	return inet_ntop(af, src, dst, cnt);
+	if (inet_ntop(af, src, dst, cnt))
+	{
+		if (af == AF_INET6 && strncmp(dst, "::ffff:", 7) == 0) /* IPv6 mapped IPv4 address. */
+		{
+			memmove(dst, dst + 7, cnt - 7);
+		}
+		return dst;
+	}
+	return NULL;
 #endif
 }
 
@@ -573,9 +591,6 @@ int net_string_to_address(int af, const char* src, void* dst)
 #endif
 }
 
-
-
-
 const char* net_get_peer_address(int fd)
 {
 	static char address[INET6_ADDRSTRLEN+1];
@@ -583,9 +598,10 @@ const char* net_get_peer_address(int fd)
 	struct sockaddr_in6* name6;
 	struct sockaddr_in*  name4;
 	struct sockaddr*     name;
+	socklen_t namelen;
 	
 	memset(address, 0, INET6_ADDRSTRLEN);
-	socklen_t namelen = sizeof(struct sockaddr_storage);
+	namelen = sizeof(struct sockaddr_storage);
 	memset(&storage, 0, namelen);
 	
 	name6 = (struct sockaddr_in6*) &storage;
@@ -594,21 +610,16 @@ const char* net_get_peer_address(int fd)
 	
 	if (getpeername(fd, (struct sockaddr*) name, &namelen) != -1)
 	{
-		int af = name4->sin_family;
+		int af = storage.ss_family;
 		if (af == AF_INET6)
 		{
 			net_address_to_string(af, (void*) &name6->sin6_addr, address, INET6_ADDRSTRLEN);
-			if (strncmp(address, "::ffff:", 7) == 0) /* IPv6 mapped IPv4 address. */
-			{
-				return &address[7];
-			}
-			return address;
 		}
 		else
 		{
 			net_address_to_string(af, (void*) &name4->sin_addr, address, INET6_ADDRSTRLEN);
-			return address;
 		}
+		return address;
 	}
 	else
 	{
@@ -619,6 +630,50 @@ const char* net_get_peer_address(int fd)
 	return "0.0.0.0";
 }
 
+const char* net_get_local_address(int fd)
+{
+	static char address[INET6_ADDRSTRLEN+1];
+	struct sockaddr_storage storage;
+	struct sockaddr_in6* name6;
+	struct sockaddr_in*  name4;
+	struct sockaddr*     name;
+	socklen_t namelen;
+
+	memset(address, 0, INET6_ADDRSTRLEN);
+	namelen = sizeof(struct sockaddr_storage);
+	memset(&storage, 0, namelen);
+
+	name6 = (struct sockaddr_in6*) &storage;
+	name4 = (struct sockaddr_in*)  &storage;
+	name  = (struct sockaddr*)     &storage;
+
+	if (getsockname(fd, (struct sockaddr*) name, &namelen) != -1)
+	{
+#ifndef WINSOCK
+		int af = storage.ss_family;
+		if (af == AF_INET6)
+		{
+			net_address_to_string(af, (void*) &name6->sin6_addr, address, INET6_ADDRSTRLEN);
+		}
+		else
+#else
+		int af = AF_INET;
+#endif
+		{
+			net_address_to_string(af, (void*) &name4->sin_addr, address, INET6_ADDRSTRLEN);
+		}
+		return address;
+	}
+	else
+	{
+		net_error_out(fd, "net_get_local_address");
+		net_stats_add_error();
+	}
+
+	return "0.0.0.0";
+}
+
+
 
 ssize_t net_recv(int fd, void* buf, size_t len, int flags)
 {

src/network/network.h

@@ -224,6 +224,8 @@ extern int net_is_ipv6_supported();
  */
 extern const char* net_get_peer_address(int fd);
 
+extern const char* net_get_local_address(int fd);
+
 /**
  * See man(3) inet_ntop.
  */
@@ -253,7 +255,7 @@ extern int net_stats_timeout();
 extern void net_stats_get(struct net_statistics** intermediate, struct net_statistics** total);
 
 
-#if defined(WINSOCK) && !defined(__CYGWIN__)
+#if defined(WINSOCK) && !defined(__CYGWIN__) && !defined(_MSC_VER)
 
 #define EWOULDBLOCK     WSAEWOULDBLOCK
 #define EINPROGRESS     WSAEINPROGRESS

src/network/select.c

@@ -0,0 +1,182 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+#ifdef USE_SELECT
+
+#include "network/connection.h"
+#include "network/common.h"
+#include "network/backend.h"
+
+struct net_connection_select
+{
+	NET_CON_STRUCT_COMMON
+};
+
+struct net_backend_select
+{
+	struct net_connection_select** conns;
+	fd_set rfds;
+	fd_set wfds;
+	fd_set xfds;
+	int maxfd;
+	struct net_backend_common* common;
+};
+
+static void net_backend_set_handlers(struct net_backend_handler* handler);
+
+const char* net_backend_name_select()
+{
+	return "select";
+}
+
+int net_backend_poll_select(struct net_backend* data, int ms)
+{
+	int res;
+	size_t n, found;
+	struct timeval tval;
+	struct net_backend_select* backend = (struct net_backend_select*) data;
+
+	tval.tv_sec = ms / 1000;
+	tval.tv_usec = ((ms % 1000) * 1000); // FIXME: correct?
+
+	FD_ZERO(&backend->rfds);
+	FD_ZERO(&backend->wfds);
+	FD_ZERO(&backend->xfds);
+
+	backend->maxfd = -1;
+	for (n = 0, found = 0; found < backend->common->num && n < backend->common->max; n++)
+	{
+		struct net_connection_select* con = backend->conns[n];
+		if (con)
+		{
+			if (con->flags & NET_EVENT_READ)  FD_SET(con->sd, &backend->rfds);
+			if (con->flags & NET_EVENT_WRITE) FD_SET(con->sd, &backend->wfds);
+			found++;
+			backend->maxfd = con->sd;
+		}
+	}
+	backend->maxfd++;
+
+	res = select(backend->maxfd, &backend->rfds, &backend->wfds, &backend->xfds, &tval);
+	if (res == -1)
+	{
+		printf("Error: %d\n", net_error());
+	}
+	if (res == -1 && net_error() == EINTR)
+		return 0;
+
+	return res;
+}
+
+void net_backend_process_select(struct net_backend* data, int res)
+{
+	int n, found;
+	struct net_backend_select* backend = (struct net_backend_select*) data;
+	for (n = 0, found = 0; found < res && n < backend->maxfd; n++)
+	{
+		struct net_connection_select* con = backend->conns[n];
+		if (con)
+		{
+			int ev = 0;
+			if (FD_ISSET(con->sd, &backend->rfds)) ev |= NET_EVENT_READ;
+			if (FD_ISSET(con->sd, &backend->wfds)) ev |= NET_EVENT_WRITE;
+
+			if (ev)
+			{
+				net_con_callback((struct net_connection*) con, ev);
+				found++;
+			}
+		}
+	}
+}
+
+struct net_connection* net_con_create_select(struct net_backend* data)
+{
+	struct net_connection* con = (struct net_connection*) hub_malloc_zero(sizeof(struct net_connection_select));
+	con->sd = -1;
+	return con;
+}
+
+void net_con_initialize_select(struct net_backend* data, struct net_connection* con_, int sd, net_connection_cb callback, const void* ptr)
+{
+	struct net_connection_select* con = (struct net_connection_select*) con_;
+	con->sd = sd;
+	con->flags = 0;
+	con->callback = callback;
+	con->ptr = (void*) ptr;
+}
+
+void net_con_backend_add_select(struct net_backend* data, struct net_connection* con, int events)
+{
+	struct net_backend_select* backend = (struct net_backend_select*) data;
+	backend->conns[con->sd] = (struct net_connection_select*) con;
+	con->flags |= (events & (NET_EVENT_READ | NET_EVENT_WRITE));
+}
+
+
+void net_con_backend_mod_select(struct net_backend* data, struct net_connection* con, int events)
+{
+	con->flags |= (events & (NET_EVENT_READ | NET_EVENT_WRITE));
+}
+
+void net_con_backend_del_select(struct net_backend* data, struct net_connection* con)
+{
+	struct net_backend_select* backend = (struct net_backend_select*) data;
+	backend->conns[con->sd] = 0;
+}
+
+void net_backend_shutdown_select(struct net_backend* data)
+{
+	struct net_backend_select* backend = (struct net_backend_select*) data;
+	hub_free(backend->conns);
+	hub_free(backend);
+}
+
+struct net_backend* net_backend_init_select(struct net_backend_handler* handler, struct net_backend_common* common)
+{
+	struct net_backend_select* backend;
+
+	if (getenv("EVENT_NOSELECT"))
+		return 0;
+
+	backend = hub_malloc_zero(sizeof(struct net_backend_select));
+	FD_ZERO(&backend->rfds);
+	FD_ZERO(&backend->wfds);
+	backend->conns = hub_malloc_zero(sizeof(struct net_connection_select*) * common->max);
+	backend->common = common;
+	net_backend_set_handlers(handler);
+	return (struct net_backend*) backend;
+}
+
+static void net_backend_set_handlers(struct net_backend_handler* handler)
+{
+	handler->backend_name = net_backend_name_select;
+	handler->backend_poll = net_backend_poll_select;
+	handler->backend_process = net_backend_process_select;
+	handler->backend_shutdown = net_backend_shutdown_select;
+	handler->con_create = net_con_create_select;
+	handler->con_init = net_con_initialize_select;
+	handler->con_add = net_con_backend_add_select;
+	handler->con_mod = net_con_backend_mod_select;
+	handler->con_del = net_con_backend_del_select;
+}
+
+#endif /* USE_SELECT */

src/network/timeout.c

@@ -18,7 +18,6 @@
  */
 
 #include "uhub.h"
-#include "util/timeout.h"
 
 void timeout_evt_initialize(struct timeout_evt* t, timeout_evt_cb cb, void* ptr)
 {
@@ -36,8 +35,7 @@ void timeout_evt_reset(struct timeout_evt* t)
 
 int timeout_evt_is_scheduled(struct timeout_evt* t)
 {
-	if (!t) return 0;
+	return t->prev != NULL;
-	return !!t->prev;
 }
 
 void timeout_queue_initialize(struct timeout_queue* t, time_t now, size_t max)
@@ -56,23 +54,35 @@ void timeout_queue_shutdown(struct timeout_queue* t)
 
 size_t timeout_queue_process(struct timeout_queue* t, time_t now)
 {
-	size_t pos;
+	size_t pos = (size_t) t->last;
 	size_t events = 0;
 	struct timeout_evt* evt = 0;
-	for (pos = t->last; pos < now; pos++)
+	t->last = now;
+	for (; pos <= now; pos++)
 	{
 		while ((evt = t->events[pos % t->max]))
 		{
 			timeout_queue_remove(t, evt);
-			timeout_evt_reset(evt);
 			evt->callback(evt);
 			events++;
 		}
 	}
-	t->last = now;
 	return events;
 }
 
+size_t timeout_queue_get_next_timeout(struct timeout_queue* t, time_t now)
+{
+	size_t seconds = 0;
+	while (t->events[(now + seconds) % t->max] == NULL && seconds < t->max)
+	{
+		seconds++;
+	}
+	if (seconds == 0)
+		return 1;
+	return seconds;
+}
+
+
 void timeout_queue_insert(struct timeout_queue* t, struct timeout_evt* evt, size_t seconds)
 {
 	struct timeout_evt* first;
@@ -82,16 +92,19 @@ void timeout_queue_insert(struct timeout_queue* t, struct timeout_evt* evt, size
 	
 	first = t->events[pos];
 	
-	if (!first)
+	if (first)
+	{
+		uhub_assert(first->timestamp == evt->timestamp);
+		first->prev->next = evt;
+		evt->prev = first->prev;
+		first->prev = evt;
+	}
+	else
 	{
 		t->events[pos] = evt;
 		evt->prev = evt;
 	}
-	else
+	evt->next = 0;
-	{
-		evt->prev = first->prev;
-		first->prev = evt;
-	}
 }
 
 void timeout_queue_remove(struct timeout_queue* t, struct timeout_evt* evt)
@@ -99,23 +112,32 @@ void timeout_queue_remove(struct timeout_queue* t, struct timeout_evt* evt)
 	size_t pos = (evt->timestamp % t->max);
 	struct timeout_evt* first = t->events[pos];
 
-	if (!first)
+	if (!first || !evt->prev)
 		return;
 
 	if (first == evt)
 	{
-		if (first->next)
+		if (first->prev != first)
-			first->next->prev = first->prev;
+		{
-		t->events[pos] = first->next;
+			t->events[pos] = first->next;
+			t->events[pos]->prev = evt->prev;
+		}
+		else
+		{
+			t->events[pos] = 0;
+		}
+	}
+	else if (evt == first->prev)
+	{
+		first->prev = evt->prev;
+		evt->prev->next = 0;
 	}
 	else
 	{
 		evt->prev->next = evt->next;
-		if (evt->next)
+		evt->next->prev = evt->prev;
-				evt->next->prev = evt->prev;
-		else
-				first->prev = evt->prev;
 	}
+	timeout_evt_reset(evt);
 }
 
 void timeout_queue_reschedule(struct timeout_queue* t, struct timeout_evt* evt, size_t seconds)
@@ -124,3 +146,4 @@ void timeout_queue_reschedule(struct timeout_queue* t, struct timeout_evt* evt,
 		timeout_queue_remove(t, evt);
 	timeout_queue_insert(t, evt, seconds);
 }
+

src/network/timeout.h

@@ -53,4 +53,6 @@ void timeout_queue_insert(struct timeout_queue*, struct timeout_evt*, size_t sec
 void timeout_queue_remove(struct timeout_queue*, struct timeout_evt*);
 void timeout_queue_reschedule(struct timeout_queue*, struct timeout_evt*, size_t seconds);
 
+size_t timeout_queue_get_next_timeout(struct timeout_queue*, time_t now);
+
 #endif /* HAVE_UHUB_TIMEOUT_HANDLER_H */

src/network/timer.c

@@ -0,0 +1,50 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+#include "network/connection.h"
+
+static void timeout_callback(struct timeout_evt* evt)
+{
+	net_con_callback((struct net_connection*) evt->ptr, NET_EVENT_TIMEOUT);
+}
+
+void net_con_set_timeout(struct net_connection* con, int seconds)
+{
+	if (!con->timeout)
+	{
+		con->timeout = hub_malloc_zero(sizeof(struct timeout_evt));
+		timeout_evt_initialize(con->timeout, timeout_callback, con);
+		timeout_queue_insert(net_backend_get_timeout_queue(), con->timeout, seconds);
+	}
+	else
+	{
+		timeout_queue_reschedule(net_backend_get_timeout_queue(), con->timeout, seconds);
+	}
+}
+
+void net_con_clear_timeout(struct net_connection* con)
+{
+	if (con->timeout && timeout_evt_is_scheduled(con->timeout))
+	{
+		timeout_queue_remove(net_backend_get_timeout_queue(), con->timeout);
+		hub_free(con->timeout);
+		con->timeout = 0;
+	}
+}

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;
+	char* prefix;
+	size_t prefix_len;
+	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" */
+};
+
+#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

@@ -0,0 +1,159 @@
+/*
+ * 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_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"
+#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_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);
+
+typedef void (*on_connection_accepted_t)(struct plugin_handle*, struct ip_addr_encap*);
+typedef void (*on_connection_refused_t)(struct plugin_handle*, struct ip_addr_encap*);
+
+typedef void (*on_user_login_t)(struct plugin_handle*, struct plugin_user*);
+typedef void (*on_user_login_error_t)(struct plugin_handle*, struct plugin_user*, const char* reason);
+typedef void (*on_user_logout_t)(struct plugin_handle*, struct plugin_user*, const char* reason);
+typedef void (*on_user_nick_change_t)(struct plugin_handle*, struct plugin_user*, const char* new_nick);
+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 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*);
+typedef plugin_st (*on_check_ip_late_t)(struct plugin_handle*, struct ip_addr_encap*);
+typedef plugin_st (*on_validate_nick_t)(struct plugin_handle*, const char* nick);
+typedef plugin_st (*on_validate_cid_t)(struct plugin_handle*, const char* cid);
+
+typedef plugin_st (*auth_get_user_t)(struct plugin_handle*, const char* nickname, struct auth_info* info);
+typedef plugin_st (*auth_register_user_t)(struct plugin_handle*, struct auth_info* user);
+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
+	on_connection_accepted_t on_connection_accepted; /* Someone successfully connected to the hub */
+	on_connection_refused_t on_connection_refused;   /* Someone was refused connection to the hub */
+
+	// Log events for users
+	on_user_login_t         on_user_login;       /* A user has successfully logged in to the hub */
+	on_user_login_error_t   on_user_login_error; /* A user has failed to log in to the hub */
+	on_user_logout_t        on_user_logout;      /* A user has logged out of the hub (was previously logged in) */
+	on_user_nick_change_t   on_user_nick_change; /* A user has changed nickname */
+	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 */
+
+	// 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_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) */
+
+	// Authentication actions.
+	auth_get_user_t         auth_get_user;       /* Get authentication info from plugin */
+	auth_register_user_t    auth_register_user;  /* Register user */
+	auth_update_user_t      auth_update_user;    /* Update a registered user */
+	auth_delete_user_t      auth_delete_user;    /* Delete a registered user */
+
+	// 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_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_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 */
+	const char* name;               /* plugin name */
+	const char* version;            /* plugin version */
+	const char* description;        /* plugin description */
+	void* ptr;                      /* Plugin specific data */
+	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;      /* 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; \
+		PTR->version = VERSION; \
+		PTR->description = DESCRIPTION; \
+		PTR->ptr = NULL; \
+		PTR->error_msg = NULL; \
+		PTR->plugin_api_version = PLUGIN_API_VERSION; \
+		PTR->plugin_funcs_size = sizeof(struct plugin_funcs); \
+		memset(&PTR->funcs, 0, sizeof(struct plugin_funcs)); \
+	} while (0)
+
+/**
+ * Implemented by the plugin.
+ *
+ * @param handle[out] Sets all information by the plugin
+ * @param config A configuration string
+ * @return 0 on success, -1 on error.
+ */
+extern int plugin_register(struct plugin_handle* handle, const char* config);
+
+/**
+ * @return 0 on success, -1 on error.
+ */
+extern 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*);
+
+#endif /* HAVE_UHUB_PLUGIN_HANDLE_H */

src/plugin_api/message_api.h

@@ -0,0 +1,29 @@
+/*
+ * 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);
+
+#endif /* HAVE_UHUB_PLUGIN_API_H */

src/plugin_api/types.h

@@ -0,0 +1,91 @@
+/*
+ * 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;
+};
+
+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

@@ -0,0 +1,228 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2011, Jan Vidar Krey
+ */
+
+#include "plugin_api/handle.h"
+#include "util/memory.h"
+#include "util/list.h"
+#include "util/ipcalc.h"
+#include "util/misc.h"
+#include "util/log.h"
+#include "util/config_token.h"
+
+static void set_error_message(struct plugin_handle* plugin, const char* msg)
+{
+	plugin->error_msg = msg;
+}
+
+struct acl_data
+{
+	struct linked_list* users;
+	char* file;
+	int readonly;
+	int exclusive;
+};
+
+static void insert_user(struct linked_list* users, const char* nick, const char* pass, enum auth_credentials cred)
+{
+	struct auth_info* data = (struct auth_info*) hub_malloc_zero(sizeof(struct auth_info));
+	strncpy(data->nickname, nick, MAX_NICK_LEN);
+	strncpy(data->password, pass, MAX_PASS_LEN);
+	data->credentials = cred;
+	list_append(users, data);
+}
+
+static void free_acl(struct acl_data* data)
+{
+	if (!data)
+		return;
+
+	if (data->users)
+	{
+		list_clear(data->users, hub_free);
+		list_destroy(data->users);
+	}
+	hub_free(data->file);
+	hub_free(data);
+}
+
+static struct acl_data* parse_config(const char* line)
+{
+	struct acl_data* data = (struct acl_data*) hub_malloc_zero(sizeof(struct acl_data));
+	struct cfg_tokens* tokens = cfg_tokenize(line);
+	char* token = cfg_token_get_first(tokens);
+
+	if (!data)
+		return 0;
+
+	// set defaults
+	data->readonly = 1;
+	data->exclusive = 0;
+	data->users = list_create();
+
+	while (token)
+	{
+		char* split = strchr(token, '=');
+		size_t len = strlen(token);
+		size_t key = split ? (split - token) : len;
+		if (key == 4 && strncmp(token, "file", 4) == 0)
+		{
+			if (data->file)
+				hub_free(data->file);
+			data->file = strdup(split + 1);
+		}
+		else if (key == 8 && strncmp(token, "readonly", 8) == 0)
+		{
+			if (!string_to_boolean(split + 1, &data->readonly))
+				data->readonly = 1;
+		}
+		else if (key == 9 && strncmp(token, "exclusive", 9) == 0)
+		{
+			if (!string_to_boolean(split + 1, &data->exclusive))
+				data->exclusive = 1;
+		}
+		else
+		{
+			cfg_tokens_free(tokens);
+			free_acl(data);
+			return 0;
+		}
+
+		token = cfg_token_get_next(tokens);
+	}
+
+	cfg_tokens_free(tokens);
+	return data;
+}
+
+static int parse_line(char* line, int line_count, void* ptr_data)
+{
+	struct linked_list* users = (struct linked_list*) ptr_data;
+	struct cfg_tokens* tokens = cfg_tokenize(line);
+	enum auth_credentials cred;
+	char* credential;
+	char* username;
+	char* password;
+
+	if (cfg_token_count(tokens) == 0)
+	{
+		cfg_tokens_free(tokens);
+		return 0;
+	}
+
+	if (cfg_token_count(tokens) < 2)
+	{
+		cfg_tokens_free(tokens);
+		return -1;
+	}
+
+	credential = cfg_token_get_first(tokens);
+	username   = cfg_token_get_next(tokens);
+	password   = cfg_token_get_next(tokens);
+
+	if (!auth_string_to_cred(credential, &cred))
+	{
+		cfg_tokens_free(tokens);
+		return -1;
+	}
+
+	insert_user(users, username, password, cred);
+	cfg_tokens_free(tokens);
+	return 0;
+}
+
+static struct acl_data* load_acl(const char* config, struct plugin_handle* handle)
+{
+
+	struct acl_data* data = parse_config(config);
+
+	if (!data)
+		return 0;
+
+	if (!data->file || !*data->file)
+	{
+		free_acl(data); data = 0;
+		set_error_message(handle, "No configuration file given, missing \"file=<filename>\" configuration option.");
+		return 0;
+	}
+
+	if (file_read_lines(data->file, data->users, &parse_line) == -1)
+	{
+		fprintf(stderr, "Unable to load %s\n", data->file);
+		set_error_message(handle, "Unable to load file");
+	}
+
+	return data;
+}
+
+static void unload_acl(struct acl_data* data)
+{
+	free_acl(data);
+}
+
+static plugin_st get_user(struct plugin_handle* plugin, const char* nickname, struct auth_info* data)
+{
+	struct acl_data* acl = (struct acl_data*) plugin->ptr;
+	struct auth_info* info = (struct auth_info*) list_get_first(acl->users);
+	while (info)
+	{
+		if (strcasecmp((char*)info->nickname, nickname) == 0)
+		{
+			memcpy(data, info, sizeof(struct auth_info));
+			return st_allow;
+		}
+		info = (struct auth_info*) list_get_next(acl->users);
+	}
+	if (acl->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+static plugin_st register_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct acl_data* acl = (struct acl_data*) plugin->ptr;
+	if (acl->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+static plugin_st update_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct acl_data* acl = (struct acl_data*) plugin->ptr;
+	if (acl->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+static plugin_st delete_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct acl_data* acl = (struct acl_data*) plugin->ptr;
+	if (acl->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+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.");
+
+	// Authentication actions.
+	plugin->funcs.auth_get_user = get_user;
+	plugin->funcs.auth_register_user = register_user;
+	plugin->funcs.auth_update_user = update_user;
+	plugin->funcs.auth_delete_user = delete_user;
+
+	plugin->ptr = load_acl(config, plugin);
+	if (plugin->ptr)
+		return 0;
+	return -1;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	set_error_message(plugin, 0);
+	unload_acl(plugin->ptr);
+	return 0;
+}
+

src/plugins/mod_auth_sqlite.c

@@ -0,0 +1,213 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2010, Jan Vidar Krey
+ */
+
+#include "plugin_api/handle.h"
+#include <sqlite3.h>
+#include "util/memory.h"
+#include "util/list.h"
+#include "util/ipcalc.h"
+#include "util/misc.h"
+#include "util/log.h"
+#include "util/config_token.h"
+
+#define DEBUG_SQL
+
+
+static void set_error_message(struct plugin_handle* plugin, const char* msg)
+{
+	plugin->error_msg = msg;
+}
+
+struct sql_data
+{
+	int exclusive;
+	sqlite3* db;
+};
+
+static struct sql_data* parse_config(const char* line, struct plugin_handle* plugin)
+{
+	struct sql_data* data = (struct sql_data*) hub_malloc_zero(sizeof(struct sql_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");
+			cfg_tokens_free(tokens);
+			hub_free(data);
+			return 0;
+		}
+
+		if (strcmp(cfg_settings_get_key(setting), "file") == 0)
+		{
+			if (!data->db)
+			{
+				if (sqlite3_open(cfg_settings_get_value(setting), &data->db))
+				{
+					cfg_tokens_free(tokens);
+					cfg_settings_free(setting);
+					hub_free(data);
+					set_error_message(plugin, "Unable to open database file");
+					return 0;
+				}
+			}
+		}
+		else if (strcmp(cfg_settings_get_key(setting), "exclusive") == 0)
+		{
+			if (!string_to_boolean(cfg_settings_get_value(setting), &data->exclusive))
+				data->exclusive = 1;
+		}
+		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->db)
+	{
+	      set_error_message(plugin, "No database file is given, use file=<database>");
+	      hub_free(data);
+	      return 0;
+	}
+	return data;
+}
+
+static const char* sql_escape_string(const char* str)
+{
+	static char out[1024];
+	size_t i = 0;
+	size_t n = 0;
+	for (; n < strlen(str); n++)
+	{
+		if (str[n] == '\'')
+			out[i++] = '\'';
+		out[i++] = str[n];
+	}
+	out[i++] = '\0';
+	return out;
+}
+
+struct data_record {
+	struct auth_info* data;
+	int found;
+};
+
+static int get_user_callback(void* ptr, int argc, char **argv, char **colName){
+	struct data_record* data = (struct data_record*) ptr;
+	int i = 0;
+	for (; i < argc; i++) {
+		if (strcmp(colName[i], "nickname") == 0)
+			strncpy(data->data->nickname, argv[i], MAX_NICK_LEN);
+		else if (strcmp(colName[i], "password") == 0)
+			strncpy(data->data->password, argv[i], MAX_PASS_LEN);
+		else if (strcmp(colName[i], "credentials") == 0)
+		{
+			auth_string_to_cred(argv[i], &data->data->credentials);
+			data->found = 1;
+		}
+	}
+
+#ifdef DEBUG_SQL
+	printf("SQL: nickname=%s, password=%s, credentials=%s\n", data->data->nickname, data->data->password, auth_cred_to_string(data->data->credentials));
+#endif
+	return 0;
+}
+
+static plugin_st get_user(struct plugin_handle* plugin, const char* nickname, struct auth_info* data)
+{
+	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	struct data_record result;
+	char query[1024];
+	char* errMsg;
+	int rc;
+
+	snprintf(query, sizeof(query), "SELECT * FROM users WHERE nickname='%s';", sql_escape_string(nickname));
+	memset(data, 0, sizeof(struct auth_info));
+
+	result.data = data;
+	result.found = 0;
+
+#ifdef DEBUG_SQL
+	printf("SQL: %s\n", query);
+#endif
+
+	rc = sqlite3_exec(sql->db, query , get_user_callback, &result, &errMsg);
+	if (rc != SQLITE_OK) {
+#ifdef DEBUG_SQL
+		fprintf(stderr, "SQL: ERROR: %s\n", errMsg);
+#endif
+		sqlite3_free(errMsg);
+		return st_default;
+	}
+	
+	if (result.found)
+		return st_allow;
+	return st_default;
+}
+
+static plugin_st register_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	if (sql->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+static plugin_st update_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	if (sql->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+static plugin_st delete_user(struct plugin_handle* plugin, struct auth_info* user)
+{
+	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	if (sql->exclusive)
+		return st_deny;
+	return st_default;
+}
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	PLUGIN_INITIALIZE(plugin, "SQLite authentication plugin", "0.1", "Authenticate users based on a SQLite database.");
+
+	// Authentication actions.
+	plugin->funcs.auth_get_user = get_user;
+	plugin->funcs.auth_register_user = register_user;
+	plugin->funcs.auth_update_user = update_user;
+	plugin->funcs.auth_delete_user = delete_user;
+
+	plugin->ptr = parse_config(config, plugin);
+	if (plugin->ptr)
+		return 0;
+	return -1;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	set_error_message(plugin, 0);
+	struct sql_data* sql = (struct sql_data*) plugin->ptr;
+	sqlite3_close(sql->db);
+	hub_free(sql);
+	return 0;
+}
+

src/plugins/mod_example.c

@@ -0,0 +1,18 @@
+/**
+ * This is a minimal example plugin for uhub.
+ */
+
+#include "plugin_api/handle.h"
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	PLUGIN_INITIALIZE(plugin, "Example plugin", "1.0", "A simple example plugin");
+	return 0;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	/* No need to do anything! */
+	return 0;
+}
+

src/plugins/mod_logging.c

@@ -0,0 +1,116 @@
+/**
+ * This is a minimal example plugin for uhub.
+ */
+
+#include "system.h"
+#include "adc/adcconst.h"
+#include "adc/sid.h"
+#include "util/memory.h"
+#include "util/ipcalc.h"
+#include "plugin_api/handle.h"
+
+struct ip_addr_encap;
+
+struct log_data
+{
+	char* logfile;
+	int fd;
+};
+
+
+static void set_error_message(struct plugin_handle* plugin, const char* msg)
+{
+	plugin->error_msg = msg;
+}
+
+
+static struct log_data* log_open(struct plugin_handle* plugin, const char* config)
+{
+	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)
+	{
+		set_error_message(plugin, "Unable to open log file!");
+		hub_free(data->logfile);
+		hub_free(data);
+		return NULL;
+	}
+	return data;
+}
+
+static void log_close(struct log_data* data)
+{
+	hub_free(data->logfile);
+	close(data->fd);
+	hub_free(data);
+}
+
+static void log_message(struct log_data* data, const char *format, ...)
+{
+	static char logmsg[1024];
+	struct tm *tmp;
+	time_t t;
+	va_list args;
+	ssize_t size = 0;
+
+	t = time(NULL);
+	tmp = localtime(&t);
+	strftime(logmsg, 32, "%Y-%m-%d %H:%M:%S ", tmp);
+
+	va_start(args, format);
+	size = vsnprintf(logmsg + 20, 1004, format, args);
+	va_end(args);
+
+	write(data->fd, logmsg, size + 20);
+	fdatasync(data->fd);
+}
+
+static void log_user_login(struct plugin_handle* plugin, struct plugin_user* user)
+{
+	const char* cred = auth_cred_to_string(user->credentials);
+	const char* addr = ip_convert_to_string(&user->addr);
+
+	log_message(plugin->ptr, "LoginOK     %s/%s %s \"%s\" (%s) \"%s\"\n", sid_to_string(user->sid), user->cid, addr, user->nick, cred, user->user_agent);
+}
+
+static void log_user_login_error(struct plugin_handle* plugin, struct plugin_user* user, const char* reason)
+{
+	const char* addr = ip_convert_to_string(&user->addr);
+	log_message(plugin->ptr, "LoginError  %s/%s %s \"%s\" (%s) \"%s\"\n", sid_to_string(user->sid), user->cid, addr, user->nick, reason, user->user_agent);
+}
+
+static void log_user_logout(struct plugin_handle* plugin, struct plugin_user* user, const char* reason)
+{
+	const char* addr = ip_convert_to_string(&user->addr);
+	log_message(plugin->ptr, "Logout      %s/%s %s \"%s\" (%s) \"%s\"\n", sid_to_string(user->sid), user->cid, addr, user->nick, reason, user->user_agent);
+}
+
+static void log_change_nick(struct plugin_handle* plugin, struct plugin_user* user, const char* new_nick)
+{
+	const char* addr = ip_convert_to_string(&user->addr);
+	log_message(plugin->ptr, "NickChange  %s/%s %s \"%s\" -> \"%s\"\n", sid_to_string(user->sid), user->cid, addr, user->nick, new_nick);
+}
+
+int plugin_register(struct plugin_handle* plugin, const char* config)
+{
+	PLUGIN_INITIALIZE(plugin, "Logging plugin", "1.0", "Logs users entering and leaving the hub.");
+
+	plugin->funcs.on_user_login = log_user_login;
+	plugin->funcs.on_user_login_error = log_user_login_error;
+	plugin->funcs.on_user_logout = log_user_logout;
+	plugin->funcs.on_user_nick_change = log_change_nick;
+
+	plugin->ptr = log_open(plugin, config);
+	if (!plugin->ptr)
+		return -1;
+	return 0;
+}
+
+int plugin_unregister(struct plugin_handle* plugin)
+{
+	/* No need to do anything! */
+	log_close(plugin->ptr);
+	return 0;
+}
+

src/system.h

@@ -22,35 +22,24 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#if USE_REGPARM && __GNUC__ >= 3
-#define REGPRM1 __attribute__((regparm(1)))
-#define REGPRM2 __attribute__((regparm(2)))
-#define REGPRM3 __attribute__((regparm(3)))
-#else
-#define REGPRM1
-#define REGPRM2
-#define REGPRM3
-#endif
-
-#ifndef FORCEINLINE
-#if __GNUC__ < 3
-#define FORCEINLINE inline
-#else
-#define FORCEINLINE inline __attribute__((always_inline))
-#endif
-#endif
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__))
+#define BSD_LIKE
+#endif
+
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(_MSC_VER)
 #ifndef WINSOCK
 #define WINSOCK
 #endif
 #endif
 
 #ifdef WINSOCK
+#ifndef FD_SETSIZE
+#define FD_SETSIZE 4096
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
@@ -66,22 +55,31 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <getopt.h>
+
+#ifndef __sun__
+#include <stdint.h>
+#endif
+
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
 
 #if !defined(WIN32)
+#include <unistd.h>
 #include <grp.h>
 #include <pwd.h>
 #include <sys/resource.h>
 #define HAVE_STRNDUP
+#define HAVE_DLOPEN
+#define HAVE_GETOPT
+#define HAVE_SSIZE_T
+#include <dlfcn.h>
+#ifndef __HAIKU__
 #define HAVE_MEMMEM
+#endif
 #define HAVE_GETRLIMIT
 #endif
 
@@ -102,20 +100,116 @@
 
 #define uhub_assert assert
 
-#ifdef USE_LIBEVENT
-#include <event.h>
-#else
 #ifdef __linux__
 #define USE_EPOLL
 #include <sys/epoll.h>
 #endif
+
+#ifdef BSD_LIKE
+#define USE_KQUEUE
+#include <sys/event.h>
 #endif
 
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun__)
+#define USE_SELECT
+#ifndef WINSOCK
+#include <sys/select.h>
+#endif
+
+#if defined(BSD_LIKE) || defined(__sun__)
 #undef HAVE_STRNDUP
 #undef HAVE_MEMMEM
 #endif
 
+#ifdef HAVE_GETOPT
+#include <getopt.h>
+#endif
+
+/*
+ * Detect operating system info.
+ * See: http://predef.sourceforge.net/
+ */
+#if defined(__linux__)
+#define OPSYS "Linux"
+#endif
+
+#if defined(_WIN32) || defined(__MINGW32__) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)
+#define OPSYS "Windows"
+#endif
+
+#if defined(__APPLE__) && defined(__MACH__)
+#define OPSYS "MacOSX"
+#endif
+
+#if defined(__FreeBSD__)
+#define OPSYS "FreeBSD"
+#endif
+
+#if defined(__OpenBSD__)
+#define OPSYS "OpenBSD"
+#endif
+
+#if defined(__NetBSD__)
+#define OPSYS "NetBSD"
+#endif
+
+#if defined(__sun__)
+#if defined(__SVR4) || defined(__svr4__)
+#define OPSYS "Solaris"
+#else
+#define OPSYS "SunOS"
+#endif
+#endif
+
+#if defined(__HAIKU__)
+#define OPSYS "Haiku"
+#endif
+
+/* Detect CPUs */
+#if defined(__alpha__) || defined(__alpha)
+#define CPUINFO "Alpha"
+#endif
+
+#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(_M_X64)
+#define CPUINFO "AMD64"
+#endif
+
+#if defined(__arm__) || defined(__thumb__) || defined(_ARM) || defined(__TARGET_ARCH_ARM)
+#define CPUINFO "ARM"
+#endif
+
+#if defined(__i386__) || defined(__i386) || defined(i386) || defined(_M_IX86) || defined(__X86__) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) || defined(__THW_INTEL__)
+#define CPUINFO "i386"
+#endif
+
+#if defined(__ia64__) || defined(_IA64) || defined(__IA64__) || defined(__ia64) || defined(_M_IA64)
+#define CPUINFO "IA64"
+#endif
+
+#if defined(__hppa__) || defined(__hppa)
+#define CPUINFO "PARISC"
+#endif
+
+#if defined(__m68k__) || defined(M68000)
+#define CPUINFO "M68K"
+#endif
+
+#if defined(__mips__) || defined(mips) || defined(__mips) || defined(__MIPS__)
+#define CPUINFO "MIPS"
+#endif
+
+#if defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC) || defined(__powerpc) || defined(__powerpc__)
+#define CPUINFO "PowerPC"
+#endif
+
+#if defined(__sparc__) || defined(__sparc)
+#define CPUINFO "SPARC"
+#endif
+
+#if defined(__sh__)
+#define CPUINFO "SuperH"
+#endif
+
+/* Misc */
 #ifdef MSG_NOSIGNAL
 #define UHUB_SEND_SIGNAL MSG_NOSIGNAL
 #else
@@ -130,8 +224,36 @@
 #define INET6_ADDRSTRLEN 46
 #endif
 
+#ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef HAVE_SSIZE_T
+typedef int ssize_t;
+#define HAVE_SSIZE_T
+#endif
+
+#ifdef _MSC_VER
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+#endif
+
+
+#ifdef _MSC_VER
+#define strdup _strdup
+#define snprintf _snprintf
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define atoll _atoi64
+#include <io.h>
+#define open _open
+#define close _close
+#define read _read
+#define NEED_GETOPT
+#endif
 
 #endif /* HAVE_UHUB_SYSTEM_H */

src/tools/adcclient.c

@@ -75,19 +75,13 @@ static void event_callback(struct net_connection* con, int events, void *arg)
 {
 	struct ADC_client* client = (struct ADC_client*) net_con_get_ptr(con);
 
-	if (events == NET_EVENT_SOCKERROR || events == NET_EVENT_CLOSED)
-	{
-		printf("NET_EVENT_SOCKERROR || NET_EVENT_CLOSED\n");
-		client->callback(client, ADC_CLIENT_DISCONNECTED, 0);
-		return;
-	}
-
 	if (events == NET_EVENT_TIMEOUT)
 	{
 		if (client->state == ps_conn)
 		{
 			client->callback(client, ADC_CLIENT_DISCONNECTED, 0);
 		}
+		return;
 	}
 
 	if (events & NET_EVENT_READ)

src/tools/adcrush.c

@@ -330,7 +330,7 @@ void runloop(size_t clients)
 
 	while (running)
 	{
-		event_base_loop(net_get_evbase(), EVLOOP_ONCE);
+		net_backend_process();
 	}
 
 	for (n = 0; n < clients; n++)
@@ -413,63 +413,17 @@ void parse_command_line(int argc, char** argv)
 	}
 }
 
-#ifndef WIN32
-static void handle_signal(int signal, short events, void* arg)
-{
-	switch (signal)
-	{
-		case SIGINT:
-		case SIGTERM:
-			running = 0;
-			break;
-		default:
-			break;
-	}
-}
-
-static struct event signal_events[10];
-static int signals[] =
-{
-	SIGINT,  /* Interrupt the application */
-	SIGTERM, /* Terminate the application */
-	0
-};
-
-void setup_signal_handlers()
-{
-	int i = 0;
-	for (i = 0; signals[i]; i++)
-	{
-		signal_set(&signal_events[i], signals[i], handle_signal, NULL);
-		signal_add(&signal_events[i], NULL);
-	}
-}
-
-void shutdown_signal_handlers()
-{
-	int i = 0;
-	for (i = 0; signals[i]; i++)
-	{
-		signal_del(&signal_events[i]);
-	}
-}
-#endif /* WIN32 */
-
-
 int main(int argc, char** argv)
 {
 	parse_command_line(argc, argv);
 	
 	net_initialize();
-	setup_signal_handlers();
 
 	hub_log_initialize(NULL, 0);
 	hub_set_log_verbosity(1000);
 
 	runloop(cfg_clients);
 
-	shutdown_signal_handlers();
 	net_destroy();
-
 	return 0;
 }

src/tools/admin.c

@@ -26,6 +26,7 @@ static int handle(struct ADC_client* client, enum ADC_client_callback_type type,
 
 		case ADC_CLIENT_PASSWORD_REQ:
 			puts("*** Requesting password.");
+			break;
 
 		case ADC_CLIENT_LOGGED_IN:
 			puts("*** Logged in.");
@@ -63,6 +64,7 @@ static int handle(struct ADC_client* client, enum ADC_client_callback_type type,
 	return 1;
 }
 
+static int running = 1;
 
 int main(int argc, char** argv)
 {
@@ -79,7 +81,7 @@ int main(int argc, char** argv)
 	ADC_client_set_callback(&client, handle);
 	ADC_client_connect(&client, argv[1]);
 
-	event_dispatch();
+	while (running && net_backend_process()) { }
 
 	ADC_client_destroy(&client);
 	net_destroy();

src/uhub.h

@@ -25,6 +25,8 @@
 /* #define MEMORY_DEBUG */
 /* #define DEBUG_SENDQ 1 */
 
+#define PLUGIN_SUPPORT
+
 #include "system.h"
 
 #ifndef WIN32
@@ -45,6 +47,7 @@
 
 #define MAX_CID_LEN  39
 #define MAX_NICK_LEN 64
+#define MAX_PASS_LEN 64
 #define MAX_UA_LEN   32
 #define TIGERSIZE    24
 
@@ -57,18 +60,23 @@ extern "C" {
 
 #include "adc/adcconst.h"
 
+#include "util/config_token.h"
+#include "util/credentials.h"
+#include "util/floodctl.h"
+#include "util/getopt.h"
 #include "util/ipcalc.h"
 #include "util/list.h"
 #include "util/log.h"
 #include "util/memory.h"
 #include "util/misc.h"
-#include "util/timeout.h"
 #include "util/tiger.h"
 
 #include "adc/sid.h"
 #include "adc/message.h"
+
 #include "network/network.h"
 #include "network/connection.h"
+#include "network/timeout.h"
 
 #include "core/auth.h"
 #include "core/config.h"
@@ -79,10 +87,17 @@ extern "C" {
 #include "core/user.h"
 #include "core/usermanager.h"
 #include "core/route.h"
+#include "core/pluginloader.h"
 #include "core/hub.h"
 #include "core/commands.h"
+#include "core/commands_builtin.h"
 #include "core/inf.h"
 #include "core/hubevent.h"
+#include "core/plugincallback.h"
+#include "core/plugininvoke.h"
+#include "core/pluginloader.h"
+
+
 
 #ifdef __cplusplus
 }