Branched off 0.2.x stable branch (0.2.x-stable)

.gitignore

@@ -1,8 +0,0 @@
-*~
-*.[oa]
-*.exe
-*.gch
-uhub-admin
-adcrush
-uhub
-

AUTHORS

@@ -2,5 +2,5 @@ Authors of uHub
 ===============
 
 Jan Vidar Krey, Design and implementation
-E_zombie, Centos/RedHat customization scripts and heavy load testing
+
 

BSDmakefile

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

ChangeLog

@@ -1,47 +1,3 @@
-0.3.3:
-- Fix SSL/TLS related memory leak.
-- Fix 100% CPU issue with SSL connections.
-- Added option to redirect from adc:// to adcs:// if tls is required.
-- Added more informative error messages for the configuration file parser.
-- Made sure logs can be rotated by sending a SIGHUP to the hub
-- Fix bug #139: Unable to use TLS - due to not handling quotes around configuration strings.
-- Fix bug #136 - !broadcast does not report status back to to sender.
-
-
-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

@@ -1,40 +1,27 @@
  ##
 ## Makefile for uhub (Use GNU make)
-## Copyright (C) 2007-2010, Jan Vidar Krey <janvidar@extatic.org>
+## Copyright (C) 2007-2008, Jan Vidar Krey <janvidar@extatic.org>
  #
 
--include Makefile.private
-
 CC            = gcc
 LD            := $(CC)
 MV            := mv
 RANLIB        := ranlib
 CFLAGS        += -pipe -Wall
-USE_SSL       ?= YES
+USE_PCH       ?= YES
+USE_SSL       ?= NO
 USE_BIGENDIAN ?= AUTO
 BITS          ?= AUTO
 SILENT        ?= YES
+LDLIBS        += -levent
 TERSE         ?= NO
 STACK_PROTECT ?= NO
 
 ifeq ($(OS), Windows_NT)
 WINDOWS       ?= YES
-OPSYS ?= Windows
-else
-OPSYS ?= $(shell uname)
 endif
 
-ifeq ($(OPSYS),SunOS)
+ifeq ($(WINDOWS),YES)
-LDLIBS        += -lsocket -lnsl
-endif
-
-ifeq ($(OPSYS),Haiku)
-LDLIBS        += -lnetwork
-endif
-
-CFLAGS        += -I./src/
-
-ifeq ($(OPSYS),Windows)
 USE_BIGENDIAN := NO
 LDLIBS        += -lws2_32
 UHUB_CONF_DIR ?= c:/uhub/
@@ -52,17 +39,20 @@ BIN_EXT       ?=
 endif
 
 ifeq ($(SILENT),YES)
-	MSG_CC=@echo "  CC:" $(notdir $<) &&
+	MSG_CC=@echo "  CC:" $(notdir $^) &&
+	MSG_PCH=@echo " PCH:" $(notdir $@) &&
 	MSG_LD=@echo "  LD:" $(notdir $@) &&
 	MSG_AR=@echo "  AR:" $(notdir $@) &&
 else
 	MSG_CC=
+	MSG_PCH=
 	MSG_LD=
 	MSG_AR=
 endif
 
 ifeq ($(TERSE), YES)
 	MSG_CC=@
+	MSG_PCH=@
 	MSG_LD=@
 	MSG_AR=@
 	MSG_CLEAN=-n ""
@@ -70,10 +60,17 @@ else
 	MSG_CLEAN="Clean as a whistle"
 endif
 
+
+
+
+CFLAGS        += -I/source/libevent
+LDFLAGS       += -L/source/libevent
+
+-include release_setup.mk
 ifeq ($(RELEASE),YES)
-CFLAGS        += -O3 -DNDEBUG
+CFLAGS        += -Os -DNDEBUG
 else
-CFLAGS        += -ggdb -DDEBUG
+CFLAGS        += -g -DDEBUG
 endif
 
 ifeq ($(STACK_PROTECT),YES)
@@ -91,6 +88,13 @@ CFLAGS        += -finstrument-functions
 CFLAGS        += -DDEBUG_FUNCTION_TRACE
 endif
 
+ifeq ($(USE_PCH),YES)
+PCHSRC=src/uhub.h
+PCH=src/uhub.h.gch
+else
+PCH=
+endif
+
 ifneq ($(BITS), AUTO)
 ifeq ($(BITS), 64)
 CFLAGS        += -m64
@@ -118,123 +122,125 @@ CFLAGS        += -DSSL_SUPPORT
 LDLIBS        += -lssl
 endif
 
-GIT_VERSION=$(shell git describe --tags 2>/dev/null || echo "")
+ifneq ($(LIBEVENT_PATH),)
-GIT_REVISION=$(shell git show --abbrev-commit  2>/dev/null | head -n 1 | cut -f 2 -d " " || echo "")
+CFLAGS        += -I$(LIBEVENT_PATH)
-OLD_REVISION=$(shell grep GIT_REVISION revision.h 2>/dev/null | cut -f 3 -d " " | tr -d "\"")
+LDFLAGS       += -L$(LIBEVENT_PATH)
+endif
 
 # Sources
 libuhub_SOURCES := \
-		src/core/auth.c \
+		src/auth.c \
-		src/core/commands.c \
+		src/commands.c \
-		src/core/config.c \
+		src/config.c \
-		src/core/eventqueue.c \
+		src/eventqueue.c \
-		src/core/floodctl.c \
+		src/hubevent.c \
-		src/core/hub.c \
+		src/hub.c \
-		src/core/hubevent.c \
+		src/inf.c \
-		src/core/hubio.c \
+		src/ipcalc.c \
-		src/core/inf.c \
+		src/list.c \
-		src/core/netevent.c \
+		src/log.c \
-		src/core/probe.c \
+		src/memory.c \
-		src/core/route.c \
+		src/message.c \
-		src/core/user.c \
+		src/misc.c \
-		src/core/usermanager.c \
+		src/netevent.c \
-		src/network/backend.c \
+		src/network.c \
-		src/network/connection.c \
+		src/rbtree.c \
-		src/network/epoll.c \
+		src/route.c \
-		src/network/kqueue.c \
+		src/sid.c \
-		src/network/network.c \
+		src/tiger.c \
-		src/network/select.c \
+		src/user.c \
-		src/network/timeout.c \
+		src/usermanager.c
-		src/network/timer.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/tiger.c
 
-libadc_common_SOURCES := \
+uhub_SOURCES := src/main.c
-		src/adc/message.c \
-		src/adc/sid.c
 
-libadc_client_SOURCES := \
+adcrush_SOURCES := src/adcrush.c
-		src/tools/adcclient.c
 
-uhub_SOURCES := src/core/main.c
+uhub_HEADERS := \
-
+		src/adcconst.h \
-adcrush_SOURCES := src/tools/adcrush.c
+		src/auth.h \
-
+		src/config.h \
-admin_SOURCES := src/tools/admin.c
+		src/eventid.h \
+		src/eventqueue.h \
+		src/hubevent.h \
+		src/hub.h \
+		src/inf.h \
+		src/ipcalc.h \
+		src/list.h \
+		src/log.h \
+		src/memory.h \
+		src/message.h \
+		src/misc.h \
+		src/netevent.h \
+		src/network.h \
+		src/rbtree.h \
+		src/route.h \
+		src/sid.h \
+		src/tiger.h \
+		src/uhub.h \
+		src/user.h \
+		src/usermanager.h
 
 autotest_SOURCES := \
-		autotest/test_eventqueue.tcc \
+		autotest/test_message.tcc \
-		autotest/test_hub.tcc \
-		autotest/test_inf.tcc \
-		autotest/test_ipfilter.tcc \
 		autotest/test_list.tcc \
 		autotest/test_memory.tcc \
-		autotest/test_message.tcc \
+		autotest/test_ipfilter.tcc \
+		autotest/test_inf.tcc \
+		autotest/test_hub.tcc \
 		autotest/test_misc.tcc \
-		autotest/test_sid.tcc \
 		autotest/test_tiger.tcc \
-		autotest/test_timer.tcc \
+		autotest/test_usermanager.tcc \
-		autotest/test_usermanager.tcc
+		autotest/test_eventqueue.tcc
 
 autotest_OBJECTS = autotest.o
 
 # Source to objects
 libuhub_OBJECTS := $(libuhub_SOURCES:.c=.o)
-libadc_client_OBJECTS := $(libadc_client_SOURCES:.c=.o)
-libadc_common_OBJECTS := $(libadc_common_SOURCES:.c=.o)
-
 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) $(adcrush_OBJECTS) $(autotest_OBJECTS)
 
+LIBUHUB=libuhub.a
 uhub_BINARY=uhub$(BIN_EXT)
 adcrush_BINARY=adcrush$(BIN_EXT)
-admin_BINARY=uhub-admin$(BIN_EXT)
 autotest_BINARY=autotest/test$(BIN_EXT)
 
-.PHONY: revision.h.tmp
+%.o: %.c
+	$(MSG_CC) $(CC) -c $(CFLAGS) -o $@.tmp $^ && \
+	$(MV) $@.tmp $@
 
-%.o: %.c version.h revision.h
+all: $(uhub_BINARY) $(PCH)
-	$(MSG_CC) $(CC) -c $(CFLAGS) -o $@ $<
 
-all: $(uhub_BINARY)
+$(adcrush_BINARY): $(PCH) $(LIBUHUB) $(adcrush_OBJECTS)
+	$(MSG_LD) $(CC) -o $@.tmp $(adcrush_OBJECTS) $(LIBUHUB) $(LDFLAGS) $(LDLIBS) && \
+        $(MV) $@.tmp $@
 
-$(adcrush_BINARY): $(adcrush_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+$(uhub_BINARY): $(PCH) $(LIBUHUB) $(uhub_OBJECTS)
-	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	$(MSG_LD) $(CC) -o $@.tmp $(uhub_OBJECTS) $(LIBUHUB) $(LDFLAGS) $(LDLIBS) && \
+	$(MV) $@.tmp $@
 
-$(admin_BINARY): $(admin_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+$(LIBUHUB): $(libuhub_OBJECTS)
-	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	$(MSG_AR) $(AR) rc $@.tmp $^ && \
+	$(RANLIB) $@.tmp && \
+	$(MV) $@.tmp $@
 
-$(uhub_BINARY): $(uhub_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS)
+ifeq ($(USE_PCH),YES)
-	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+$(PCH): $(uhub_HEADERS)
+	$(MSG_PCH) $(CC) $(CFLAGS) -o $@.tmp $(PCHSRC) && \
+	$(MV) $@.tmp $@
+endif
 
 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 $@ $<
+	$(MSG_CC) $(CC) -c $(CFLAGS) -Isrc -o $@.tmp $< && \
+	$(MV) $@.tmp $@
 
-$(autotest_BINARY): $(autotest_OBJECTS) $(libuhub_OBJECTS) $(libadc_common_OBJECTS) $(libadc_client_OBJECTS)
+$(autotest_BINARY): $(autotest_OBJECTS) $(LIBUHUB)
-	$(MSG_LD) $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	$(MSG_LD) $(CC) -o $@.tmp $^ $(LDFLAGS) $(LDLIBS) && \
+	$(MV) $@.tmp $@
 
 autotest: $(autotest_BINARY)
 	@./$(autotest_BINARY) -s -f
@@ -254,10 +260,11 @@ install: $(uhub_BINARY)
 endif
 
 dist-clean:
-	@rm -rf $(all_OBJECTS) *~ core
+	@rm -rf $(all_OBJECTS) $(PCH) *~ core
 
 clean:
-	@rm -rf $(libuhub_OBJECTS) *~ core $(uhub_BINARY) $(admin_BINARY) $(autotest_BINARY) $(adcrush_BINARY) $(all_OBJECTS) autotest.c revision.h revision.h.tmp && \
+	@rm -rf $(libuhub_OBJECTS) $(PCH) *~ core $(uhub_BINARY) $(LIBUHUB) $(all_OBJECTS) && \
 	echo $(MSG_CLEAN)
 
+-include release_targets.mk
 

README

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

autotest/test_hub.tcc

@@ -10,8 +10,8 @@ static void create_test_user()
 	if (g_user)
 		return;
 
-	g_user = (struct hub_user*) malloc(sizeof(struct hub_user));
+	g_user = (struct user*) malloc(sizeof(struct user));
-	memset(g_user, 0, sizeof(struct hub_user));
+	memset(g_user, 0, sizeof(struct user));
 	memcpy(g_user->id.nick, "exotic-tester", 13);
 	g_user->sid = 1;
 }
@@ -23,7 +23,6 @@ EXO_TEST(hub_net_startup, {
 
 EXO_TEST(hub_config_initialize, {
 	config_defaults(&g_config);
-	g_config.server_port = 65111;
 	return 1;
 });
 
@@ -68,5 +67,5 @@ EXO_TEST(hub_service_shutdown, {
 });
 
 EXO_TEST(hub_net_shutdown, {
-	return (net_destroy() != -1);
+	return (net_shutdown() != -1);
 });

autotest/test_inf.tcc

@@ -5,17 +5,17 @@
 #define USER_NICK "Friend"
 #define USER_SID "AAAB"
 
-static struct hub_user* inf_user       = 0;
+static struct user* inf_user       = 0;
 static struct hub_info* inf_hub    = 0;
 
-extern int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd);
+extern int hub_handle_info_login(struct hub_info* hub, struct user* user, struct adc_message* cmd);
 
 static void inf_create_hub()
 {
 	inf_hub = (struct hub_info*) hub_malloc_zero(sizeof(struct hub_info));
-	inf_hub->users = (struct hub_user_manager*) hub_malloc_zero(sizeof(struct hub_user_manager));
+	inf_hub->users = (struct user_manager*) hub_malloc_zero(sizeof(struct user_manager));
 	inf_hub->users->list = list_create();
-	inf_hub->users->sids = sid_pool_create(500);
+	inf_hub->users->free_sid = 1;
 	
 	inf_hub->acl = (struct acl_handle*) hub_malloc_zero(sizeof(struct acl_handle));
 	inf_hub->config = (struct hub_config*) hub_malloc_zero(sizeof(struct hub_config));
@@ -28,7 +28,6 @@ static void inf_destroy_hub()
 {
 	/* FIXME */
 	list_destroy(inf_hub->users->list);
-	sid_pool_destroy(inf_hub->users->sids);
 	acl_shutdown(inf_hub->acl);
 	free_config(inf_hub->config);
 	hub_free(inf_hub->users);
@@ -41,8 +40,9 @@ static void inf_destroy_hub()
 static void inf_create_user()
 {
 	if (inf_user) return;
-	inf_user = (struct hub_user*) hub_malloc_zero(sizeof(struct hub_user));
+	inf_user = (struct user*) hub_malloc_zero(sizeof(struct user));
 	inf_user->id.sid = 1;
+	inf_user->sd  = -1;
 	inf_user->limits.upload_slots = 1;
 }
 

autotest/test_ipfilter.tcc

@@ -9,8 +9,8 @@ static struct ip_addr_encap ip6_a;
 static struct ip_addr_encap ip6_b;
 static struct ip_addr_encap ip6_c;
 static struct ip_addr_encap mask;
-static struct ip_range ban6;
+static struct ip_ban_record ban6;
-static struct ip_range ban4;
+static struct ip_ban_record ban4;
 
 EXO_TEST(prepare_network, {
     return net_initialize() == 0;
@@ -405,74 +405,74 @@ EXO_TEST(check_ban_setup_1, {
 
 EXO_TEST(check_ban_ipv4_1, {
 	struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.0", &addr);
-	return ip_in_range(&addr, &ban4);
+	return acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_ipv4_2, {
 	struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.1", &addr);
-	return ip_in_range(&addr, &ban4);
+	return acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_ipv4_3, {
 	struct ip_addr_encap addr; ip_convert_to_binary("192.168.0.255", &addr);
-	return ip_in_range(&addr, &ban4);
+	return acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_ipv4_4, {
 	struct ip_addr_encap addr; ip_convert_to_binary("192.168.1.0", &addr);
-	return !ip_in_range(&addr, &ban4);
+	return !acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_ipv4_5, {
 	struct ip_addr_encap addr; ip_convert_to_binary("192.167.255.255", &addr);
-	return !ip_in_range(&addr, &ban4);
+	return !acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_ipv6_1, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:0", &addr);
-	return ip_in_range(&addr, &ban6);
+	return acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_ipv6_2, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:1", &addr);
-	return ip_in_range(&addr, &ban6);
+	return acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_ipv6_3, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:fffe", &addr);
-	return ip_in_range(&addr, &ban6);
+	return acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_ipv6_4, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefa:ffff", &addr);
-	return ip_in_range(&addr, &ban6);
+	return acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_ipv6_5, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fefb:0", &addr);
-	return !ip_in_range(&addr, &ban6);
+	return !acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_ipv6_6, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr);
-	return !ip_in_range(&addr, &ban6);
+	return !acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(check_ban_afmix_1, {
 	if (!ipv6) return 1;
 	struct ip_addr_encap addr; ip_convert_to_binary("2001::201:2ff:fef9:ffff", &addr);
-	return !ip_in_range(&addr, &ban4);
+	return !acl_check_ip_range(&addr, &ban4);
 });
 
 EXO_TEST(check_ban_afmix_2, {
 	struct ip_addr_encap addr; ip_convert_to_binary("10.20.30.40", &addr);
-	return !ip_in_range(&addr, &ban6);
+	return !acl_check_ip_range(&addr, &ban6);
 });
 
 EXO_TEST(ip4_bitwise_AND_1, {
@@ -594,28 +594,6 @@ EXO_TEST(ip6_bitwise_OR_3, {
 	return !strcmp(ip_convert_to_string(&ip6_c), "7777:cccc:3333:1111:ffff:ffff:ffff:1c1c");
 });
 
-EXO_TEST(ip_range_1, {
-	struct ip_range range; memset(&range, 0, sizeof(range));
-	return ip_convert_address_to_range("192.168.0.1", &range) && memcmp(&range.lo, &range.hi, sizeof(struct ip_addr_encap)) == 0;
-});
-
-EXO_TEST(ip_range_2, {
-	struct ip_range range; memset(&range, 0, sizeof(range));
-	return ip_convert_address_to_range("192.168.0.0-192.168.255.255", &range) && range.lo.af == range.hi.af && memcmp(&range.lo, &range.hi, sizeof(struct ip_addr_encap)) != 0;
-});
-
-EXO_TEST(ip_range_3, {
-	struct ip_range range; memset(&range, 0, sizeof(range));
-	return ip_convert_address_to_range("192.168.0.0/16", &range) && range.lo.af == range.hi.af && memcmp(&range.lo, &range.hi, sizeof(struct ip_addr_encap)) != 0;
-});
-
-EXO_TEST(ip_range_4, {
-	struct ip_range range1; memset(&range1, 0, sizeof(range1));
-	struct ip_range range2; memset(&range2, 0, sizeof(range2));
-	return ip_convert_address_to_range("192.168.0.0/16", &range1) && ip_convert_address_to_range("192.168.0.0-192.168.255.255", &range2) && memcmp(&range1, &range2, sizeof(struct ip_range)) == 0;
-});
-
-
 EXO_TEST(shutdown_network, {
-    return net_destroy() == 0;
+    return net_shutdown() == 0;
 });

autotest/test_memory.tcc

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

autotest/test_message.tcc

@@ -1,5 +1,5 @@
 #include <uhub.h>
-static struct hub_user* g_user = 0;
+static struct user* g_user = 0;
 static const char* test_string1 = "IINF AAfoo BBbar CCwhat\n";
 static const char* test_string2 = "BMSG AAAB Hello\\sWorld!\n";
 static const char* test_string3 = "BINF AAAB IDAN7ZMSLIEBL53OPTM7WXGSTXUS3XOY6KQS5LBGX NIFriend DEstuff SL3 SS0 SF0 VEQuickDC/0.4.17 US6430 SUADC0,TCP4,UDP4 I4127.0.0.1 HO5 HN1 AW\n";
@@ -11,8 +11,8 @@ static void create_test_user()
 	if (g_user)
 		return;
 
-	g_user = (struct hub_user*) malloc(sizeof(struct hub_user));
+	g_user = (struct user*) malloc(sizeof(struct user));
-	memset(g_user, 0, sizeof(struct hub_user));
+	memset(g_user, 0, sizeof(struct user));
 	memcpy(g_user->id.nick, "exotic-tester", 13);
 	g_user->id.sid = 1;
 }
@@ -31,9 +31,7 @@ EXO_TEST(adc_message_parse_1, {
 
 EXO_TEST(adc_message_parse_2, {
 	struct adc_message* msg = adc_msg_create(test_string2);
-	int ok = (msg != NULL);
+	return msg == NULL;
-	adc_msg_free(msg);
-	return ok;
 });
 
 EXO_TEST(adc_message_parse_3, {

autotest/test_sid.tcc

@@ -1,138 +0,0 @@
-#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

@@ -1,119 +0,0 @@
-#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_usermanager.tcc

@@ -1,109 +0,0 @@
-#include <uhub.h>
-
-#define MAX_USERS 64
-
-static struct hub_info um_hub;
-static struct hub_user um_user[MAX_USERS];
-// static struct net_connection um_cons[MAX_USERS];
-
-EXO_TEST(um_test_setup, {
-	int i = 0;
-	memset(&um_hub,  0, sizeof(um_hub));
-	
-	for (i = 0; i < MAX_USERS; i++)
-	{
-/*		memset(&um_cons[i], 0, sizeof(struct net_connection));
-		um_cons[i].sd = -1;
-
-		memset(&um_user[i], 0, sizeof(struct hub_user));
-		um_user[i].id.sid = i+1;
-		um_user[i].connection = &um_cons[i];*/
-	}
-	return 1;
-});
-
-EXO_TEST(um_init_1, {
-	return uman_init(0) != 0;
-});
-
-EXO_TEST(um_init_2, {
-	return uman_init(&um_hub) == 0;
-});
-
-EXO_TEST(um_shutdown_1, {
-	return uman_shutdown(0) == -1;
-});
-
-EXO_TEST(um_shutdown_2, {
-	return uman_shutdown(&um_hub) == 0;
-});
-
-EXO_TEST(um_shutdown_3, {
-	return uman_shutdown(&um_hub) == -1;
-});
-
-EXO_TEST(um_init_3, {
-	return uman_init(&um_hub) == 0;
-});
-
-EXO_TEST(um_add_1, {
-	return uman_add(&um_hub, &um_user[0]) == 0;
-});
-
-EXO_TEST(um_size_1, {
-	return hub_get_user_count(&um_hub) == 1;
-});
-
-
-EXO_TEST(um_remove_1, {
-	return uman_remove(&um_hub, &um_user[0]) == 0;
-});
-
-EXO_TEST(um_size_2, {
-	return hub_get_user_count(&um_hub) == 0;
-});
-
-
-EXO_TEST(um_add_2, {
-	int i;
-	for (i = 0; i < MAX_USERS; i++)
-	{
-		if (uman_add(&um_hub, &um_user[i]) != 0)
-			return 0;
-	}
-	return 1;
-});
-
-EXO_TEST(um_size_3, {
-	return hub_get_user_count(&um_hub) == MAX_USERS;
-});
-
-EXO_TEST(um_add_3, {
-	return uman_add(&um_hub, &um_user[5]) != 0;
-});
-
-EXO_TEST(um_remove_2, {
-	int i;
-	for (i = 0; i < MAX_USERS; i++)
-	{
-		if (uman_remove(&um_hub, &um_user[i]) != 0)
-			return 0;
-	}
-	return 1;
-});
-
-
-
-
-
-
-
-
-
-
-
-
-/* Last test */
-EXO_TEST(um_shutdown_4, {
-	return uman_shutdown(&um_hub) == 0;
-});

debian/changelog

@@ -1,31 +0,0 @@
-uhub (0.3.3-1) unstable; urgency=low
-
-  * Updated upstream version.
-
-  -- Jan Vidar Krey <janvidar@extatic.org>  Tue 24 Aug 2010 18:00:00 +0200
-
-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

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

debian/control

@@ -1,24 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,45 +0,0 @@
-#!/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

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

debian/uhub.dirs

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

debian/uhub.docs

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

debian/uhub.init

@@ -1,92 +0,0 @@
-#!/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

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

debian/uhub.manpages

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

debian/uhub.postinst

@@ -1,27 +0,0 @@
-#!/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

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

debian/uhub.prerm

@@ -1,10 +0,0 @@
-#!/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,13 +8,19 @@ 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
 
-Linux, Mac OSX, FreeBSD, NetBSD and OpenBSD
+Linux and Mac OSX
--------------------------------------------
+-----------------
 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,15 +43,4 @@ 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,101 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Uhub ( http://www.extatic.org/uhub ) daemons on RHEL\CentOS \
-#	       used to provide p2p network services.
-#
-# pidfile: /var/run/uhub.pid
-# config:  /etc/uhub/uhub.conf
-
-
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
-else
-  exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/uhub ]; then
-   . /etc/sysconfig/uhub
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 1
-
-# Check that uhub.conf exists.
-[ -f /etc/uhub/uhub.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
-        KIND="Uhub"
-	echo -n $"Starting $KIND services: "
-	daemon uhub $UHUBOPTIONS
-	RETVAL=$?
-        echo "" 
-	return $RETVAL
-}	
-
-stop() {
-        KIND="Uhub"
-	echo -n $"Shutting down $KIND services: "
-	killproc uhub
-	RETVAL=$?
-	echo ""
-	return $RETVAL
-}	
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-        echo -n $"Reloading uhub.conf / user.conf file: "
-	killproc uhub -HUP
-	RETVAL=$?
-	echo ""
-	return $RETVAL
-}	
-
-rhstatus() {
-	status uhub                                                                                                                                                   
-        RETVAL=$?                                                                                                                                                     
-        if [ $RETVAL -ne 0 ] ; then                                                                                                                                   
-                return $RETVAL                                                                                                                                        
-        fi                                                                                                                                                            
-}                 
-
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  reload)
-  	reload
-	;;
-  status)
-  	rhstatus
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart|reload|status}"
-	exit 2
-esac
-
-exit $?

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

@@ -1,14 +0,0 @@
-# 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

@@ -1,13 +0,0 @@
-# Options to UHUB
-#  -v          Verbose mode. Add more -v's for higher verbosity.
-#  -q          Quiet mode - no output
-#  -f          Fork to background
-#  -l <file>   Log messages to given file (default: stderr)
-#  -L          Log messages to syslog
-#  -c <file>   Specify configuration file (default: /etc/uhub/uhub.conf)
-#  -S          Show configuration parameters, but ignore defaults
-#  -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/rules.txt

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

doc/uhub.conf

@@ -4,8 +4,7 @@
 #
 # This file is read only to the uhub deamon, and if you
 # make changes to it while uhub is running you can send a
-# HUP signal to it ( $ killall -HUP uhub ), to reparse configuration (only on UNIX).
+# HUP signal to it, to reparse configuration (only on UNIX). 
-# All configuration directives: http://www.uhub.org/config.php
 
 # Bind to this port and address
 # server_bind_addr=any means listen to "::" if IPv6 is supported
@@ -13,18 +12,12 @@
 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 "Powered by uHub/{VERSION}".
+# If 1, will show a "This hub is running 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
 
@@ -45,52 +38,6 @@ file_acl=/etc/uhub/users.conf
 # Normally this message is sent to clients when connecting.
 file_motd=/etc/uhub/motd.txt
 
-# 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
-
-
-# Slots/share/hubs limits
-limit_max_hubs_user = 0
-limit_max_hubs_reg = 0
-limit_max_hubs_op = 0
-limit_max_hubs = 0
-limit_min_hubs_user = 0
-limit_min_hubs_reg = 0
-limit_min_hubs_op = 0
-limit_min_share = 0
-#    Example:
-#    To require users to share at least 1 GB in order to enter the hub:
-#    limit_min_share = 1024
-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
 msg_hub_disabled               = Hub is disabled
@@ -114,23 +61,6 @@ msg_ban_permanently            = Banned permanently
 msg_ban_temporarily            = Banned temporarily
 msg_auth_invalid_password      = Password is wrong
 msg_auth_user_not_found        = User not found in password database
-msg_user_share_size_low	       = User is not sharing enough
-msg_user_share_size_high       = User is sharing too much
-msg_user_slots_low	       = User have too few upload slots
-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

@@ -1,42 +0,0 @@
-# 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

@@ -1,85 +0,0 @@
-Summary: High performance ADC p2p hub.
-Name: uhub
-Version: 0.3.3
-Release: 3
-License: GPLv3
-Group: Networking/File transfer
-Source: uhub-%{version}.tar.gz
-URL: http://www.uhub.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-
-%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
-
-
-%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
-
-install uhub $RPM_BUILD_ROOT/usr/bin/
-> doc/motd.txt
-install -m644 doc/uhub.conf doc/users.conf doc/rules.txt doc/motd.txt $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
-
-
-%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
-%{_sysconfdir}/init.d/uhub
-%config(noreplace) %{_sysconfdir}/logrotate.d/uhub
-%config(noreplace) %{_sysconfdir}/sysconfig/uhub
-/usr/share/man/man1/uhub.1.gz
-%{_bindir}/uhub
-
-
-%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 Jan 31 2010 E_zombie
-- change GROUP
-- chmod for files
-- add postinstall scripts
-- fix "License"
-* Tue Jan 26 2010 E_zombie
-- first .spec release
-
-

doc/users.conf

@@ -12,8 +12,8 @@
 # 'ban_cid'    - banned user by cid
 
 # Administrator
-# user_admin    userA:password1
+user_admin    Dj_Offset:uhub
-# user_op       userB:password2
+user_op       janvidar:password
 
 # We don't want users with these names
 deny_nick Hub-Security

src/adc/sid.c

@@ -1,155 +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/>.
- *
- */
-
-#include "uhub.h"
-
-const char* BASE32_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-
-char* sid_to_string(sid_t sid_)
-{
-	static char t_sid[5];
-	sid_t sid = (sid_ & 0xFFFFF); /*  20 bits only */
-	sid_t A, B, C, D = 0;
-	D     = (sid % 32);
-	sid   = (sid - D) / 32;
-	C     = (sid % 32);
-	sid   = (sid - C) / 32;
-	B     = (sid % 32);
-	sid   = (sid - B) / 32;
-	A     = (sid % 32);
-	t_sid[0] = BASE32_ALPHABET[A];
-	t_sid[1] = BASE32_ALPHABET[B];
-	t_sid[2] = BASE32_ALPHABET[C];
-	t_sid[3] = BASE32_ALPHABET[D];
-	t_sid[4] = 0;
-	return t_sid;
-}
-
-
-sid_t string_to_sid(const char* sid)
-{
-	sid_t nsid = 0;
-	sid_t n, x;
-	sid_t factors[] = { 32768, 1024, 32, 1};
-	
-	if (!sid || strlen(sid) != 4) return 0;
-
-	for (n = 0; n < 4; n++) {
-		for (x = 0; x < strlen(BASE32_ALPHABET); x++)
-			if (sid[n] == BASE32_ALPHABET[x]) break;
-		if (x == 32) return 0;
-		nsid += x * factors[n];
-	}
-	return nsid;
-}
-
-/*
- * Session IDs are heavily reused, since they are a fairly scarce
- * resource. Only one (2^10)-1 exist, since it is a four byte base32-encoded
- * value and 'AAAA' (0) is reserved for the hub.
- *
- * Initialize with sid_initialize(), which sets min and max to one, and count to 0.
- *
- * When allocating a session ID:
- * - If 'count' is less than the pool size (max-min), then allocate within the pool
- * - Increase the pool size (see below)
- * - If unable to do that, hub is really full - don't let anyone in!
- *
- * When freeing a session ID:
- * - If the session ID being freed is 'max', then decrease the pool size by one.
- *
- */
-
-struct sid_pool
-{
-	sid_t min;
-	sid_t max;
-	sid_t count;
-	struct hub_user** map;
-};
-
-
-struct sid_pool* sid_pool_create(sid_t max)
-{
-	struct sid_pool* pool = hub_malloc(sizeof(struct sid_pool));
-	if (!pool)
-		return 0;
-
-	pool->min = 1;
-	pool->max = max + 1;
-	pool->count = 0;
-	pool->map = hub_malloc_zero(sizeof(struct hub_user*) * pool->max);
-	if (!pool->map)
-	{
-		hub_free(pool);
-		return 0;
-	}
-	pool->map[0] = (struct hub_user*) pool; /* hack to reserve the first sid. */
-
-#ifdef DEBUG_SID
-	LOG_DUMP("SID_POOL:  max=%d", (int) pool->max);
-#endif
-	return pool;
-}
-
-void sid_pool_destroy(struct sid_pool* pool)
-{
-#ifdef DEBUG_SID
-	LOG_DUMP("SID_POOL:  destroying, current allocs=%d", (int) pool->count);
-#endif
-	hub_free(pool->map);
-	hub_free(pool);
-}
-
-sid_t sid_alloc(struct sid_pool* pool, struct hub_user* user)
-{
-	sid_t n;
-	if (pool->count >= (pool->max - pool->min))
-	{
-#ifdef DEBUG_SID
-		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
-	LOG_DUMP("SID_ALLOC: %d, user=%p", (int) n, user);
-#endif
-	pool->map[n] = user;
-	return n;
-}
-
-void sid_free(struct sid_pool* pool, sid_t sid)
-{
-#ifdef DEBUG_SID
-	LOG_DUMP("SID_FREE:  %d", (int) sid);
-#endif
-	pool->map[sid] = 0;
-	pool->count--;
-}
-
-struct hub_user* sid_lookup(struct sid_pool* pool, sid_t sid)
-{
-	if (!sid || (sid >= pool->max))
-		return 0;
-	return pool->map[sid];
-}

src/adcrush.c

@@ -0,0 +1,951 @@
+/**
+ * An ADC client emulator.
+ */
+
+#include "uhub.h"
+
+#define ADC_CLIENTS_DEFAULT 100
+#define ADC_MAX_CLIENTS 25000
+
+#define ADC_BUFSIZE 16384
+#define ADC_SIDSIZE 4
+#define ADC_CID_SIZE 39
+
+#define BIG_BUFSIZE 131072
+#define TIGERSIZE 24
+
+#define ADC_HANDSHAKE "HSUP ADBASE ADTIGR\n"
+#define ADCRUSH "adcrush/0.2"
+#define ADC_NICK "[BOT]adcrush"
+#define ADC_DESC "crash\\stest\\sdummy"
+
+struct ADC_client;
+
+static void ADC_client_on_disconnected(struct ADC_client*);
+static void ADC_client_on_connected(struct ADC_client*);
+static void ADC_client_on_login(struct ADC_client*);
+static void ADC_client_connect(struct ADC_client*);
+static void ADC_client_disconnect(struct ADC_client*);
+static int  ADC_client_create(struct ADC_client* client, int num);
+static void ADC_client_destroy(struct ADC_client* client);
+
+static int cfg_mode     = 0; // See enum operationMode
+static char* cfg_host   = 0;
+static int cfg_port     = 0;
+static int cfg_debug    = 0; /* debug level */
+static int cfg_level    = 1; /* activity level (0..3) */
+static int cfg_chat     = 0; /* chat mode, allow sending chat messages */
+static int cfg_quiet    = 0; /* quiet mode (no output) */
+static int cfg_clients  = ADC_CLIENTS_DEFAULT; /* number of clients */
+
+static int running = 1;
+
+static struct sockaddr_in saddr;
+
+enum commandMode
+{
+	cm_bcast    = 0x01, /* B - broadcast */
+	cm_dir      = 0x02, /* D - direct message */
+	cm_echo     = 0x04, /* E - echo message */
+	cm_fcast    = 0x08, /* F - feature cast message */
+	cm_c2h      = 0x10, /* H - client to hub message */
+	cm_h2c      = 0x20, /* I - hub to client message */
+	cm_c2c      = 0x40, /* C - client to client message */
+	cm_udp      = 0x80, /* U - udp message (client to client) */
+};
+
+enum commandValidity
+{
+	cv_protocol = 0x01,
+	cv_identify = 0x02,
+	cv_verify   = 0x04,
+ 	cv_normal   = 0x08,
+};
+
+enum protocolState
+{
+	ps_none     = 0x00, /* none or disconnected */
+	ps_conn     = 0x01, /* connecting... */
+	ps_protocol = 0x02,
+	ps_identify = 0x04,
+	ps_verify   = 0x08,
+	ps_normal   = 0x10,
+};
+
+enum operationMode
+{
+	mode_performance = 0x01,
+	mode_bugs        = 0x02,
+	mode_security    = 0x04,
+	mode_log         = 0x08,
+};
+
+struct commandPattern
+{
+	unsigned char mode; /* see enum commandMode */
+	char cmd[3];
+	unsigned char validity; /* see enum commandValidity */
+};
+
+const struct commandPattern patterns[] =
+{
+	{ cm_c2h | cm_c2c | cm_h2c,                     "SUP", cv_protocol | cv_normal }, /* protocol support */
+	{ cm_bcast | cm_h2c | cm_c2c,                   "INF", cv_identify | cv_verify | cv_normal }, /* info message */
+	{ cm_bcast | cm_h2c | cm_c2c | cm_c2h | cm_udp, "STA", cv_protocol | cv_identify | cv_verify | cv_normal }, /* status message */
+	{ cm_bcast | cm_dir | cm_echo | cm_h2c,         "MSG", cv_normal },   /* chat message */
+	{ cm_bcast | cm_dir | cm_echo | cm_fcast,       "SCH", cv_normal },   /* search */
+	{ cm_dir | cm_udp,                              "RES", cv_normal },   /* search result */
+	{ cm_dir | cm_echo,                             "CTM", cv_normal },   /* connect to me */
+	{ cm_dir | cm_echo,                             "RCM", cv_normal },   /* reversed, connect to me */
+	{ cm_h2c,                                       "QUI", cv_normal },   /* quit message */
+	{ cm_h2c,                                       "GPA", cv_identify }, /* password request */
+	{ cm_c2h,                                       "PAS", cv_verify }    /* password response */
+};
+
+#define MAX_CHAT_MSGS 35
+const char* chat_messages[MAX_CHAT_MSGS] = {
+	"hello",
+	"I'm an annoying robot, configured to chat in order to measure performance of the hub.",
+	"I apologize for the inconvenience.",
+	".",
+	":)",
+	"can anyone help me, pls?",
+	"wtf?",
+	"bullshit",
+	"resistance is futile.", 
+	"You crossed the line first, sir. You squeezed them, you hammered them to the point of desperation. And in their desperation they turned to a man they didn't fully understand.",
+	"beam me up, scotty",
+	"morning",
+	"You know where Harvey is? You know who he is?",
+	"gtg",
+	"thanks",
+	"*punt*",
+	"*nudge*",
+	"that's ok",
+	"...anyway", 
+	"hola",
+	"hey",
+	"hi", 
+	"nevermind",
+	"i think so",
+	"dunno",
+	"debian ftw",
+	"oops",
+	"how do I search?",
+	"how do I enable active mode?",
+	"home, sweet home...",
+	"later",
+	"Good evening, ladies and gentlemen. We are tonight's entertainment! I only have one question. Where is Harvey Dent?",
+	"You know where I can find Harvey? I need to talk to him about something. Just something, a little.",
+	"We really should stop fighting, we'll miss the fireworks!",
+	"Wanna know how I got these scars?",
+};
+
+#define MAX_SEARCH_MSGS 10
+const char* search_messages[MAX_SEARCH_MSGS] = {
+	"ANmp3 TOauto",
+	"ANxxx TOauto",
+	"ANdivx TOauto",
+	"ANtest ANfoo TOauto",
+	"ANwmv TO1289718",
+	"ANbabe TO8981884",
+	"ANpr0n TOauto",
+	"ANmusic TOauto",
+	"ANvideo TOauto",
+	"ANburnout ANps3 TOauto",
+};
+
+struct ADC_client
+{
+	int  sd;
+	int  num;
+	sid_t sid;
+	enum protocolState state;
+	char info[ADC_BUFSIZE];
+	char recvbuf[BIG_BUFSIZE];
+	char sendbuf[BIG_BUFSIZE];
+	size_t s_offset;
+	size_t r_offset;
+	struct event ev_read;
+	struct event ev_write;
+	struct event ev_timer;
+	size_t timeout;
+};
+
+
+
+static void bot_output(struct ADC_client* client, const char* format, ...)
+{
+	char logmsg[1024];
+	va_list args;
+	va_start(args, format);
+	vsnprintf(logmsg, 1024, format, args);
+	va_end(args);
+	if (cfg_mode == mode_log)
+	{
+	    fprintf(stdout, "%s\n", logmsg);
+	}
+	else
+	{
+	    if (cfg_debug)
+		fprintf(stdout, "* [%4d] %s\n", client->num, logmsg);
+	}
+}
+
+static void adc_cid_pid(struct ADC_client* client)
+{
+	char seed[64];
+	char pid[64];
+	char cid[64];
+	uint64_t tiger_res1[3];
+	uint64_t tiger_res2[3];
+
+	/* create cid+pid pair */
+	memset(seed, 0, 64);
+	snprintf(seed, 64, ADCRUSH "%p/%d", client, (int) client->num);
+	
+	tiger((uint64_t*) seed, strlen(seed), tiger_res1);
+	base32_encode((unsigned char*) tiger_res1, TIGERSIZE, pid);
+	tiger((uint64_t*) tiger_res1, TIGERSIZE, tiger_res2);
+	base32_encode((unsigned char*) tiger_res2, TIGERSIZE, cid);
+	
+	cid[ADC_CID_SIZE] = 0;
+	pid[ADC_CID_SIZE] = 0;
+	
+	strcat(client->info, " PD");
+	strcat(client->info, pid);
+	strcat(client->info, " ID");
+	strcat(client->info, cid);
+}
+
+static size_t get_wait_rand(size_t max)
+{
+	static size_t next = 0;
+	if (next == 0) next = (size_t) time(0);
+	next = (next * 1103515245) + 12345;
+	return ((size_t )(next / 65536) % max);
+}
+
+static void client_reschedule_timeout(struct ADC_client* client)
+{
+	size_t next_timeout = 0;
+	struct timeval timeout = { 0, 0 };
+	
+	switch (client->state)
+	{
+		case ps_conn:     next_timeout = 30; break;
+		case ps_protocol: next_timeout = 30; break;
+		case ps_identify: next_timeout = 30; break;
+		case ps_verify:   next_timeout = 30; break;
+		case ps_normal:   next_timeout = 120; break;
+		case ps_none:     next_timeout = 120; break;
+	}
+	
+	if (client->state == ps_normal || client->state == ps_none)
+	{
+		switch (cfg_level)
+		{
+			case 0: /* polite */
+				next_timeout *= 4;
+				break;
+					
+			case 1: /* normal */
+				break;
+				
+			case 2: /* aggressive */
+				next_timeout /= 8;
+				break;
+				
+			case 3: /* excessive */
+				next_timeout /= 16;
+
+			case 4: /* excessive */
+				next_timeout /= 32;
+		}
+
+	}
+
+
+	if (client->state == ps_conn)
+		client->timeout = MAX(next_timeout, 1);
+	else
+		client->timeout = get_wait_rand(MAX(next_timeout, 1));
+
+	if (!client->timeout) client->timeout++;
+
+	timeout.tv_sec = (time_t) client->timeout;
+	evtimer_add(&client->ev_timer, &timeout);
+}
+
+static void set_state_timeout(struct ADC_client* client, enum protocolState state)
+{
+	client->state = state;
+	client_reschedule_timeout(client);
+}
+
+static void send_client(struct ADC_client* client, char* msg)
+{
+	int ret = net_send(client->sd, msg, strlen(msg), UHUB_SEND_SIGNAL);
+	
+	if (cfg_debug > 1)
+	{
+		char* dump = strdup(msg);
+		dump[strlen(msg) - 1] = 0;
+		bot_output(client, "- SEND: '%s'", dump);
+		free(dump);
+	}
+	
+ 	if (ret != strlen(msg))
+	{
+		if (ret == -1)
+		{
+			if (net_error() != EWOULDBLOCK)
+				ADC_client_on_disconnected(client);
+		}
+		else
+		{
+			/* FIXME: Not all data sent! */
+			printf("ret (%d) != msg->length (%d)\n", ret, (int) strlen(msg));
+		}
+	}
+}
+
+
+static void ADC_client_on_connected(struct ADC_client* client)
+{
+	send_client(client, ADC_HANDSHAKE);
+	set_state_timeout(client, ps_protocol);
+	bot_output(client, "connected.");
+}
+
+static void ADC_client_on_disconnected(struct ADC_client* client)
+{
+	event_del(&client->ev_read);
+	event_del(&client->ev_write);
+	
+	net_close(client->sd);
+	client->sd = -1;
+	
+	bot_output(client, "disconnected.");
+	set_state_timeout(client, ps_none);
+}
+
+static void ADC_client_on_login(struct ADC_client* client)
+{
+	bot_output(client, "logged in.");
+	set_state_timeout(client, ps_normal);
+}
+
+
+static void send_client_info(struct ADC_client* client)
+{
+	client->info[0] = 0;
+	strcat(client->info, "BINF ");
+	strcat(client->info, sid_to_string(client->sid));
+	strcat(client->info, " NI" ADC_NICK);
+	if (cfg_clients > 1)
+	{
+	    strcat(client->info, "_");
+	    strcat(client->info, uhub_itoa(client->num));
+	}
+	strcat(client->info, " VE" ADCRUSH);
+	strcat(client->info, " DE" ADC_DESC);
+	strcat(client->info, " I40.0.0.0");
+	strcat(client->info, " EMuhub@extatic.org");
+	strcat(client->info, " SL3");
+	strcat(client->info, " HN1");
+	strcat(client->info, " HR1");
+	strcat(client->info, " HO1");
+	
+	adc_cid_pid(client);
+	
+	strcat(client->info, "\n");
+	
+	send_client(client, client->info);
+}
+
+static void perf_result(struct ADC_client* client, sid_t target, const char* what, const char* token);
+
+static int recv_client(struct ADC_client* client)
+{
+	ssize_t size = 0;
+	if (cfg_mode != mode_performance || (cfg_mode == mode_performance && (get_wait_rand(100) < (90 - (15 * cfg_level)))))
+	{
+		size = net_recv(client->sd, &client->recvbuf[client->r_offset], ADC_BUFSIZE - client->r_offset, 0);
+	}
+	else
+	{
+		if (get_wait_rand(1000) == 99)
+			return -1; /* Can break tings badly! :-) */
+		else
+			return 0;
+	}
+	if (size == 0 || ((size == -1 && net_error() != EWOULDBLOCK)))
+		return -1;
+	client->recvbuf[client->r_offset + size] = 0;
+
+	char* start = client->recvbuf;
+	char* pos;
+	char* lastPos;
+	while ((pos = strchr(start, '\n')))
+	{
+		lastPos = pos;
+		pos[0] = 0;
+		
+		if (cfg_debug > 1)
+		{
+			bot_output(client, "- RECV: '%s'", start);
+		}
+		
+		fourcc_t cmd = 0;
+		if (strlen(start) < 4)
+		{
+			bot_output(client, "Unexpected response from hub: '%s'", start);
+			start = &pos[1];
+			continue;
+		}
+		
+		cmd = FOURCC(start[0], start[1], start[2], start[3]);
+		
+		switch (cmd)
+		{
+			case ADC_CMD_ISUP:
+				break;
+
+			case ADC_CMD_ISID:
+				if (client->state == ps_protocol)
+				{
+					client->sid = string_to_sid(&start[5]);
+					client->state = ps_identify;
+					send_client_info(client);
+					
+				}
+				break;
+				
+			case ADC_CMD_IINF:
+				break;
+			
+			case ADC_CMD_BSCH:
+			case ADC_CMD_FSCH:
+			{
+				if (get_wait_rand(100) > (90 - (10 * cfg_level)) && cfg_mode == mode_performance)
+				{
+					sid_t target = string_to_sid(&start[5]);
+					const char* what = strstr(&start[5], " AN");
+					const char* token = strstr(&start[5], " TO");
+					char* split = 0;
+					if (!token || !what) break;
+					
+					token += 3;
+					what += 3;
+
+					split = strchr(what, ' ');
+					if (!split) break;
+					else split[0] = '0';
+
+					split = strchr(token, ' ');
+					if (split) split[0] = '0';
+
+					perf_result(client, target, what, token);
+
+				}
+				break;
+			}
+			case ADC_CMD_BINF:
+			{
+				if (strlen(start) > 9)
+				{
+					char t = start[9]; start[9] = 0; sid_t sid = string_to_sid(&start[5]); start[9] = t;
+					
+					if (sid == client->sid)
+					{
+						if (client->state == ps_verify || client->state == ps_identify)
+						{
+							ADC_client_on_login(client);
+						}
+					}
+				}
+				break;
+			}
+			
+			case ADC_CMD_ISTA:
+				if (strncmp(start, "ISTA 000", 8))
+				{
+					bot_output(client, "status: '%s'\n", (start + 9));
+				}
+				break;
+				
+			default:
+				break;
+		}
+		
+		start = &pos[1];
+	}
+	
+	client->r_offset = strlen(lastPos);
+	memmove(client->recvbuf, lastPos, strlen(lastPos));
+	memset(&client->recvbuf[client->r_offset], 0, ADC_BUFSIZE-client->r_offset);
+	
+	
+	return 0;
+}
+
+void ADC_client_connect(struct ADC_client* client)
+{
+	struct timeval timeout = { TIMEOUT_IDLE, 0 };
+	net_connect(client->sd, (struct sockaddr*) &saddr, sizeof(struct sockaddr_in));
+	set_state_timeout(client, ps_conn);
+	event_add(&client->ev_read, &timeout);
+	event_add(&client->ev_write, &timeout);
+	bot_output(client, "connecting...");
+}
+
+void ADC_client_wait_connect(struct ADC_client* client)
+{
+	set_state_timeout(client, ps_none);
+	
+}
+
+
+
+void ADC_client_disconnect(struct ADC_client* client)
+{
+	if (client->sd != -1)
+	{
+		net_close(client->sd);
+		client->sd = -1;
+		event_del(&client->ev_read);
+		event_del(&client->ev_write);
+		bot_output(client, "disconnected.");
+		
+		if (running)
+		{
+			ADC_client_destroy(client);
+			ADC_client_create(client, client->num);
+			ADC_client_connect(client);
+		}
+
+	}
+}
+
+static void perf_chat(struct ADC_client* client, int priv)
+{
+	char buf[1024] = { 0, };
+	size_t r = get_wait_rand(MAX_CHAT_MSGS-1);
+	char* msg = adc_msg_escape(chat_messages[r]);
+
+	if (priv)
+	{
+		strcat(buf, "EMSG ");
+		strcat(buf, sid_to_string(client->sid));
+		strcat(buf, " ");
+		strcat(buf, sid_to_string(client->sid));
+	}
+	else
+	{
+		strcat(buf, "BMSG ");
+		strcat(buf, sid_to_string(client->sid));
+	}
+	strcat(buf, " ");
+
+	strcat(buf, msg);
+	hub_free(msg);
+	
+	strcat(buf, "\n");
+	send_client(client, buf);
+}
+
+static void perf_search(struct ADC_client* client)
+{
+	char buf[1024] = { 0, };
+	size_t r = get_wait_rand(MAX_SEARCH_MSGS-1);
+	size_t pst = get_wait_rand(100);
+	
+	if (pst > 80)
+	{
+		strcat(buf, "FSCH ");
+		strcat(buf, sid_to_string(client->sid));
+		strcat(buf, " +TCP4 ");
+	}
+	else
+	{
+		strcat(buf, "BSCH ");
+		strcat(buf, sid_to_string(client->sid));
+		strcat(buf, " ");
+	}
+	strcat(buf, search_messages[r]);
+	strcat(buf, "\n");
+	send_client(client, buf);
+}
+
+static void perf_result(struct ADC_client* client, sid_t target, const char* what, const char* token)
+{
+	char buf[1024] = { 0, };
+	strcat(buf, "DRES ");
+	strcat(buf, sid_to_string(client->sid));
+	strcat(buf, " ");
+	strcat(buf, sid_to_string(target));
+	strcat(buf, " FN" "test/");
+	strcat(buf, what);
+	strcat(buf, ".dat");
+	strcat(buf, " SL" "0");
+	strcat(buf, " SI" "908987128912");
+	strcat(buf, " TR" "5T6YJYKO3WECS52BKWVSOP5VUG4IKNSZBZ5YHBA");
+	strcat(buf, " TO");
+	strcat(buf, token);
+	strcat(buf, "\n");
+	send_client(client, buf);
+}
+
+static void perf_ctm(struct ADC_client* client)
+{
+	char buf[1024] = { 0, };
+	strcat(buf, "DCTM ");
+	strcat(buf, sid_to_string(client->sid));
+	strcat(buf, " ");
+	strcat(buf, sid_to_string(client->sid));
+	strcat(buf, " ");
+	strcat(buf, "ADC/1.0");
+	strcat(buf, " TOKEN111");
+	strcat(buf, sid_to_string(client->sid));
+	strcat(buf, "\n");
+	send_client(client, buf);
+}
+
+
+static void perf_update(struct ADC_client* client)
+{
+	char buf[1024] = { 0, };
+	int n = (int) get_wait_rand(10)+1;
+	
+	strcat(buf, "BINF ");
+	strcat(buf, sid_to_string(client->sid));
+	strcat(buf, " HN");
+	strcat(buf, uhub_itoa(n));
+
+	strcat(buf, "\n");
+	send_client(client, buf);
+}
+
+
+static void perf_normal_action(struct ADC_client* client)
+{
+	size_t r = get_wait_rand(5);
+	size_t p = get_wait_rand(100);
+
+	switch (r)
+	{
+		case 0:
+			if (p > (90 - (10 * cfg_level)))
+			{
+				if (cfg_debug > 1) bot_output(client, "timeout -> disconnect");
+				ADC_client_disconnect(client);
+			}
+			break;
+
+		case 1:
+			if (cfg_chat)
+			{
+				if (cfg_debug > 1) bot_output(client, "timeout -> chat");
+				perf_chat(client, 0);
+				
+			}
+			break;
+
+		case 2:
+			if (cfg_debug > 1) bot_output(client, "timeout -> search");
+			perf_search(client);
+			break;
+
+		case 3:
+			if (cfg_debug > 1) bot_output(client, "timeout -> update");
+			perf_update(client);
+			break;
+
+		case 4:
+			if (cfg_debug > 1) bot_output(client, "timeout -> privmsg");
+			perf_chat(client, 1);
+			break;
+
+		case 5:
+			if (cfg_debug > 1) bot_output(client, "timeout -> ctm/rcm");
+			perf_ctm(client);
+			break;
+
+	}
+
+	client_reschedule_timeout(client);
+}
+
+void event_callback(int fd, short ev, void *arg)
+{
+	struct ADC_client* client = (struct ADC_client*) arg;
+
+	if (ev & EV_READ)
+	{
+		if (recv_client(client) == -1)
+		{
+			ADC_client_on_disconnected(client);
+		}
+	}
+	
+	if (ev & EV_TIMEOUT)
+	{
+		if (client->state == ps_none)
+		{
+			if (client->sd == -1)
+			{
+				ADC_client_create(client, client->num);
+			}
+
+			ADC_client_connect(client);
+		}
+
+		if (fd == -1)
+		{
+			if (client->state == ps_normal && cfg_mode == mode_performance)
+			{
+				perf_normal_action(client);
+			}
+		}
+	}
+	
+	if (ev & EV_WRITE)
+	{
+		if (client->state == ps_conn)
+		{
+			ADC_client_on_connected(client);
+		}
+		else
+		{
+			/* FIXME: Call send again */
+		}
+
+	}
+}
+
+int ADC_client_create(struct ADC_client* client, int num)
+{
+	struct timeval timeout = { 0, 0 };
+	
+	memset(client, 0, sizeof(struct ADC_client));
+	client->num = num;
+	
+	client->sd = net_socket_create(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (client->sd == -1) return -1;
+	
+	event_set(&client->ev_write, client->sd, EV_WRITE, event_callback, client);
+	event_set(&client->ev_read,  client->sd, EV_READ | EV_PERSIST, event_callback, client);
+	
+	net_set_nonblocking(client->sd, 1);
+	
+	timeout.tv_sec = client->timeout;
+	evtimer_set(&client->ev_timer, event_callback, client);
+
+	set_state_timeout(client, ps_none);
+
+	return 0;
+}
+
+void ADC_client_destroy(struct ADC_client* client)
+{
+	ADC_client_disconnect(client);
+	evtimer_del(&client->ev_timer);
+}
+
+
+void runloop(size_t clients)
+{
+	size_t n = 0;
+	struct ADC_client* client[ADC_MAX_CLIENTS];
+
+	for (n = 0; n < clients; n++)
+	{
+		struct ADC_client* c = malloc(sizeof(struct ADC_client));
+		client[n] = c;
+
+		ADC_client_create(c, n);
+		if (n == 0)
+		{
+			ADC_client_connect(c);
+		}
+		else
+		{
+			ADC_client_wait_connect(c);
+		}
+	}
+	
+	event_dispatch();
+
+	for (n = 0; n < clients; n++)
+	{
+		ADC_client_destroy(client[n]);
+		free(client[n]);
+	}
+}
+
+static void print_version()
+{
+	printf(ADCRUSH "\n");
+	printf("Copyright (C) 2008-2009, Jan Vidar Krey\n");
+	printf("\n");
+}
+
+static void print_usage(const char* program)
+{
+	print_version();
+
+	printf("Usage: %s <mode> (adc://<host>:<port>) [options]\n", program);
+	
+	printf("\n");
+	printf("  Modes\n");
+	printf("    perf        Do performance testing using multiple clients\n");
+	printf("    bugs        Bugs mode, use fuzzer to construct pseudo-random commands.\n");
+	printf("    security    Perform security tests for the hub.\n");
+	printf("    log         Connect one client to the hub and log the output hub.\n");
+	
+	printf("\n");
+	printf("  General options\n");
+	printf("    -c          Allow broadcasting chat messages.\n");
+	printf("    -d          Enable debug output.\n");
+	printf("    -q          Quiet mode (no output).\n");
+	
+	printf("\n");
+	printf("  Performance options:\n");
+	printf("    -l <0-3>    Level: 0=polite, 1=normal (default), 2=aggressive, 3=excessive.\n");
+	printf("    -n <num>    Number of concurrent connections\n");
+	
+	printf("\n");
+	
+	exit(0);
+}
+
+
+int set_defaults()
+{
+    switch (cfg_mode)
+    {
+	case mode_performance:
+	    break;
+	case mode_bugs:
+	    break;
+	case mode_security:
+	    break;
+	case mode_log:
+	    cfg_quiet = 0;
+	    cfg_debug = 2;
+	    cfg_clients = 1;
+	    break;
+    }
+    return 1;
+}
+
+int parse_mode(const char* arg)
+{
+	cfg_mode = 0;
+
+	if      (!strcmp(arg, "perf"))
+		cfg_mode = mode_performance;
+	else if (!strcmp(arg, "bugs"))
+		cfg_mode = mode_bugs;
+	else if (!strcmp(arg, "security"))
+		cfg_mode = mode_security;
+	else if (!strcmp(arg, "log"))
+		cfg_mode = mode_log;
+
+	return cfg_mode;
+}
+
+int parse_address(const char* arg)
+{
+	char* split;
+	struct hostent* dns;
+	struct in_addr* addr;
+
+	if (!arg)
+		return 0;
+
+	if (strlen(arg) < 9)
+		return 0;
+	
+	if (strncmp(arg, "adc://", 6))
+		return 0;
+	
+	split = strrchr(arg+6, ':');
+	if (split == 0 || strlen(split) < 2 || strlen(split) > 6)
+		return 0;
+	
+	cfg_port = strtol(split+1, NULL, 10);
+	if (cfg_port <= 0 || cfg_port > 65535)
+		return 0;
+	
+	split[0] = 0;
+
+	dns = gethostbyname(arg+6);
+	if (dns)
+	{
+		addr = (struct in_addr*) dns->h_addr_list[0];
+		cfg_host = strdup(inet_ntoa(*addr));
+	}
+	
+	if (!cfg_host)
+		return 0;
+	
+	return 1;
+}
+
+int parse_arguments(int argc, char** argv)
+{
+	int ok = 1;
+	int opt;
+	for (opt = 3; opt < argc; opt++)
+	{
+		if      (!strcmp(argv[opt], "-c"))
+			cfg_chat = 1;
+		else if (!strncmp(argv[opt], "-d", 2))
+			cfg_debug += strlen(argv[opt]) - 1;
+		else if (!strcmp(argv[opt], "-q"))
+			cfg_quiet = 1;
+		else if (!strcmp(argv[opt], "-l") && (++opt) < argc)
+		{
+			cfg_level = MIN(MAX(uhub_atoi(argv[opt]), 0), 3);
+		}
+		else if (!strcmp(argv[opt], "-n") && (++opt) < argc)
+		{
+			cfg_clients = MIN(MAX(uhub_atoi(argv[opt]), 1), ADC_MAX_CLIENTS);
+		}
+	}
+	return ok;
+}
+
+
+void parse_command_line(int argc, char** argv)
+{
+	if (argc < 2 ||
+		!parse_mode(argv[1]) ||
+		!set_defaults() ||
+		!parse_address(argv[2]) ||
+		!parse_arguments(argc, argv))
+	{
+		print_usage(argv[0]);
+	}
+}
+
+int main(int argc, char** argv)
+{
+	parse_command_line(argc, argv);
+	
+	net_initialize();
+	event_init();
+	
+	memset(&saddr, 0, sizeof(saddr));
+	saddr.sin_family = AF_INET;
+	saddr.sin_port   = htons(cfg_port);
+	net_string_to_address(AF_INET, cfg_host, &saddr.sin_addr);
+	
+	runloop(cfg_clients);
+	net_shutdown();
+
+	return 0;
+}
+

src/auth.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -55,12 +55,12 @@ static int check_cmd_bool(const char* cmd, struct linked_list* list, char* line,
 		data = strip_white_space(data);
 		if (!*data)
 		{
-			LOG_FATAL("ACL parse error on line %d", line_count);
+			hub_log(log_fatal, "ACL parse error on line %d", line_count);
 			return -1;
 		}
 		
 		list_append(list, hub_strdup(data));
-		LOG_DEBUG("ACL: Deny access for: '%s' (%s)", data, cmd);
+		hub_log(log_debug, "ACL: Deny access for: '%s' (%s)", data, cmd);
 		return 1;
 	}
 	return 0;
@@ -70,7 +70,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 user_access_info* info = 0;
 	
 	if (!strncmp(line, cmd, strlen(cmd)))
 	{
@@ -82,15 +82,15 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 		data = strip_white_space(data);
 		if (!*data)
 		{
-			LOG_FATAL("ACL parse error on line %d", line_count);
+			hub_log(log_fatal, "ACL parse error on line %d", line_count);
 			return -1;
 		}
 		
-		info = hub_malloc_zero(sizeof(struct hub_user_access_info));
+		info = hub_malloc_zero(sizeof(struct user_access_info));
 		
 		if (!info)
 		{
-			LOG_ERROR("ACL parse error. Out of memory!");
+			hub_log(log_error, "ACL parse error. Out of memory!");
 			return -1;
 		}
 		
@@ -108,14 +108,14 @@ static int check_cmd_user(const char* cmd, int status, struct linked_list* list,
 		info->password = data_extra ? hub_strdup(data_extra) : 0;
 		info->status = status;
 		list_append(list, info);
-		LOG_DEBUG("ACL: Added user '%s' (%s)", info->username, get_user_credential_string(info->status));
+		hub_log(log_debug, "ACL: Added user '%s' (%s)", info->username, get_user_credential_string(info->status));
 		return 1;
 	}
 	return 0;
 }
 
 
-static void add_ip_range(struct linked_list* list, struct ip_range* info)
+static void add_ip_range(struct linked_list* list, struct ip_ban_record* info)
 {
 	char buf1[INET6_ADDRSTRLEN+1];
 	char buf2[INET6_ADDRSTRLEN+1];
@@ -130,44 +130,125 @@ 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: Added ip range: %s-%s", buf1, buf2);
+	hub_log(log_debug, "ACL: Deny access for: %s-%s", buf1, buf2);
 	
 	list_append(list, info);
 }
 
 
+static int check_ip_range(const char* lo, const char* hi, struct ip_ban_record* info)
+{
+	int ret1, ret2;
+	
+	if ((ip_is_valid_ipv4(lo) && ip_is_valid_ipv4(hi)) ||
+		(ip_is_valid_ipv6(lo) && ip_is_valid_ipv6(hi)))
+	{
+		ret1 = ip_convert_to_binary(lo, &info->lo);
+		ret2 = ip_convert_to_binary(hi, &info->hi);
+		if (ret1 == -1 || ret2 == -1 || ret1 != ret2)
+		{
+			return -1;
+		}
+		return 0;
+	}
+	return -1;
+}
+
+
+static int check_ip_mask(const char* text_addr, int bits, struct ip_ban_record* info)
+{
+	hub_log(log_debug, "ACL: Deny access for: %s/%d", text_addr, bits);
+	
+	if (ip_is_valid_ipv4(text_addr) ||
+		ip_is_valid_ipv6(text_addr))
+	{
+		struct ip_addr_encap addr;
+		struct ip_addr_encap mask1;
+		struct ip_addr_encap mask2;
+		int af = ip_convert_to_binary(text_addr, &addr);  /* 192.168.1.2 */
+		int maxbits = af == AF_INET6 ? 128 : 32;
+		ip_mask_create_left(af, bits, &mask1);            /* 255.255.255.0 */
+		ip_mask_create_right(af, maxbits - bits, &mask2); /* 0.0.0.255 */
+		ip_mask_apply_AND(&addr, &mask1, &info->lo);      /* 192.168.1.0 */
+		ip_mask_apply_OR(&info->lo, &mask2, &info->hi);   /* 192.168.1.255 */
+		return 0;
+	}
+	return -1;
+}
+
+
 static int check_cmd_addr(const char* cmd, struct linked_list* list, char* line, int line_count)
 {
-	char* data;
+	char* data1;
-	struct ip_range* range = 0;
+	char* data2;
+	struct ip_ban_record* info = 0;
+	int cidr_bits = 0;
 		
 	if (!strncmp(line, cmd, strlen(cmd)))
 	{
-		data = &line[strlen(cmd)];
+		data1 = &line[strlen(cmd)];
-		data[0] = '\0';
+		data2 = 0;
-		data++;
+		data1[0] = '\0';
+		data1++;
 		
-		data = strip_white_space(data);
+		data1 = strip_white_space(data1);
-		if (!*data)
+		if (!*data1)
 		{
-			LOG_FATAL("ACL parse error on line %d", line_count);
+			hub_log(log_fatal, "ACL parse error on line %d", line_count);
 			return -1;
 		}
 		
-		range = hub_malloc_zero(sizeof(struct ip_range));
+		info = hub_malloc_zero(sizeof(struct ip_ban_record));
 		
-		if (!range)
+		if (!info)
 		{
-			LOG_ERROR("ACL parse error. Out of memory!");
+			hub_log(log_error, "ACL parse error. Out of memory!");
 			return -1;
 		}
 		
-		if (ip_convert_address_to_range(data, range))
+		/* Extract IP-range */
+		data2 = strrchr(data1, '-');
+		if (data2)
 		{
-			add_ip_range(list, range);
+			cidr_bits = -1;
+			data2[0] = 0;
+			data2++;
+			
+			if (check_ip_range(data1, data2, info) == -1)
+			{
+				hub_free(info);
+				return 0;
+			}
+			
+			add_ip_range(list, info);
+
+			return 1;
+		}
+		else
+		{
+			/* Extract IP-bitmask */
+			data2 = strrchr(data1, '/');
+			if (data2)
+			{
+				data2[0] = 0;
+				data2++;
+				cidr_bits = uhub_atoi(data2);
+			}
+			else
+			{
+				cidr_bits = 128;
+			}
+			
+			if (check_ip_mask(data1, cidr_bits, info) == -1)
+			{
+				hub_free(info);
+				return 0;
+			}
+			
+			add_ip_range(list, info);
+			
 			return 1;
 		}
-		hub_free(range);
 	}
 	return 0;
 }
@@ -176,16 +257,32 @@ 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;
 	
-	strip_off_ini_line_comments(line, line_count);
+	if ((pos = strchr(line, '#')) != NULL)
+	{
+		pos[0] = 0;
+	}
 	
-	line = strip_white_space(line);
 	if (!*line)
 		return 0;
 
-	LOG_DEBUG("acl_parse_line: '%s'", line);
+#ifdef ACL_DEBUG
+	hub_log(log_trace, "acl_parse_line(): '%s'", line);
+#endif
+	line = strip_white_space(line);
+	
+	if (!*line)
+	{
+		hub_log(log_fatal, "ACL parse error on line %d", line_count);
+		return -1;
+	}
+
+#ifdef ACL_DEBUG
+	hub_log(log_trace, "acl_parse_line: '%s'", line);
+#endif
 	
 	ACL_ADD_USER("bot",        handle->users, cred_bot);
 	ACL_ADD_USER("user_admin", handle->users, cred_admin);
@@ -199,7 +296,7 @@ static int acl_parse_line(char* line, int line_count, void* ptr_data)
 	ACL_ADD_ADDR("deny_ip",    handle->networks);
 	ACL_ADD_ADDR("nat_ip",     handle->nat_override);
 	
-	LOG_ERROR("Unknown ACL command on line %d: '%s'", line_count, line);
+	hub_log(log_error, "Unknown ACL command on line %d: '%s'", line_count, line);
 	return -1;
 }
 
@@ -218,7 +315,7 @@ int acl_initialize(struct hub_config* config, struct acl_handle* handle)
 	
 	if (!handle->users || !handle->cids || !handle->networks || !handle->users_denied || !handle->users_banned || !handle->nat_override)
 	{
-		LOG_FATAL("acl_initialize: Out of memory");
+		hub_log(log_fatal, "acl_initialize: Out of memory");
 		
 		list_destroy(handle->users);
 		list_destroy(handle->users_denied);
@@ -243,7 +340,7 @@ 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 user_access_info* info = (struct user_access_info*) ptr;
 	if (info)
 	{
 		hub_free(info->username);
@@ -307,22 +404,22 @@ int acl_shutdown(struct acl_handle* handle)
 }
 
 
-struct hub_user_access_info* acl_get_access_info(struct acl_handle* handle, const char* name)
+struct 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);
+	struct user_access_info* info = (struct user_access_info*) list_get_first(handle->users);
 	while (info)
 	{
 		if (strcasecmp(info->username, name) == 0)
 		{
 			return info;
 		}
-		info = (struct hub_user_access_info*) list_get_next(handle->users);
+		info = (struct user_access_info*) list_get_next(handle->users);
 	}
 	return NULL;
 }
 
 #define STR_LIST_CONTAINS(LIST, STR) \
-		str = (char*) list_get_first(LIST); \
+		char* str = (char*) list_get_first(LIST); \
 		while (str) \
 		{ \
 			if (strcasecmp(str, STR) == 0) \
@@ -333,75 +430,35 @@ 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 = hub_strdup(nick);
-	if (!data)
-	{
-		LOG_ERROR("ACL error: Out of memory!");
-		return -1;
-	}
-
-	list_append(handle->users_banned, data);
-	return 0;
-}
-
-int acl_user_ban_cid(struct acl_handle* handle, const char* cid)
-{
-	char* data = hub_strdup(cid);
-	if (!data)
-	{
-		LOG_ERROR("ACL error: Out of memory!");
-		return -1;
-	}
-
-	list_append(handle->cids, data);
-	return 0;
-}
-
-int acl_user_unban_nick(struct acl_handle* handle, const char* nick)
-{
-	return -1;
-}
-
-int acl_user_unban_cid(struct acl_handle* handle, const char* cid)
-{
-	return -1;
-}
-
-
 int acl_is_ip_banned(struct acl_handle* handle, const char* ip_address)
 {
 	struct ip_addr_encap raw;
-	struct ip_range* info = (struct ip_range*) list_get_first(handle->networks);
+	struct ip_ban_record* info = (struct ip_ban_record*) list_get_first(handle->networks);
 	ip_convert_to_binary(ip_address, &raw);
 	
 	while (info)
 	{
-		if (ip_in_range(&raw, info))
+		if (acl_check_ip_range(&raw, info))
 		{
 			return 1;
 		}
-		info = (struct ip_range*) list_get_next(handle->networks);
+		info = (struct ip_ban_record*) list_get_next(handle->networks);
 	}
 	return 0;
 }
@@ -409,63 +466,71 @@ int acl_is_ip_banned(struct acl_handle* handle, const char* ip_address)
 int acl_is_ip_nat_override(struct acl_handle* handle, const char* ip_address)
 {
 	struct ip_addr_encap raw;
-	struct ip_range* info = (struct ip_range*) list_get_first(handle->nat_override);
+	struct ip_ban_record* info = (struct ip_ban_record*) list_get_first(handle->nat_override);
 	ip_convert_to_binary(ip_address, &raw);
 	
 	while (info)
 	{
-		if (ip_in_range(&raw, info))
+		if (acl_check_ip_range(&raw, info))
 		{
 			return 1;
 		}
-		info = (struct ip_range*) list_get_next(handle->nat_override);
+		info = (struct ip_ban_record*) list_get_next(handle->nat_override);
 	}
 	return 0;
 }
 
 
+int acl_check_ip_range(struct ip_addr_encap* addr, struct ip_ban_record* info)
+{
+	return (addr->af == info->lo.af && ip_compare(&info->lo, addr) <= 0 && ip_compare(addr, &info->hi) <= 0);
+}
+
 /*
  * This will generate the same challenge to the same user, always.
  * The challenge is made up of the time of the user connected
  * 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* password_generate_challenge(struct user* user)
 {
-	char buf[64];
+	char buf[32];
 	uint64_t tiger_res[3];
 	static char tiger_buf[MAX_CID_LEN+1];
 	
-	// FIXME: Generate a better nonce scheme.
+	snprintf(buf, 32, "%d%d%d", (int) user->tm_connected, (int) user->id.sid, (int) user->sd);
-	snprintf(buf, 64, "%p%d%d", user, (int) user->id.sid, (int) net_con_get_sd(user->connection));
 	
 	tiger((uint64_t*) buf, strlen(buf), (uint64_t*) tiger_res);
 	base32_encode((unsigned char*) tiger_res, TIGERSIZE, tiger_buf);
 	tiger_buf[MAX_CID_LEN] = 0;
+
+#ifdef ACL_DEBUG
+	hub_log(log_trace, "Generating challenge for user %s: '%s'", user->id.nick, tiger_buf);
+#endif
 	return (const char*) tiger_buf;
 }
 
 
-int acl_password_verify(struct acl_handle* acl, struct hub_user* user, const char* password)
+int password_verify(struct user* user, const char* password)
 {
 	char buf[1024];
-	struct hub_user_access_info* access;
+	struct user_access_info* access;
 	const char* challenge;
 	char raw_challenge[64];
 	char password_calc[64];
 	uint64_t tiger_res[3];
 	
 	if (!password || !user || strlen(password) != MAX_CID_LEN)
-		return 0;
+		return password_invalid;
 
-	access = acl_get_access_info(acl, user->id.nick);
+	access = acl_get_access_info(user->hub->acl, user->id.nick);
 	if (!access || !access->password)
-		return 0;
+		return password_invalid;
 
 	if (TIGERSIZE+strlen(access->password) >= 1024)
-		return 0;
+		return password_invalid;
 
-	challenge = acl_password_generate_challenge(acl, user);
+	challenge = password_generate_challenge(user);
 
 	base32_decode(challenge, (unsigned char*) raw_challenge, MAX_CID_LEN);
 
@@ -476,11 +541,14 @@ int acl_password_verify(struct acl_handle* acl, struct hub_user* user, const cha
 	base32_encode((unsigned char*) tiger_res, TIGERSIZE, password_calc);
 	password_calc[MAX_CID_LEN] = 0;
 
+#ifdef ACL_DEBUG
+	hub_log(log_trace, "Checking password %s against %s", password, password_calc);
+#endif
 	if (strcasecmp(password, password_calc) == 0)
 	{
-		return 1;
+		return password_ok;
 	}
-	return 0;
+	return password_invalid;
 }
 
 

src/auth.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -21,9 +21,21 @@
 #define HAVE_UHUB_ACL_H
 
 struct hub_config;
-struct hub_user;
+struct user;
 struct ip_addr_encap;
 
+enum password_status
+{
+	password_invalid  = 0,
+	password_ok       = 1,
+};
+
+enum acl_status
+{
+	acl_not_found       = 0,
+	acl_found           = 1,
+};
+
 enum user_credentials
 {
 	cred_none,                 /**<<< "User has no credentials (not yet logged in)" */
@@ -38,13 +50,19 @@ enum user_credentials
 
 const char* get_user_credential_string(enum user_credentials cred);
 
-struct hub_user_access_info
+struct user_access_info
 {
 	char* username;          /* name of user, cid or IP range */
 	char* password;          /* password */
 	enum user_credentials status;
 };
 
+struct ip_ban_record
+{
+	struct ip_addr_encap lo;
+	struct ip_addr_encap hi;
+};
+
 struct acl_handle
 {
 	struct linked_list* users;          /* Known users. See enum user_status */
@@ -59,7 +77,7 @@ 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 user_access_info* acl_get_access_info(struct acl_handle* handle, 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);
@@ -67,19 +85,9 @@ extern int acl_is_ip_nat_override(struct acl_handle* handle, const char* ip_addr
 extern int acl_is_user_banned(struct acl_handle* handle, const char* name);
 extern int acl_is_user_denied(struct acl_handle* handle, const char* name);
 
-extern int acl_user_ban_nick(struct acl_handle* handle, const char* nick);
+extern int acl_check_ip_range(struct ip_addr_encap* addr, struct ip_ban_record* info);
-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);
+extern const char* password_generate_challenge(struct user* user);
-
+extern int password_verify(struct user* user, const char* password);
-/**
- * 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);
 
 #endif /* HAVE_UHUB_ACL_H */

src/commands.c

@@ -0,0 +1,218 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+typedef int (*command_handler)(struct hub_info* hub, struct user* user, const char* message);
+
+struct commands_handler
+{
+	const char* prefix;
+	size_t length;
+	enum user_credentials cred;
+	command_handler handler;
+	const char* description;
+};
+
+static struct commands_handler command_handlers[];
+
+static void send_message(struct hub_info* hub, struct user* user, const char* message)
+{
+	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(user, command);
+	adc_msg_free(command);
+	hub_free(buffer);
+}
+
+static int command_access_denied(struct hub_info* hub, struct user* user, const char* command)
+{
+	char temp[128];
+	snprintf(temp, 128, "*** Access denied: \"%s\"", command);
+	send_message(hub, user, temp);
+	return 0;
+}
+
+static int command_not_found(struct hub_info* hub, struct user* user, const char* command)
+{
+	char temp[128];
+	snprintf(temp, 128, "*** Command not found: \"%s\"", command);
+	send_message(hub, user, temp);
+	return 0;
+}
+
+static int command_status(struct hub_info* hub, struct user* user, const char* command, const char* message)
+{
+	char temp[1024];
+	snprintf(temp, 1024, "*** %s: %s", command, message);
+	send_message(hub, user, temp);
+	return 0;
+}
+
+static int command_stats(struct hub_info* hub, struct user* user, const char* message)
+{
+	char temp[128];
+	snprintf(temp, 128, "%zu users, peak: %zu. Network (up/down): %d/%d KB/s, peak: %d/%d KB/s",
+	hub->users->count,
+	hub->users->count_peak,
+	(int) hub->stats.net_tx / 1024,
+	(int) hub->stats.net_rx / 1024,
+	(int) hub->stats.net_tx_peak / 1024,
+	(int) hub->stats.net_rx_peak / 1024);
+	
+	return command_status(hub, user, "stats", message);
+}
+
+static int command_help(struct hub_info* hub, struct user* user, const char* message)
+{
+#define MAX_HELP_MSG 1024
+	size_t n;
+	char msg[MAX_HELP_MSG];
+	msg[0] = 0;
+	strcat(msg, "Available commands:\n");
+	
+	for (n = 0; command_handlers[n].prefix; n++)
+	{
+		if (command_handlers[n].cred <= user->credentials)
+		{
+			strcat(msg, "!");
+			strcat(msg, command_handlers[n].prefix);
+			strcat(msg, " - ");
+			strcat(msg, command_handlers[n].description);
+			strcat(msg, "\n");
+		}
+	}
+	return command_status(hub, user, "help", msg);
+}
+
+static int command_uptime(struct hub_info* hub, struct user* user, const char* message)
+{
+	char tmp[128];
+	size_t d;
+	size_t h;
+	size_t m;
+	size_t D = (size_t) difftime(time(0), hub->tm_started);
+
+	d = D / (24 * 3600);
+	D = D % (24 * 3600);
+	h = D / 3600;
+	D = D % 3600;
+	m = D / 60;
+
+	tmp[0] = 0;
+	if (d)
+	{
+		strcat(tmp, uhub_itoa((int) d));
+		strcat(tmp, " day");
+		if (d != 1) strcat(tmp, "s");
+		strcat(tmp, ", ");
+	}
+
+	if (h < 10) strcat(tmp, "0");
+	strcat(tmp, uhub_itoa((int) h));
+	strcat(tmp, ":");
+	if (m < 10) strcat(tmp, "0");
+	strcat(tmp, uhub_itoa((int) m));
+
+	return command_status(hub, user, "uptime", tmp);
+}
+
+static int command_kick(struct hub_info* hub, struct user* user, const char* message)
+{
+	if (strlen(message) < 7)
+	{
+		return command_status(hub, user, "kick", "No nickname given");
+	}
+	
+	const char* nick = &message[7];
+	struct user* target = uman_get_user_by_nick(hub, nick);
+	
+	if (!target)
+	{
+		return command_status(hub, user, "kick", "No such user");
+	}
+	
+	if (target == user)
+	{
+		return command_status(hub, user, "kick", "Cannot kick yourself");
+	}
+	
+	user_disconnect(target, quit_kicked);
+	return command_status(hub, user, "kick", nick);
+}
+
+static int command_reload(struct hub_info* hub, struct user* user, const char* message)
+{
+	hub->status = hub_status_restart;
+	return command_status(hub, user, "reload", "Reloading configuration...");
+}
+
+static int command_shutdown(struct hub_info* hub, struct user* user, const char* message)
+{
+	hub->status = hub_status_shutdown;
+	return command_status(hub, user, "shutdown", "Hub shutting down...");
+}
+
+static int command_version(struct hub_info* hub, struct user* user, const char* message)
+{
+    return command_status(hub, user, "version", "Powered by " PRODUCT "/" VERSION);
+}
+
+static int command_myip(struct hub_info* hub, struct user* user, const char* message)
+{
+    char tmp[128];
+    snprintf(tmp, 128, "Your IP is \"%s\"", ip_convert_to_string(&user->ipaddr));
+    return command_status(hub, user, "myip", tmp);
+}
+
+int command_dipatcher(struct hub_info* hub, struct user* user, const char* message)
+{
+	size_t n = 0;
+	for (n = 0; command_handlers[n].prefix; n++)
+	{
+		if (!strncmp(message, command_handlers[n].prefix, command_handlers[n].length))
+		{
+			if (command_handlers[n].cred <= user->credentials)
+			{
+				return command_handlers[n].handler(hub, user, message);
+			}
+			else
+			{
+				return command_access_denied(hub, user, command_handlers[n].prefix);
+			}
+		}
+	}
+
+	command_not_found(hub, user, message);
+	return 1;
+}
+
+static struct commands_handler command_handlers[] = {
+	{ "help",       4, cred_guest,     command_help,     "Show this help message."      },
+	{ "stats",      5, cred_super,     command_stats,    "Show hub statistics."         },
+	{ "version",    7, cred_guest,     command_version,  "Show hub version info."       },
+	{ "uptime",     6, cred_guest,     command_uptime,   "Display hub uptime info."     },
+	{ "kick",       4, cred_operator,  command_kick,     "Kick a user"                  },
+	{ "reload",     6, cred_admin,     command_reload,   "Reload configuration files."  },
+	{ "shutdown",   8, cred_admin,     command_shutdown, "Shutdown hub."                },
+	{ "myip",       4, cred_guest,     command_myip,     "Show your own IP."            },
+	{ 0,            0, cred_none,      command_help,     ""                             }
+};
+

src/commands.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -19,4 +19,17 @@
 
 #include "uhub.h"
 
-extern int command_dipatcher(struct hub_info* hub, struct hub_user* user, const char* message);
+#define CHAT_MSG_HANDLED  1
+#define CHAT_MSG_IGNORED  0
+#define CHAT_MSG_INVALID -1
+
+typedef int (*plugin_event_chat_message)(struct hub_info*, struct user*, struct adc_message*);
+
+struct command_info
+{
+	const char* prefix;
+	enum user_credentials cred;
+	plugin_event_chat_message function;
+};
+
+int command_dipatcher(struct hub_info* hub, struct user* user, const char* message);

src/config.c

@@ -0,0 +1,524 @@
+/*
+ * 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/>.
+ *
+ */
+
+
+#include "uhub.h"
+
+
+#ifndef INT_MAX
+#define INT_MAX 0x7fffffff
+#endif
+
+#ifndef INT_MIN
+#define INT_MIN (-0x7fffffff - 1)
+#endif
+
+#define CFG_APPLY_BOOLEAN(KEY, 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\
+		{ \
+			hub_log(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) { \
+			hub_log(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) \
+    { \
+        hub_log(log_warning, "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_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_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_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);
+	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(max_users,             DEF_MAX_USERS);
+	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,             0);
+	DEFAULT_INTEGER(tls_require,            0);
+	DEFAULT_STRING (tls_certificate,       "");
+	DEFAULT_STRING (tls_private_key,       "");
+}
+
+
+static int apply_config(struct hub_config* config, char* key, char* data, int line_count)
+{
+	GET_STR (file_acl);
+	GET_STR (file_motd);
+	GET_STR (server_bind_addr);
+	GET_INT (server_port);
+	GET_STR (hub_name);
+	GET_STR (hub_description);
+	GET_BOOL(hub_enabled);
+	GET_INT (max_users);
+	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 */
+	GET_INT(limit_max_hubs_user);
+	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 */
+	GET_STR (msg_hub_full);
+	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 */
+	hub_log(log_fatal, "Unknown configuration directive: '%s'", key);
+	return -1;
+}
+
+
+void free_config(struct hub_config* config)
+{
+	hub_free(config->server_bind_addr);
+	hub_free(config->file_motd);
+	hub_free(config->file_acl);
+	hub_free(config->hub_name);
+	hub_free(config->hub_description);
+	
+	hub_free(config->msg_hub_full);
+	hub_free(config->msg_hub_disabled);
+	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);
+	hub_free(config->tls_private_key);
+	
+	memset(config, 0, sizeof(struct hub_config));
+}
+
+#define DUMP_STR(NAME, DEFAULT) \
+	if (ignore_defaults) \
+	{ \
+		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_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_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);
+
+	/* 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);
+}
+
+
+static int config_parse_line(char* line, int line_count, void* ptr_data)
+{
+	char* pos;
+	char* key;
+	char* data;
+	struct hub_config* config = (struct hub_config*) ptr_data;
+
+	if ((pos = strchr(line, '#')) != NULL)
+	{
+		pos[0] = 0;
+	}
+
+	if (!*line) return 0;
+
+#ifdef CONFIG_DUMP
+	hub_log(log_trace, "config_parse_line(): '%s'", line);
+#endif
+
+	if (!is_valid_utf8(line))
+	{
+		hub_log(log_warning, "Invalid utf-8 characters on line %d", line_count);
+	}
+
+	if ((pos = strchr(line, '=')) != NULL)
+	{
+		pos[0] = 0;
+	}
+	else
+	{
+		return 0;
+	}
+
+	key = line;
+	data = &pos[1];
+
+	key = strip_white_space(key);
+	data = strip_white_space(data);
+
+	if (!*key || !*data)
+	{
+		hub_log(log_fatal, "Configuration parse error on line %d", line_count);
+		return -1;
+	}
+
+#ifdef CONFIG_DUMP
+	hub_log(log_trace, "config_parse_line: '%s' => '%s'", key, data);
+#endif
+
+	return apply_config(config, key, data, line_count);
+}
+
+
+int read_config(const char* file, struct hub_config* config, int allow_missing)
+{
+	int ret;
+
+	memset(config, 0, sizeof(struct hub_config));
+
+	ret = file_read_lines(file, config, &config_parse_line);
+	if (ret < 0)
+	{
+		if (allow_missing && ret == -2)
+		{
+			hub_log(log_debug, "Using default configuration.");
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	config_defaults(config);
+	return 0;
+}
+
+

src/config.h

@@ -0,0 +1,122 @@
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef HAVE_UHUB_CONFIG_H
+#define HAVE_UHUB_CONFIG_H
+
+struct hub_config
+{
+	int server_port;             /**<<< "Server port to bind to (default: 1511)" */
+	char* server_bind_addr;      /**<<< "Server bind address (default: '0.0.0.0' or '::')" */
+	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" */
+	
+	/* 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
+ * variables.
+ *
+ * NOTE: Any variable is set to it's default variable if zero.
+ * This function is automatically called in read_config to set any
+ * configuration that was missing there.
+ */
+extern void config_defaults(struct hub_config* config);
+
+/**
+ * Read configuration from file, and use the default variables for
+ * the missing variables.
+ *
+ * @return -1 on error, 0 on success.
+ */
+extern int read_config(const char* file, struct hub_config* config, int allow_missing);
+
+/**
+ * Free the configuration data (allocated by read_config, or config_defaults).
+ */
+extern void free_config(struct hub_config* config);
+
+/**
+ * Print all configuration data to standard out.
+ */
+extern void dump_config(struct hub_config* config, int ignore_defaults);
+
+
+#endif /* HAVE_UHUB_CONFIG_H */
+

src/core/commands.c

@@ -1,665 +0,0 @@
-/*
- * 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 DEBUG
-#define CRASH_DEBUG
-#endif
-
-#define MAX_HELP_MSG 1024
-
-struct hub_command
-{
-	const char* message;
-	char* prefix;
-	size_t prefix_len;
-	struct linked_list* args;
-};
-
-typedef int (*command_handler)(struct hub_info* hub, struct hub_user* user, struct hub_command*);
-
-struct commands_handler
-{
-	const char* prefix;
-	size_t length;
-	const char* args;
-	enum user_credentials cred;
-	command_handler handler;
-	const char* description;
-};
-
-static struct commands_handler command_handlers[];
-
-static void command_destroy(struct hub_command* cmd)
-{
-	if (!cmd) return;
-	hub_free(cmd->prefix);
-
-	if (cmd->args)
-	{
-		list_clear(cmd->args, &hub_free);
-		list_destroy(cmd->args);
-	}
-
-	hub_free(cmd);
-}
-
-static struct hub_command* command_create(const char* message)
-{
-	char* prefix;
-	int n;
-	struct hub_command* cmd = hub_malloc_zero(sizeof(struct hub_command));
-
-	if (!cmd) return 0;
-
-	cmd->message = message;
-	cmd->args = list_create();
-
-	n = split_string(message, "\\s", cmd->args, 0);
-	if (n <= 0)
-	{
-		command_destroy(cmd);
-		return 0;
-	}
-
-	prefix = list_get_first(cmd->args);
-	if (prefix && prefix[0] && prefix[1])
-	{
-		cmd->prefix = hub_strdup(&prefix[1]);
-		cmd->prefix_len = strlen(cmd->prefix);
-	}
-	else
-	{
-		command_destroy(cmd);
-		return 0;
-	}
-	list_remove(cmd->args, prefix);
-	hub_free(prefix);
-	return cmd;
-}
-
-static void send_message(struct hub_info* hub, struct hub_user* user, const char* message)
-{
-	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(hub, user, command);
-	adc_msg_free(command);
-	hub_free(buffer);
-}
-
-static int command_access_denied(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char temp[128];
-	snprintf(temp, 128, "*** %s: Access denied.", cmd->prefix);
-	send_message(hub, user, temp);
-	return 0;
-}
-
-static int command_not_found(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char temp[128];
-	snprintf(temp, 128, "*** %s: Command not found", cmd->prefix);
-	send_message(hub, user, temp);
-	return 0;
-}
-
-static int command_status_user_not_found(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd, const char* nick)
-{
-	char temp[128];
-	snprintf(temp, 128, "*** %s: No user \"%s\"", cmd->prefix, nick);
-	send_message(hub, user, temp);
-	return 0;
-}
-
-const char* command_get_syntax(struct commands_handler* handler)
-{
-	static char args[128];
-	size_t n = 0;
-	args[0] = 0;
-	if (handler->args)
-	{
-		for (n = 0; n < strlen(handler->args); n++)
-		{
-			if (n > 0) strcat(args, " ");
-			switch (handler->args[n])
-			{
-				case 'n': strcat(args, "<nick>"); break;
-				case 'c': strcat(args, "<cid>");  break;
-				case 'a': strcat(args, "<addr>"); break;
-				case 'm': strcat(args, "<message>"); break;
-			}
-		}
-	}
-	return args;
-}
-
-static int command_arg_mismatch(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd, struct commands_handler* handler)
-{
-	char temp[256];
-	const char* args = command_get_syntax(handler);
-	if (args) snprintf(temp, 256, "*** %s: Use: !%s %s", cmd->prefix, cmd->prefix, args);
-	else      snprintf(temp, 256, "*** %s: Use: !%s", cmd->prefix, cmd->prefix);
-	send_message(hub, user, temp);
-	return 0;
-}
-
-static int command_status(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd, const char* message)
-{
-	char temp[1024];
-	snprintf(temp, 1024, "*** %s: %s", cmd->prefix, message);
-	send_message(hub, user, temp);
-	return 0;
-}
-
-static int command_stats(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char temp[128];
-	snprintf(temp, 128, PRINTF_SIZE_T " users, peak: " PRINTF_SIZE_T ". Network (up/down): %d/%d KB/s, peak: %d/%d KB/s",
-	hub->users->count,
-	hub->users->count_peak,
-	(int) hub->stats.net_tx / 1024,
-	(int) hub->stats.net_rx / 1024,
-	(int) hub->stats.net_tx_peak / 1024,
-	(int) hub->stats.net_rx_peak / 1024);
-	return command_status(hub, user, cmd, temp);
-}
-
-static int command_help(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	size_t n;
-	char msg[MAX_HELP_MSG];
-	msg[0] = 0;
-	strcat(msg, "Available commands:\n");
-
-	for (n = 0; command_handlers[n].prefix; n++)
-	{
-		if (command_handlers[n].cred <= user->credentials)
-		{
-			strcat(msg, "!");
-			strcat(msg, command_handlers[n].prefix);
-			strcat(msg, " - ");
-			strcat(msg, command_handlers[n].description);
-			strcat(msg, "\n");
-		}
-	}
-	return command_status(hub, user, cmd, msg);
-}
-
-static int command_uptime(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char tmp[128];
-	size_t d;
-	size_t h;
-	size_t m;
-	size_t D = (size_t) difftime(time(0), hub->tm_started);
-
-	d = D / (24 * 3600);
-	D = D % (24 * 3600);
-	h = D / 3600;
-	D = D % 3600;
-	m = D / 60;
-
-	tmp[0] = 0;
-	if (d)
-	{
-		strcat(tmp, uhub_itoa((int) d));
-		strcat(tmp, " day");
-		if (d != 1) strcat(tmp, "s");
-		strcat(tmp, ", ");
-	}
-
-	if (h < 10) strcat(tmp, "0");
-	strcat(tmp, uhub_itoa((int) h));
-	strcat(tmp, ":");
-	if (m < 10) strcat(tmp, "0");
-	strcat(tmp, uhub_itoa((int) m));
-
-	return command_status(hub, user, cmd, tmp);
-}
-
-static int command_kick(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char* nick = list_get_first(cmd->args);
-	struct hub_user* target;
-	if (!nick)
-		return -1; // FIXME: bad syntax.
-
-	target = uman_get_user_by_nick(hub, nick);
-	
-	if (!target)
-		return command_status_user_not_found(hub, user, cmd, nick);
-	
-	if (target == user)
-		return command_status(hub, user, cmd, "Cannot kick yourself");
-	
-	hub_disconnect_user(hub, target, quit_kicked);
-	return command_status(hub, user, cmd, nick);
-}
-
-static int command_ban(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char* nick = list_get_first(cmd->args);
-	struct hub_user* target;
-	if (!nick)
-		return -1; // FIXME: bad syntax.
-
-	target = uman_get_user_by_nick(hub, nick);
-
-	if (!target)
-		return command_status_user_not_found(hub, user, cmd, nick);
-
-	if (target == user)
-		return command_status(hub, user, cmd, "Cannot kick/ban yourself");
-
-	hub_disconnect_user(hub, target, quit_kicked);
-	acl_user_ban_nick(hub->acl, target->id.nick);
-	acl_user_ban_cid(hub->acl, target->id.cid);
-
-	return command_status(hub, user, cmd, nick);
-}
-
-static int command_unban(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	return command_status(hub, user, cmd, "Not implemented");
-}
-
-static int command_mute(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char* nick = list_get_first(cmd->args);
-	struct hub_user* target;
-	if (!nick)
-		return -1; // FIXME: bad syntax.
-
-	target = uman_get_user_by_nick(hub, nick);
-
-	if (!target)
-		return command_status_user_not_found(hub, user, cmd, nick);
-
-	if (strlen(cmd->prefix) == 4)
-	{
-		user_flag_set(target, flag_muted);
-	}
-	else
-	{
-		user_flag_unset(target, flag_muted);
-	}
-	return command_status(hub, user, cmd, nick);
-}
-
-static int command_reload(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	hub->status = hub_status_restart;
-	return command_status(hub, user, cmd, "Reloading configuration...");
-}
-
-static int command_shutdown(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	hub->status = hub_status_shutdown;
-	return command_status(hub, user, cmd, "Hub shutting down...");
-}
-
-static int command_version(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	const char* tmp;
-	if (hub->config->show_banner_sys_info)
-		tmp = "Powered by " PRODUCT_STRING " on " OPSYS "/" CPUINFO;
-	else
-		tmp = "Powered by " PRODUCT_STRING;
-	return command_status(hub, user, cmd, tmp);
-}
-
-static int command_myip(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char tmp[128];
-	snprintf(tmp, 128, "Your address is \"%s\"", user_get_address(user));
-	return command_status(hub, user, cmd, tmp);
-}
-
-static int command_getip(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char tmp[128];
-	char* nick = list_get_first(cmd->args);
-	struct hub_user* target;
-
-	if (!nick)
-		return -1; // FIXME: bad syntax/OOM
-
-	target = uman_get_user_by_nick(hub, nick);
-
-	if (!target)
-		return command_status_user_not_found(hub, user, cmd, nick);
-
-	snprintf(tmp, 128, "%s has address \"%s\"", nick, user_get_address(target));
-	return command_status(hub, user, cmd, tmp);
-}
-
-static int command_whoip(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char* address = list_get_first(cmd->args);
-	struct ip_range range;
-	struct linked_list* users;
-	struct hub_user* u;
-	int ret = 0;
-	char tmp[128];
-	char* buffer;
-
-	if (!address)
-		return -1; // FIXME: bad syntax.
-
-	ret = ip_convert_address_to_range(address, &range);
-	if (!ret)
-		return command_status(hub, user, cmd, "Invalid IP address/range/mask");
-
-	users = (struct linked_list*) list_create();
-	if (!users)
-		return -1; // FIXME: OOM
-
-	ret = uman_get_user_by_addr(hub, users, &range);
-
-	if (!ret)
-	{
-		list_destroy(users);
-		return command_status(hub, user, cmd, "No users found.");
-	}
-
-	snprintf(tmp, 128, "*** %s: Found %d match%s:", cmd->prefix, ret, ((ret != 1) ? "es" : ""));
-
-	buffer = hub_malloc(((MAX_NICK_LEN + INET6_ADDRSTRLEN + 5) * ret) + strlen(tmp) + 3);
-	if (!buffer)
-	{
-		list_destroy(users);
-		return -1; // FIXME: OOM
-	}
-
-	buffer[0] = 0;
-	strcat(buffer, tmp);
-	strcat(buffer, "\n");
-
-	u = (struct hub_user*) list_get_first(users);
-	while (u)
-	{
-		strcat(buffer, u->id.nick);
-		strcat(buffer, " (");
-		strcat(buffer, user_get_address(u));
-		strcat(buffer, ")\n");
-		u = (struct hub_user*) list_get_next(users);
-	}
-	strcat(buffer, "\n");
-
-	send_message(hub, user, buffer);
-	hub_free(buffer);
-	list_destroy(users);
-	return 0;
-}
-
-static int command_broadcast(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	size_t offset = 12;
-#if USE_OLD_BROADCAST_STYLE
-	struct adc_message* command = adc_msg_construct(ADC_CMD_IMSG, strlen((cmd->message + offset)) + 6);
-	adc_msg_add_argument(command, (cmd->message + offset));
-	route_to_all(hub, command);
-	adc_msg_free(command);
-	return 0;
-#else
-	size_t message_len = strlen(cmd->message + offset);
-	struct adc_message* command = 0;
-	char pm_flag[7] = "PM";
-	char from_sid[5];
-	char buffer[128];
-	size_t recipients = 0;
-	struct hub_user* target;
-
-	memcpy(from_sid, sid_to_string(user->id.sid), sizeof(from_sid));
-	memcpy(pm_flag + 2, from_sid, sizeof(from_sid));
-
-	target = (struct hub_user*) list_get_first(hub->users->list);
-	while (target)
-	{
-		if (target != user)
-		{
-			recipients++;
-			command = adc_msg_construct(ADC_CMD_DMSG, message_len + 23);
-			if (!command)
-				break;
-
-			adc_msg_add_argument(command, from_sid);
-			adc_msg_add_argument(command, sid_to_string(target->id.sid));
-			adc_msg_add_argument(command, (cmd->message + offset));
-			adc_msg_add_argument(command, pm_flag);
-
-			route_to_user(hub, target, command);
-			adc_msg_free(command);
-		}
-		target = (struct hub_user*) list_get_next(hub->users->list);
-	}
-
-	snprintf(buffer, sizeof(buffer), "*** %s: Delivered to " PRINTF_SIZE_T " user%s", cmd->prefix, recipients, (recipients != 1 ? "s" : ""));
-	send_message(hub, user, buffer);
-	return 0;
-#endif
-}
-
-static int command_history(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	char* buffer;
-	struct linked_list* messages = hub->chat_history;
-	char* message = 0;
-	int ret = (int) list_size(messages);
-	size_t bufsize;
-	char tmp[128];
-
-	if (!ret)
-	{
-		return command_status(hub, user, cmd, "No messages.");
-	}
-
-	snprintf(tmp, 128, "*** %s: Found %d message%s:", cmd->prefix, ret, ((ret != 1) ? "s" : ""));
-	bufsize = strlen(tmp);
-	message = (char*) list_get_first(messages);
-	while (message)
-	{
-		bufsize += strlen(message);
-		message = (char*) list_get_next(messages);
-	}
-
-	buffer = hub_malloc(bufsize+4);
-	if (!buffer)
-	{
-		return command_status(hub, user, cmd, "Not enough memory.");
-	}
-
-	buffer[0] = 0;
-	strcat(buffer, tmp);
-	strcat(buffer, "\n");
-
-	message = (char*) list_get_first(messages);
-	while (message)
-	{
-		strcat(buffer, message);
-		message = (char*) list_get_next(messages);
-	}
-	strcat(buffer, "\n");
-
-	send_message(hub, user, buffer);
-	hub_free(buffer);
-	return 0;
-}
-
-static int command_log(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	struct linked_list* messages = hub->logout_info;
-	struct hub_logout_info* log;
-	char tmp[1024];
-	char* search = 0;
-	size_t search_len = 0;
-	size_t search_hits = 0;
-
-	if (!list_size(messages))
-	{
-		return command_status(hub, user, cmd, "No entries logged.");
-	}
-
-	search = list_get_first(cmd->args);
-	if (search)
-	{
-		search_len = strlen(search);
-	}
-
-	if (search_len)
-	{
-		sprintf(tmp, "Logged entries: " PRINTF_SIZE_T ", searching for \"%s\"", list_size(messages), search);
-	}
-	else
-	{
-		sprintf(tmp, "Logged entries: " PRINTF_SIZE_T, list_size(messages));
-	}
-	command_status(hub, user, cmd, tmp);
-
-	log = (struct hub_logout_info*) list_get_first(messages);
-	while (log)
-	{
-		const char* address = ip_convert_to_string(&log->addr);
-		int show = 0;
-
-		if (search_len)
-		{
-			if (memmem(log->cid, MAX_CID_LEN, search, search_len) || memmem(log->nick, MAX_NICK_LEN, search, search_len) || memmem(address, strlen(address), search, search_len))
-			{
-				search_hits++;
-				show = 1;
-			}
-		}
-		else
-		{
-			show = 1;
-		}
-
-		if (show)
-		{
-			sprintf(tmp, "* %s %s, %s [%s] - %s", get_timestamp(log->time), log->cid, log->nick, ip_convert_to_string(&log->addr), user_get_quit_reason_string(log->reason));
-			send_message(hub, user, tmp);
-		}
-		log = (struct hub_logout_info*) list_get_next(messages);
-	}
-
-	if (search_len)
-	{
-		sprintf(tmp, PRINTF_SIZE_T " entries shown.", search_hits);
-		command_status(hub, user, cmd, tmp);
-	}
-
-	return 0;
-}
-
-static int command_rules(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	if (!hub_send_rules(hub, user))
-		return command_status(hub, user, cmd, "no rules defined.");
-	return 0;
-}
-
-static int command_motd(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	if (!hub_send_motd(hub, user))
-		return command_status(hub, user, cmd, "no motd defined.");
-	return 0;
-}
-
-#ifdef CRASH_DEBUG
-static int command_crash(struct hub_info* hub, struct hub_user* user, struct hub_command* cmd)
-{
-	void (*crash)(void) = NULL;
-	crash();
-	return 0;
-}
-#endif
-
-int command_dipatcher(struct hub_info* hub, struct hub_user* user, const char* message)
-{
-	size_t n = 0;
-	int rc;
-
-	/* Parse and validate the command */
-	struct hub_command* cmd = command_create(message);
-	if (!cmd) return 0;
-
-	for (n = 0; command_handlers[n].prefix; n++)
-	{
-		struct commands_handler* handler = &command_handlers[n];
-		if (cmd->prefix_len != handler->length)
-			continue;
-
-		if (!strncmp(cmd->prefix, handler->prefix, handler->length))
-		{
-			if (handler->cred <= user->credentials)
-			{
-				if (!handler->args || (handler->args && list_size(cmd->args) >= strlen(handler->args)))
-				{
-					rc = handler->handler(hub, user, cmd);
-				}
-				else
-				{
-					rc = command_arg_mismatch(hub, user, cmd, handler);
-				}
-				command_destroy(cmd);
-				return rc;
-			}
-			else
-			{
-				rc = command_access_denied(hub, user, cmd);
-				command_destroy(cmd);
-				return rc;
-			}
-		}
-	}
-
-	command_not_found(hub, user, cmd);
-	command_destroy(cmd);
-	return 0;
-}
-
-static struct commands_handler command_handlers[] = {
-	{ "ban",        3, "n", cred_operator,  command_ban,      "Ban a user"                   },
-	{ "broadcast",  9, "m", cred_operator,  command_broadcast,"Send a message to all users"  },
-#ifdef CRASH_DEBUG
-	{ "crash",      5, 0,   cred_admin,     command_crash,    "Crash the hub (DEBUG)."       },
-#endif
-	{ "getip",      5, "n", cred_operator,  command_getip,    "Show IP address for a user"   },
-	{ "help",       4, 0,   cred_guest,     command_help,     "Show this help message."      },
-	{ "history",    7, 0,   cred_guest,     command_history,  "Show the last chat messages." },
-	{ "kick",       4, "n", cred_operator,  command_kick,     "Kick a user"                  },
-	{ "log",        3, 0,   cred_operator,  command_log,      "Display log"                  },
-	{ "motd",       4, 0,   cred_guest,     command_motd,     "Show the message of the day"  },
-	{ "mute",       4, "n", cred_operator,  command_mute,     "Mute user"                    },
-	{ "myip",       4, 0,   cred_guest,     command_myip,     "Show your own IP."            },
-	{ "reload",     6, 0,   cred_admin,     command_reload,   "Reload configuration files."  },
-	{ "rules",      5, 0,   cred_guest,     command_rules,    "Show the hub rules"           },
-	{ "shutdown",   8, 0,   cred_admin,     command_shutdown, "Shutdown hub."                },
-	{ "stats",      5, 0,   cred_super,     command_stats,    "Show hub statistics."         },
-	{ "unban",      5, "n", cred_operator,  command_unban,    "Lift ban on a user"           },
-	{ "unmute",     6, "n", cred_operator,  command_mute,     "Unmute user"                  },
-	{ "uptime",     6, 0,   cred_guest,     command_uptime,   "Display hub uptime info."     },
-	{ "version",    7, 0,   cred_guest,     command_version,  "Show hub version info."       },
-	{ "whoip",      5, "a", cred_operator,  command_whoip,    "Show users matching IP range" },
-	{ 0,            0, 0,   cred_none,      command_help,     ""                             }
-};
-

src/core/config.c

@@ -1,150 +0,0 @@
-/*
- * 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"
-
-
-#ifndef INT_MAX
-#define INT_MAX 0x7fffffff
-#endif
-
-#ifndef INT_MIN
-#define INT_MIN (-0x7fffffff - 1)
-#endif
-
-static int apply_boolean(const char* key, const char* data, int* target)
-{
-	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
-		return 0;
-	return 1;
-}
-
-static int apply_string(const char* key, const char* data, char** target, char* regexp)
-{
-	(void) regexp;
-	// FIXME: Add regexp checks for correct data
-
-	if (*target)
-		hub_free(*target);
-
-	*target = hub_strdup(data);
-	return 1;
-}
-
-static int apply_integer(const char* key, const char* data, int* target, int* min, int* max)
-{
-	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)
-			return 0;
-
-	if (min && val < *min)
-		return 0;
-
-	if (max && val > *max)
-		return 0;
-
-	*target = val;
-	return 1;
-}
-
-#include "gen_config.c"
-
-static int config_parse_line(char* line, int line_count, void* ptr_data)
-{
-	char* pos;
-	char* key;
-	char* data;
-	struct hub_config* config = (struct hub_config*) ptr_data;
-
-	strip_off_ini_line_comments(line, line_count);
-	
-	if (!*line) return 0;
-
-	LOG_DUMP("config_parse_line(): '%s'", line);
-
-	if (!is_valid_utf8(line))
-	{
-		LOG_WARN("Invalid utf-8 characters on line %d", line_count);
-	}
-
-	if ((pos = strchr(line, '=')) != NULL)
-	{
-		pos[0] = 0;
-	}
-	else
-	{
-		return 0;
-	}
-
-	key = line;
-	data = &pos[1];
-
-	key = strip_white_space(key);
-	data = strip_white_space(data);
-	data = strip_off_quotes(data);
-
-	if (!*key || !*data)
-	{
-		LOG_FATAL("Configuration parse error on line %d", line_count);
-		return -1;
-	}
-
-	LOG_DUMP("config_parse_line: '%s' => '%s'", key, data);
-
-	return apply_config(config, key, data, line_count);
-}
-
-
-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)
-	{
-		if (allow_missing && ret == -2)
-		{
-			LOG_DUMP("Using default configuration.");
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-

src/core/config.h

@@ -1,55 +0,0 @@
-/*
- * 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_CONFIG_H
-#define HAVE_UHUB_CONFIG_H
-
-#include "gen_config.h"
-
-/**
- * This initializes the configuration variables, and sets the default
- * variables.
- *
- * NOTE: Any variable is set to it's default variable if zero.
- * This function is automatically called in read_config to set any
- * configuration that was missing there.
- */
-extern void config_defaults(struct hub_config* config);
-
-/**
- * Read configuration from file, and use the default variables for
- * the missing variables.
- *
- * @return -1 on error, 0 on success.
- */
-extern int read_config(const char* file, struct hub_config* config, int allow_missing);
-
-/**
- * Free the configuration data (allocated by read_config, or config_defaults).
- */
-extern void free_config(struct hub_config* config);
-
-/**
- * Print all configuration data to standard out.
- */
-extern void dump_config(struct hub_config* config, int ignore_defaults);
-
-
-#endif /* HAVE_UHUB_CONFIG_H */
-

src/core/config.pl

@@ -1,260 +0,0 @@
-#!/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;
-	my $expect = "";
-
-	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";
-
-	$expect = "\\\"$name\\\"";
-
-	if ($type eq "int")
-	{
-		$expect .= " (integer)";
-		$expect .= ", default=" . $default;
-
-		if (defined $min)
-		{
-			$expect .= ", min=" . $min;
-			print GENIMPL "\t\tmin = $min;\n"
-		}
-		if (defined $max)
-		{
-			$expect .= ", max=" . $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")
-	{
-		$expect .= " (boolean)";
-		$expect .= ", default=" . $default;
-		print GENIMPL "\t\tif (!apply_boolean(key, data, &config->$name))\n";
-	}
-	elsif ($type =~ /(string|file|message)/)
-	{
-		$expect .= " (" . $type . ")";
-		$expect .= ", default=\\\"" . $default . "\\\"";
-		print GENIMPL "\t\tif (!apply_string(key, data, &config->$name, (char*) \"\"))\n";
-	}
-	else
-	{
-		$expect = " is unknown.";
-	}
-
-	print GENIMPL "\t\t{\n" .
-				  "\t\t\tLOG_ERROR(\"Configuration parse error on line %d\", line_count);\n";
-
-	print GENIMPL 		  "\t\t\tLOG_ERROR(\"" . $expect . "\");\n" if ($expect ne "");
-
-	print GENIMPL		  "\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

@@ -1,685 +0,0 @@
-<?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_require_redirect_addr" type="string" default="">
-		<check regexp="(adc|adcs|dchub)://.*" />
-		<short>A redirect address in case a client connects using "adc://" when "adcs://" is required.</short>
-		<description><![CDATA[
-		This is the redirect address used when the hub wants to redirect a client for not using ADCS.
-		For instance a hub at adc://adc.example.com might redirect to adcs://adc.example.com
-		]]></description>
-		<since>0.3.3</since>
-	</option>
-
-
-	<option name="tls_certificate" type="file" default="">
-		<short>Certificate file</short>
-		<description><![CDATA[
-			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="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/floodctl.c

@@ -1,55 +0,0 @@
-/*
- * 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"
-
-void flood_control_reset(struct flood_control* data)
-{
-	memset(data, 0, sizeof(struct flood_control));
-}
-
-int  flood_control_check(struct flood_control* data, size_t max_count, size_t time_delay, time_t now)
-{
-	// Is flood control disabled?
-	if (!time_delay || !max_count)
-		return 0;
-
-	if (!data->time)
-	{
-		data->time = now;
-		data->count = 0;
-		return 0;
-	}
-
-	if ((now - data->time) > time_delay)
-	{
-		data->time = now;
-		data->count = 0;
-		return 0;
-	}
-
-	if (data->count <= max_count)
-	{
-		data->count++;
-		return 0;
-	}
-
-	return 1;
-}
-

src/core/floodctl.h

@@ -1,47 +0,0 @@
-/*
- * 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_FLOOD_CTL_H
-#define HAVE_UHUB_FLOOD_CTL_H
-
-struct flood_control
-{
-	time_t time;
-	size_t count;
-};
-
-/**
- * Reset flood control statistics
- */
-void flood_control_reset(struct flood_control*);
-
-/**
- * @param ctl Flood control data structure
- * @param max_count Max count for flood control
- * @param window Time window for max_count to appear.
- * @param now The current time.
- * 
- * @return 0 if flood no flood detected.
- *         1 if flood detected.
- */
-int  flood_control_check(struct flood_control* ctl, size_t max_count, size_t window, time_t now);
-
-
-#endif /* HAVE_UHUB_FLOOD_CTL_H */
-

src/core/gen_config.h

@@ -1,88 +0,0 @@
-/* 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_require_redirect_addr;       /*<<< A redirect address in case a client connects using "adc://" when "adcs://" is required. (default: ) */
-	char* tls_certificate;                 /*<<< Certificate file (default: ) */
-	char* tls_private_key;                 /*<<< Private key file (default: ) */
-	char* file_motd;                       /*<<< File containing the 'message of the day (default: ) */
-	char* file_acl;                        /*<<< File containing access control lists (default: ) */
-	char* file_rules;                      /*<<< File containing hub rules (default: ) */
-	char* 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/hubevent.c

@@ -1,114 +0,0 @@
-/*
- * 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"
-
-static void log_user_login(struct hub_user* u)
-{
-	const char* cred = get_user_credential_string(u->credentials);
-	const char* addr = user_get_address(u);
-	LOG_USER("LoginOK     %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, cred, u->user_agent);
-}
-
-static void log_user_login_error(struct hub_user* u, enum status_message msg)
-{
-	const char* addr = user_get_address(u);
-	const char* message = hub_get_status_message_log(u->hub, msg);
-	LOG_USER("LoginError  %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message, u->user_agent);
-}
-
-static void log_user_update_error(struct hub_user* u, enum status_message msg)
-{
-	const char* addr = user_get_address(u);
-	const char* message = hub_get_status_message_log(u->hub, msg);
-	LOG_USER("UpdateError %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message, u->user_agent);
-}
-
-static void log_user_logout(struct hub_user* u, const char* message)
-{
-	const char* addr = user_get_address(u);
-	LOG_USER("Logout      %s/%s %s \"%s\" (%s)", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message);
-}
-
-static void log_user_nick_change(struct hub_user* u, const char* nick)
-{
-	const char* addr = user_get_address(u);
-	LOG_USER("NickChange  %s/%s %s \"%s\" -> \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, nick);
-}
-
-
-/* Send MOTD, do logging etc */
-void on_login_success(struct hub_info* hub, struct hub_user* u)
-{
-	/* Send user list of all existing users */
-	if (!uman_send_user_list(hub, u))
-		return;
-
-	/* Mark as being in the normal state, and add user to the user list */
-	user_set_state(u, state_normal);
-	uman_add(hub, u);
-
-	/* Print log message */
-	log_user_login(u);
-
-	/* Announce new user to all connected users */
-	if (user_is_logged_in(u))
-		route_info_message(hub, u);
-	
-	/* Send message of the day (if any) */
-	if (user_is_logged_in(u)) /* Previous send() can fail! */
-		hub_send_motd(hub, u);
-
-	/* Send message of the day (if any) */
-	if (user_is_logged_in(u)) /* Previous send() can fail! */
-		hub_send_rules(hub, u);
-
-	/* reset timeout */
-	net_con_clear_timeout(u->connection);
-}
-
-void on_login_failure(struct hub_info* hub, struct hub_user* u, enum status_message msg)
-{
-	log_user_login_error(u, msg);
-	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)
-{
-	log_user_update_error(u, msg);
-	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))
-	{
-		log_user_nick_change(u, nick);
-	}
-}
-
-void on_logout_user(struct hub_info* hub, struct hub_user* user)
-{
-	const char* reason = user_get_quit_reason_string(user->quit_reason);
-	log_user_logout(user, reason);
-	hub_logout_log(hub, user);
-}
-

src/core/hubio.c

@@ -1,173 +0,0 @@
-/*
- * 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 "hubio.h"
-
-#ifdef DEBUG_SENDQ
-static void debug_msg(const char* prefix, struct adc_message* msg)
-{
-	size_t n;
-	char* buf = strdup(msg->cache);
-	for (n = 0; n < msg->length; n++)
-	{
-		if (buf[n] == '\r' || buf[n] == '\n')
-			buf[n] = '_';
-	}
-	LOG_TRACE("%s: [%s] (%d bytes)", prefix, buf, (int) msg->length);
-	free(buf);
-}
-#endif
-
-struct hub_recvq* hub_recvq_create()
-{
-	struct hub_recvq* q = hub_malloc_zero(sizeof(struct hub_recvq));
-	return q;
-}
-
-void hub_recvq_destroy(struct hub_recvq* q)
-{
-	if (q)
-	{
-		hub_free(q->buf);
-		hub_free(q);
-	}
-}
-
-size_t hub_recvq_get(struct hub_recvq* q, void* buf, size_t bufsize)
-{
-	assert(bufsize >= q->size);
-	if (q->size)
-	{
-		size_t n = q->size;
-		memcpy(buf, q->buf, n);
-		hub_free(q->buf);
-		q->buf = 0;
-		q->size = 0;
-		return n;
-	}
-	return 0;
-}
-
-size_t hub_recvq_set(struct hub_recvq* q, void* buf, size_t bufsize)
-{
-	if (q->buf)
-	{
-		hub_free(q->buf);
-		q->buf = 0;
-		q->size = 0;
-	}
-	
-	if (!bufsize)
-	{
-		return 0;
-	}
-
-	q->buf = hub_malloc(bufsize);
-	if (!q->buf)
-		return 0;
-
-	q->size = bufsize;
-	memcpy(q->buf, buf, bufsize);
-	return bufsize;
-}
-
-
-struct hub_sendq* hub_sendq_create()
-{
-	struct hub_sendq* q = hub_malloc_zero(sizeof(struct hub_sendq));
-	if (!q)
-		return 0;
-
-	q->queue = list_create();
-	if (!q->queue)
-	{
-		hub_free(q);
-		return 0;
-	}
-
-	return q;
-}
-
-static void clear_send_queue_callback(void* ptr)
-{
-	adc_msg_free((struct adc_message*) ptr);
-}
-
-void hub_sendq_destroy(struct hub_sendq* q)
-{
-	if (q)
-	{
-		list_clear(q->queue, &clear_send_queue_callback);
-		list_destroy(q->queue);
-		hub_free(q);
-	}
-}
-
-void hub_sendq_add(struct hub_sendq* q, struct adc_message* msg_)
-{
-	struct adc_message* msg = adc_msg_incref(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;
-}
-
-void hub_sendq_remove(struct hub_sendq* q, struct adc_message* msg)
-{
-#ifdef DEBUG_SENDQ
-	debug_msg("hub_sendq_remove", msg);
-#endif
-	list_remove(q->queue, msg);
-	q->size  -= msg->length;
-	adc_msg_free(msg);
-	q->offset = 0;
-}
-
-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);
-	ret = net_con_send(user->connection, msg->cache + q->offset, msg->length - q->offset);
-
-	if (ret > 0)
-	{
-		q->offset += ret;
-		if (msg->length - q->offset > 0)
-			return 0;
-
-		hub_sendq_remove(q, msg);
-		return 1;
-	}
-	return ret;
-}
-
-int hub_sendq_is_empty(struct hub_sendq* q)
-{
-	return (q->size - q->offset) == 0;
-}
-
-size_t hub_sendq_get_bytes(struct hub_sendq* q)
-{
-	return q->size - q->offset;
-}

src/core/hubio.h

@@ -1,106 +0,0 @@
-/*
- * 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_HUB_IO_H
-#define HAVE_UHUB_HUB_IO_H
-
-struct adc_message;
-struct linked_list;
-typedef int (*hub_recvq_write)(void* desc, const void* buf, size_t len);
-typedef int (*hub_recvq_read)(void* desc, void* buf, size_t len);
-
-struct hub_sendq
-{
-	size_t               size;      /** Size of send queue (in bytes, not messages) */
-	size_t               offset;    /** Queue byte offset in the first message. Should be 0 unless a partial write. */
-#ifdef SSL_SUPPORT
-	size_t               last_send; /** When using SSL, one have to send the exact same buffer and length if a write cannot complete. */
-#endif
-	struct linked_list*  queue;     /** List of queued messages */
-};
-
-struct hub_recvq
-{
-	char* buf;
-	size_t size;
-};
-
-/**
- * Create a send queue
- */
-extern struct hub_sendq* hub_sendq_create();
-
-/**
- * Destroy a send queue, and delete any queued messages.
- */
-extern void hub_sendq_destroy(struct hub_sendq*);
-
-/**
- * Add a message to the send queue.
- */
-extern void hub_sendq_add(struct hub_sendq*, struct adc_message* msg);
-
-/**
- * Process the send queue, and send as many messages as possible.
- * @returns -1 on error, 0 if unable to send more, 1 if more can be sent.
- */
-extern int  hub_sendq_send(struct hub_sendq*, struct hub_user*);
-
-/**
- * @returns 1 if send queue is empty, 0 otherwise.
- */
-extern int hub_sendq_is_empty(struct hub_sendq*);
-
-/**
- * @returns the number of bytes remaining to be sent in the queue.
- */
-extern size_t hub_sendq_get_bytes(struct hub_sendq*);
-
-
-
-/**
- * Create a receive queue.
- */
-extern struct hub_recvq* hub_recvq_create();
-
-/**
- * Destroy a receive queue.
- */
-extern void hub_recvq_destroy(struct hub_recvq*);
-
-/**
- * Gets the buffer, copies it into buf and deallocates it.
- * NOTE: bufsize *MUST* be larger than the buffer, otherwise it asserts.
- * @return the number of bytes copied into buf.
- */
-extern size_t hub_recvq_get(struct hub_recvq*, void* buf, size_t bufsize);
-
-/**
- * Sets the buffer
- */
-extern size_t hub_recvq_set(struct hub_recvq*, void* buf, size_t bufsize);
-
-/**
- * @return 1 if size is zero, 0 otherwise.
- */
-extern int hub_recvq_is_empty(struct hub_recvq* buf);
-
-
-
-#endif /* HAVE_UHUB_HUB_IO_H */

src/core/netevent.c

@@ -1,219 +0,0 @@
-/*
- * 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 "hubio.h"
-#include "probe.h"
-
-/* FIXME: This should not be needed! */
-extern struct hub_info* g_hub;
-
-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;
-
-	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;
-
-	if (size < 0)
-	{
-		if (size == -1)
-			return quit_disconnected;
-		else
-			return quit_socket_error;
-	}
-	else if (size == 0)
-	{
-		return 0;
-	}
-	else
-	{
-		char* lastPos = 0;
-		char* start = buf;
-		char* pos = 0;
-		size_t remaining = buf_size;
-
-		while ((pos = memchr(start, '\n', remaining)))
-		{
-			lastPos = pos;
-			pos[0] = '\0';
-
-#ifdef DEBUG_SENDQ
-			LOG_DUMP("PROC: \"%s\" (%d)\n", start, (int) (pos - start));
-#endif
-
-			if (user_flag_get(user, flag_maxbuf))
-			{
-				user_flag_unset(user, flag_maxbuf);
-			}
-			else
-			{
-				if (((pos - start) > 0) && g_hub->config->max_recv_buffer > (pos - start))
-				{
-					if (hub_handle_message(g_hub, user, start, (pos - start)) == -1)
-					{
-							return quit_protocol_error;
-					}
-				}
-			}
-
-			pos[0] = '\n'; /* FIXME: not needed */
-			pos ++;
-			remaining -= (pos - start);
-			start = pos;
-		}
-
-		if (lastPos || remaining)
-		{
-			if (remaining < g_hub->config->max_recv_buffer)
-			{
-				hub_recvq_set(q, lastPos ? lastPos : buf, remaining);
-			}
-			else
-			{
-				hub_recvq_set(q, 0, 0);
-				user_flag_set(user, flag_maxbuf);
-				LOG_WARN("Received message past max_recv_buffer, dropping message.");
-			}
-		}
-		else
-		{
-			hub_recvq_set(q, 0, 0);
-		}
-	}
-	return 0;
-}
-
-int handle_net_write(struct hub_user* user)
-{
-	int ret = 0;
-	while (hub_sendq_get_bytes(user->send_queue))
-	{
-		ret = hub_sendq_send(user->send_queue, user);
-		if (ret <= 0)
-			break;
-	}
-
-	if (ret < 0)
-		return quit_socket_error;
-
-	if (hub_sendq_get_bytes(user->send_queue))
-	{
-		user_net_io_want_write(user);
-	}
-	else
-	{
-		user_net_io_want_read(user);
-	}
-	return 0;
-}
-
-void net_event(struct net_connection* con, int event, void *arg)
-{
-	struct hub_user* user = (struct hub_user*) arg;
-	int flag_close = 0;
-
-#ifdef DEBUG_SENDQ
-	LOG_TRACE("net_event() : fd=%d, ev=%d, arg=%p", con->sd, (int) event, arg);
-#endif
-
-	if (event == NET_EVENT_TIMEOUT)
-	{
-		if (user_is_connecting(user))
-		{
-			hub_disconnect_user(g_hub, user, quit_timeout);
-		}
-		return;
-	}
-
-	if (event & NET_EVENT_READ)
-	{
-		flag_close = handle_net_read(user);
-		if (flag_close)
-		{
-			hub_disconnect_user(g_hub, user, flag_close);
-			return;
-		}
-	}
-
-	if (event & NET_EVENT_WRITE)
-	{
-		flag_close = handle_net_write(user);
-		if (flag_close)
-		{
-			hub_disconnect_user(g_hub, user, flag_close);
-			return;
-		}
-	}
-}
-
-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);
-
-	for (;;)
-	{
-		int fd = net_accept(server_fd, &ipaddr);
-		if (fd == -1)
-		{
-			if (net_error() == EWOULDBLOCK)
-			{
-				break;
-			}
-			else
-			{
-				LOG_ERROR("Accept error: %d %s", net_error(), strerror(net_error()));
-				break;
-			}
-		}
-
-		addr = ip_convert_to_string(&ipaddr);
-
-		/* FIXME: Should have a plugin log this */
-		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);
-			net_close(fd);
-			continue;
-		}
-
-		probe = probe_create(hub, fd, &ipaddr);
-		if (!probe)
-		{
-			LOG_ERROR("Unable to create probe after socket accepted. Out of memory?");
-			net_close(fd);
-			break;
-		}
-	}
-}
-

src/core/probe.c

@@ -1,139 +0,0 @@
-/*
- * 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 "probe.h"
-
-#define PROBE_RECV_SIZE 12
-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)
-	{
-		probe_destroy(probe);
-		return;
-	}
-
-	if (events & NET_EVENT_READ)
-	{
-		int bytes = net_con_peek(con, probe_recvbuf, PROBE_RECV_SIZE);
-		if (bytes < 0)
-		{
-			probe_destroy(probe);
-			return;
-		}
-
-		if (bytes >= 4)
-		{
-			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)
-				{
-					if (*probe->hub->config->tls_require_redirect_addr)
-					{
-						char buf[512];
-						ssize_t len = snprintf(buf, sizeof(buf), "ISUP " ADC_PROTO_SUPPORT "\nISID AAAB\nIINF NIRedirecting...\nIQUI AAAB RD%s\n", probe->hub->config->tls_require_redirect_addr);
-						net_con_send(con, buf, (size_t) len);
-						LOG_TRACE("Not TLS connection - Redirecting to %s.", probe->hub->config->tls_require_redirect_addr);
-					}
-					else
-					{
-						LOG_TRACE("Not TLS connection - closing connection.");
-					}
-				}
-				else
-#endif
-				if (user_create(probe->hub, probe->connection, &probe->addr))
-				{
-					probe->connection = 0;
-				}
-				probe_destroy(probe);
-				return;
-			}
-#ifdef SSL_SUPPORT
-			else if (bytes >= 11 &&
-				probe_recvbuf[0] == 22 && 
-				probe_recvbuf[1] == 3 && /* protocol major version */
-				probe_recvbuf[5] == 1 && /* message type */
-				probe_recvbuf[9] == probe_recvbuf[1] &&
-				probe_recvbuf[10] == probe_recvbuf[2])
-			{
-				if (probe->hub->config->tls_enable)
-				{
-					LOG_TRACE("Probed TLS %d.%d connection", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
-					if (user_create(probe->hub, probe->connection, &probe->addr))
-					{
-						probe->connection = 0;
-					}
-					net_con_ssl_handshake(con, net_con_ssl_mode_server, probe->hub->ssl_ctx);
-				}
-				else
-				{
-					LOG_TRACE("Probed TLS %d.%d connection. TLS disabled in hub.", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
-				}
-				probe_destroy(probe);
-				return;
-			}
-			else
-			{
-				LOG_TRACE("Probed TLS %d.%d connection", (int) probe_recvbuf[1], (int) probe_recvbuf[2]);
-
-				net_con_ssl_handshake(con, net_con_ssl_mode_server, probe->hub->ssl_ctx);
-				return;
-			}
-#else
-			probe_destroy(probe);
-			return;
-#endif
-		}
-	}
-}
-
-struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_encap* addr)
-{
-	struct hub_probe* probe = (struct hub_probe*) hub_malloc_zero(sizeof(struct hub_probe));
-
-	if (probe == NULL)
-		return NULL; /* OOM */
-
-	LOG_TRACE("probe_create(): %p", probe);
-
-	probe->hub = hub;
-	probe->connection = net_con_create();
-	net_con_initialize(probe->connection, sd, probe_net_event, probe, NET_EVENT_READ);
-	net_con_set_timeout(probe->connection, TIMEOUT_CONNECTED);
-
-	memcpy(&probe->addr, addr, sizeof(struct ip_addr_encap));
-	return probe;
-}
-
-void probe_destroy(struct hub_probe* probe)
-{
-	LOG_TRACE("probe_destroy(): %p (connection=%p)", probe, probe->connection);
-	if (probe->connection)
-	{
-		net_con_close(probe->connection);
-		probe->connection = 0;
-	}
-	hub_free(probe);
-}

src/core/probe.h

@@ -1,35 +0,0 @@
-/*
- * 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_PROBE_H
-#define HAVE_UHUB_PROBE_H
-
-#include "uhub.h"
-
-struct hub_probe
-{
-	struct hub_info*        hub;                /** The hub instance this probe belong to */
-	struct net_connection*  connection;         /** Connection data */
-	struct ip_addr_encap    addr;               /** IP address */
-};
-
-extern struct hub_probe* probe_create(struct hub_info* hub, int sd, struct ip_addr_encap* addr);
-extern void probe_destroy(struct hub_probe* probe);
-
-#endif /* HAVE_UHUB_PROBE_H */

src/core/route.c

@@ -1,230 +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/>.
- *
- */
-
-#include "uhub.h"
-
-int route_message(struct hub_info* hub, struct hub_user* u, struct adc_message* msg)
-{
-	struct hub_user* target = NULL;
-
-	switch (msg->cache[0])
-	{
-		case 'B': /* Broadcast to all logged in clients */
-			route_to_all(hub, msg);
-			break;
-			
-		case 'D':
-			target = uman_get_user_by_sid(hub, msg->target);
-			if (target)
-			{
-				route_to_user(hub, target, msg);
-			}
-			break;
-			
-		case 'E':
-			target = uman_get_user_by_sid(hub, msg->target);
-			if (target)
-			{
-				route_to_user(hub, target, msg);
-				route_to_user(hub, u, msg);
-			}
-			break;
-			
-		case 'F':
-			route_to_subscribers(hub, msg);
-			break;	
-		
-		default:
-			/* Ignore the message */
-			break;
-	}
-	return 0;
-}
-
-static inline 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)));
-	 */
-	return hub->config->max_send_buffer;
-}
-
-static inline size_t get_max_send_queue_soft(struct hub_info* hub)
-{
-	return hub->config->max_send_buffer_soft;
-}
-
-/*
- * @return 1 if send queue is OK.
- *         -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)
-{
-	if (user_flag_get(user, flag_user_list))
-		return 1;
-
-	if ((user->send_queue->size + msg->length) > get_max_send_queue(hub))
-	{
-		LOG_WARN("send queue overflowed, message discarded.");
-		return -1;
-	}
-
-	if (user->send_queue->size > get_max_send_queue_soft(hub))
-	{
-		LOG_WARN("send queue soft overflowed.");
-		return 0;
-	}
-
-	return 1;
-}
-
-int route_to_user(struct hub_info* hub, struct hub_user* user, struct adc_message* msg)
-{
-#ifdef DEBUG_SENDQ
-	char* data = strndup(msg->cache, msg->length-1);
-	LOG_PROTO("send %s: \"%s\"", sid_to_string(user->id.sid), data);
-	free(data);
-#endif
-
-	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 */
-		hub_sendq_add(user->send_queue, msg);
-		handle_net_write(user);
-	}
-	else
-	{
-		if (check_send_queue(hub, user, msg) >= 0)
-		{
-			hub_sendq_add(user->send_queue, msg);
-			if (!user_flag_get(user, flag_pipeline))
-				user_net_io_want_write(user);
-		}
-	}
-	return 1;
-}
-
-int route_flush_pipeline(struct hub_info* hub, struct hub_user* u)
-{
-	if (hub_sendq_is_empty(u->send_queue))
-		return 0;
-
-	handle_net_write(u);
-	user_flag_unset(u, flag_pipeline);
-	return 1;
-}
-
-
-int route_to_all(struct hub_info* hub, struct adc_message* command) /* iterate users */
-{
-	struct hub_user* user = (struct hub_user*) list_get_first(hub->users->list);
-	while (user)
-	{
-		route_to_user(hub, user, command);
-		user = (struct hub_user*) list_get_next(hub->users->list);
-	}
-
-	return 0;
-}
-
-int route_to_subscribers(struct hub_info* hub, struct adc_message* command) /* iterate users */
-{
-	int do_send;
-	char* tmp;
-	
-	struct hub_user* user = (struct hub_user*) list_get_first(hub->users->list);
-	while (user)
-	{
-		if (user->feature_cast)
-		{
-			do_send = 1;
-			
-			tmp = list_get_first(command->feature_cast_include);
-			while (tmp)
-			{
-				if (!user_have_feature_cast_support(user, tmp))
-				{
-					do_send = 0;
-					break;
-				}
-				tmp = list_get_next(command->feature_cast_include);;
-			}
-			
-			if (!do_send) {
-				user = (struct hub_user*) list_get_next(hub->users->list);
-				continue;
-			}
-			
-			tmp = list_get_first(command->feature_cast_exclude);
-			while (tmp)
-			{
-				if (user_have_feature_cast_support(user, tmp))
-				{
-					do_send = 0;
-					break;
-				}
-				tmp = list_get_next(command->feature_cast_exclude);
-			}
-			
-			if (do_send)
-			{
-				route_to_user(hub, user, command);
-			}
-		}
-		user = (struct hub_user*) list_get_next(hub->users->list);
-	}
-	
-	return 0;
-}
-
-int route_info_message(struct hub_info* hub, struct hub_user* u)
-{
-	if (!user_is_nat_override(u))
-	{
-		return route_to_all(hub, u->info);
-	}
-	else
-	{
-		struct adc_message* cmd = adc_msg_copy(u->info);
-		const char* address = user_get_address(u);
-		struct hub_user* user = 0;
-		
-		adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR);
-		adc_msg_add_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR, address);
-	
-		user = (struct hub_user*) list_get_first(hub->users->list);
-		while (user)
-		{
-			if (user_is_nat_override(user))
-				route_to_user(hub, user, cmd);
-			else
-				route_to_user(hub, user, u->info);
-			
-			user = (struct hub_user*) list_get_next(hub->users->list);
-		}
-		adc_msg_free(cmd);
-	}
-	return 0;
-}

src/core/user.c

@@ -1,368 +0,0 @@
-/*
- * 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 DEBUG_SENDQ
-static const char* user_log_str(struct hub_user* user)
-{
-	static char buf[128];
-	if (user)
-	{
-		snprintf(buf, 128, "user={ %p, \"%s\", %s/%s}", user, user->id.nick, sid_to_string(user->id.sid), user->id.cid);
-	}
-	else
-	{
-		snprintf(buf, 128, "user={ %p }", user);
-	}
-	return buf;
-}
-#endif
-
-struct hub_user* user_create(struct hub_info* hub, struct net_connection* con, struct ip_addr_encap* addr)
-{
-	struct hub_user* user = NULL;
-	
-	LOG_TRACE("user_create(), hub=%p, con[sd=%d]", hub, net_con_get_sd(con));
-
-	user = (struct hub_user*) hub_malloc_zero(sizeof(struct hub_user));
-
-	if (user == NULL)
-		return NULL; /* OOM */
-
-	user->send_queue = hub_sendq_create();
-	user->recv_queue = hub_recvq_create();
-
-	user->connection = con;
-	net_con_reinitialize(user->connection, net_event, user, NET_EVENT_READ);
-
-	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;
-}
-
-
-void user_destroy(struct hub_user* user)
-{
-	LOG_TRACE("user_destroy(), user=%p", user);
-
-	hub_recvq_destroy(user->recv_queue);
-	hub_sendq_destroy(user->send_queue);
-
-	if (user->connection)
-	{
-		LOG_TRACE("user_destory() -> net_con_close(%p)", user->connection);
-		net_con_close(user->connection);
-	}
-
-	adc_msg_free(user->info);
-	user_clear_feature_cast_support(user);
-	hub_free(user);
-}
-
-void user_set_state(struct hub_user* user, enum user_state state)
-{
-	if ((user->state == state_cleanup && state != state_disconnected) || (user->state == state_disconnected))
-	{
-		return;
-	}
-	
-	user->state = state;
-}
-
-void user_set_info(struct hub_user* user, struct adc_message* cmd)
-{
-	adc_msg_free(user->info);
-	if (cmd)
-	{
-		user->info = adc_msg_incref(cmd);
-	}
-	else
-	{
-		user->info = 0;
-	}
-}
-
-void user_update_info(struct hub_user* u, struct adc_message* cmd)
-{
-	char prefix[2];
-	char* argument;
-	size_t n = 0;
-	struct adc_message* cmd_new = adc_msg_copy(u->info);
-	if (!cmd_new)
-	{
-		/* FIXME: OOM! */
-		return;
-	}
-
-	/*
-	 * FIXME: Optimization potential:
-	 *
-	 * remove parts of cmd that do not really change anything in cmd_new.
-	 * this can save bandwidth if clients send multiple updates for information
-	 * that does not really change anything.
-	 */
-	argument = adc_msg_get_argument(cmd, n++);
-	while (argument)
-	{
-		if (strlen(argument) >= 2)
-		{
-			prefix[0] = argument[0];
-			prefix[1] = argument[1];
-			adc_msg_replace_named_argument(cmd_new, prefix, argument+2);
-		}
-		
-		hub_free(argument);
-		argument = adc_msg_get_argument(cmd, n++);
-	}
-	user_set_info(u, cmd_new);
-	adc_msg_free(cmd_new);
-}
-
-
-static int convert_support_fourcc(int fourcc)
-{
-	switch (fourcc)
-	{
-		case FOURCC('B','A','S','0'):
-			return feature_bas0;
-
-		case FOURCC('B','A','S','E'):
-			return feature_base;
-
-		case FOURCC('A','U','T','0'):
-			return  feature_auto;
-
-		case FOURCC('U','C','M','0'):
-		case FOURCC('U','C','M','D'):
-			return feature_ucmd;
-
-		case FOURCC('Z','L','I','F'):
-			return feature_zlif;
-
-		case FOURCC('B','B','S','0'):
-			return feature_bbs;
-
-		case FOURCC('T','I','G','R'):
-			return feature_tiger;
-
-		case FOURCC('B','L','O','M'):
-		case FOURCC('B','L','O','0'):
-			return feature_bloom;
-
-		case FOURCC('P','I','N','G'):
-			return feature_ping;
-
-		case FOURCC('L','I','N','K'):
-			return feature_link;
-
-		case FOURCC('A','D','C','S'):
-			return feature_adcs;
-
-		default:
-			LOG_DEBUG("Unknown extension: %x", fourcc);
-			return 0;
-	}
-}
-
-void user_support_add(struct hub_user* user, int fourcc)
-{
-	int feature_mask = convert_support_fourcc(fourcc);
-	user->flags |= feature_mask;
-}
-
-int user_flag_get(struct hub_user* user, enum user_flags flag)
-{
-    return user->flags & flag;
-}
-
-void user_flag_set(struct hub_user* user, enum user_flags flag)
-{
-    user->flags |= flag;
-}
-
-void user_flag_unset(struct hub_user* user, enum user_flags flag)
-{
-    user->flags &= ~flag;
-}
-
-void user_set_nat_override(struct hub_user* user)
-{
-	user_flag_set(user, flag_nat);
-}
-
-int user_is_nat_override(struct hub_user* user)
-{
-	return user_flag_get(user, flag_nat);
-}
-
-void user_support_remove(struct hub_user* user, int fourcc)
-{
-	int feature_mask = convert_support_fourcc(fourcc);
-	user->flags &= ~feature_mask;
-}
-
-int user_have_feature_cast_support(struct hub_user* user, char feature[4])
-{
-	char* tmp = list_get_first(user->feature_cast);
-	while (tmp)
-	{
-		if (strncmp(tmp, feature, 4) == 0)
-			return 1;
-	
-		tmp = list_get_next(user->feature_cast);
-	}
-	
-	return 0;
-}
-
-int user_set_feature_cast_support(struct hub_user* u, char feature[4])
-{
-	if (!u->feature_cast)
-	{
-		u->feature_cast = list_create();
-	}
-
-	if (!u->feature_cast)
-	{
-		return 0; /* OOM! */
-	}
-
-	list_append(u->feature_cast, hub_strndup(feature, 4));
-	return 1;
-}
-
-void user_clear_feature_cast_support(struct hub_user* u)
-{
-	if (u->feature_cast)
-	{
-		list_clear(u->feature_cast, &hub_free);
-		list_destroy(u->feature_cast);
-		u->feature_cast = 0;
-	}
-}
-
-int user_is_logged_in(struct hub_user* user)
-{
-	if (user->state == state_normal)
-		return 1;
-	return 0;
-}
-
-int user_is_connecting(struct hub_user* user)
-{
-	if (user->state == state_protocol || user->state == state_identify || user->state == state_verify)
-		return 1;
-	return 0;
-}
-
-int user_is_protocol_negotiating(struct hub_user* user)
-{
-	if (user->state == state_protocol)
-		return 1;
-	return 0;
-}
-
-int user_is_disconnecting(struct hub_user* user)
-{
-	if (user->state == state_cleanup || user->state == state_disconnected)
-		return 1;
-	return 0;
-}
-
-int user_is_protected(struct hub_user* user)
-{
-	switch (user->credentials)
-	{
-		case cred_bot:
-		case cred_operator:
-		case cred_super:
-		case cred_admin:
-		case cred_link:
-			return 1;
-		default:
-			break;
-	}
-	return 0;
-}
-
-/**
- * Returns 1 if a user is registered.
- * Only registered users will be let in if the hub is configured for registered
- * users only.
- */
-int user_is_registered(struct hub_user* user)
-{
-	switch (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)
-{
-	net_con_update(user->connection, NET_EVENT_READ | NET_EVENT_WRITE);
-}
-
-void user_net_io_want_read(struct hub_user* user)
-{
-	net_con_update(user->connection, NET_EVENT_READ);
-}
-
-const char* user_get_quit_reason_string(enum user_quit_reason reason)
-{
-	switch (reason)
-	{
-		case quit_unknown:          return "unknown";        break;
-		case quit_disconnected:     return "disconnected";   break;
-		case quit_kicked:           return "kicked";         break;
-		case quit_banned:           return "banned";         break;
-		case quit_timeout:          return "timeout";        break;
-		case quit_send_queue:       return "send queue";     break;
-		case quit_memory_error:     return "out of memory";  break;
-		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;
-	}
-
-	return "unknown";
-}
-
-const char* user_get_address(struct hub_user* user)
-{
-	return ip_convert_to_string(&user->id.addr);
-}

src/eventid.h

@@ -28,14 +28,10 @@
 /* Send a broadcast message */
 #define UHUB_EVENT_BROADCAST         0x2000
 
-/* Shutdown hub */
-#define UHUB_EVENT_HUB_SHUTDOWN      0x3001
-
 /* Statistics, OOM, reconfigure */
 #define UHUB_EVENT_STATISTICS        0x4000
 #define UHUB_EVENT_OUT_OF_MEMORY     0x4001
 #define UHUB_EVENT_RECONFIGURE       0x4002
 
-
 #endif /* HAVE_UHUB_EVENT_ID_H */
 

src/eventqueue.c

@@ -22,7 +22,7 @@
 #ifdef EQ_DEBUG
 static void eq_debug(const char* prefix, struct event_data* data)
 {
-	LOG_DUMP(">>> %s: %p, id: %x, flags=%d\n", prefix, data, data->id, data->flags);
+	printf(">>> %s: %p, id: %x, flags=%d\n", prefix, data, data->id, data->flags);
 }
 #endif
 
@@ -130,7 +130,7 @@ void event_queue_post(struct event_queue* queue, struct event_data* message)
 	}
 	else
 	{
-		LOG_ERROR("event_queue_post: OUT OF MEMORY");
+		hub_log(log_error, "event_queue_post: OUT OF MEMORY");
 	}
 }
 

src/hub.c

@@ -0,0 +1,889 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+int hub_handle_message(struct hub_info* hub, struct user* u, const char* line, size_t length)
+{
+	int ret = 0;
+	struct adc_message* cmd = 0;
+	
+#ifdef NETWORK_DUMP_DEBUG
+	hub_log(log_protocol, "recv %s: %s", sid_to_string(u->id.sid), line);
+#endif
+	
+	if (user_is_disconnecting(u))
+		return -1;
+	
+	cmd = adc_msg_parse_verify(u, line, length);
+	if (cmd)
+	{
+		switch (cmd->cmd)
+		{
+			case ADC_CMD_HSUP: ret = hub_handle_support(hub, u, cmd); break;
+			case ADC_CMD_HPAS: ret = hub_handle_password(hub, u, cmd); break;
+			case ADC_CMD_BINF: ret = hub_handle_info(hub, u, cmd); break;
+			case ADC_CMD_DINF:
+			case ADC_CMD_EINF:
+			case ADC_CMD_FINF:
+				/* these must never be allowed for security reasons,
+				   so we ignore them. */
+				break;
+
+			case ADC_CMD_EMSG:
+			case ADC_CMD_DMSG:
+			case ADC_CMD_BMSG:
+			case ADC_CMD_FMSG:
+				ret = hub_handle_chat_message(hub, u, cmd);
+				break;
+
+			case ADC_CMD_BSCH:
+			case ADC_CMD_DSCH:
+			case ADC_CMD_ESCH:
+			case ADC_CMD_FSCH:
+			case ADC_CMD_DRES:
+			case ADC_CMD_DRCM:
+			case ADC_CMD_DCTM:
+				cmd->priority = -1;
+				if (hub->config->chat_only && u->credentials < cred_operator)
+				{
+					/* These below aren't allowed in chat only hubs */
+					break;
+				}
+			
+			default:
+				if (user_is_logged_in(u))
+				{
+					ret = route_message(u, cmd);
+				}
+				else
+				{
+					ret = -1;
+				}
+				break;
+		}
+		adc_msg_free(cmd);
+	}
+	else
+	{
+		if (!user_is_logged_in(u))
+		{
+			ret = -1;
+		}
+	}
+	
+	return ret;
+}
+
+
+int hub_handle_support(struct hub_info* hub, struct user* u, struct adc_message* cmd)
+{
+	int ret = 0;
+	int index = 0;
+	int ok = 1;
+	char* arg = adc_msg_get_argument(cmd, index);
+	struct timeval timeout = { TIMEOUT_HANDSHAKE, 0 };
+
+	if (hub->status == hub_status_disabled && u->state == state_protocol)
+	{
+		on_login_failure(hub, u, status_msg_hub_disabled);
+		return -1;
+	}
+	
+	while (arg)
+	{
+	
+		if (strlen(arg) == 6)
+		{
+			fourcc_t fourcc = FOURCC(arg[2], arg[3], arg[4], arg[5]);
+			if (strncmp(arg, ADC_SUP_FLAG_ADD, 2) == 0)
+			{
+				user_support_add(u, fourcc);
+			}
+			else if (strncmp(arg, ADC_SUP_FLAG_REMOVE, 2) == 0)
+			{
+				user_support_remove(u, fourcc);
+			}
+			else
+			{
+				ok = 0;
+			}
+		}
+		else
+		{
+			ok = 0;
+		}
+		
+		index++;
+		hub_free(arg);
+		arg = adc_msg_get_argument(cmd, index);
+	}
+	
+	if (u->state == state_protocol)
+	{
+		if (index == 0) ok = 0; /* Need to support *SOMETHING*, at least BASE */
+	
+		if (ok)
+		{
+			hub_send_handshake(hub, u);
+			if (u->ev_read)
+				event_add(u->ev_read, &timeout);
+		}
+		else
+		{
+			/* disconnect user. Do not send crap during initial handshake! */
+			user_disconnect(u, quit_logon_error);
+			ret = -1;
+		}
+	}
+	
+	return ret;
+}
+
+
+int hub_handle_password(struct hub_info* hub, struct user* u, struct adc_message* cmd)
+{
+	char* password = adc_msg_get_argument(cmd, 0);
+	int ret = 0;
+
+	if (u->state == state_verify)
+	{
+		if (password_verify(u, password))
+		{
+			on_login_success(hub, u);
+		}
+		else
+		{
+			on_login_failure(hub, u, status_msg_auth_invalid_password);
+			ret = -1;
+		}
+	}
+	
+	hub_free(password);
+	return ret;
+}
+
+
+int hub_handle_chat_message(struct hub_info* hub, struct user* u, struct adc_message* cmd)
+{
+	char* message = adc_msg_get_argument(cmd, 0);
+	int ret = 0;
+	int relay = 1;
+	
+	/* TODO: Check for hub-commands here. Set relay to 0 and the message will not be sent to other users. */
+	if (message[0] == '!' || message[0] == '+')
+	{
+	    relay = command_dipatcher(hub, u, message);
+	}
+
+	if (relay && user_is_logged_in(u))
+	{
+		/* adc_msg_remove_named_argument(cmd, "PM"); */
+		ret = route_message(u, cmd);
+	}
+	
+	free(message);
+	return ret;
+}
+
+void hub_send_support(struct hub_info* hub, struct user* u)
+{
+	if (user_is_connecting(u) || user_is_logged_in(u))
+	{
+		route_to_user(u, hub->command_support);
+	}
+}
+
+
+void hub_send_sid(struct hub_info* hub, struct user* u)
+{
+	struct adc_message* command;
+	if (user_is_connecting(u))
+	{
+		command = adc_msg_construct(ADC_CMD_ISID, 10);
+		u->id.sid = uman_get_free_sid(hub);
+		adc_msg_add_argument(command, (const char*) sid_to_string(u->id.sid));
+		route_to_user(u, command);
+		adc_msg_free(command);
+	}
+}
+
+
+void hub_send_ping(struct hub_info* hub, struct user* user)
+{
+	/* This will just send a newline, despite appearing to do more below. */
+	struct adc_message* ping = adc_msg_construct(0, 0);
+	ping->cache[0]     = '\n';
+	ping->cache[1]     = 0;
+	ping->length       = 1;
+	ping->priority     = 1;
+	route_to_user(user, ping);
+	adc_msg_free(ping);
+}
+
+
+void hub_send_hubinfo(struct hub_info* hub, struct user* u)
+{
+	struct adc_message* info = adc_msg_copy(hub->command_info);
+	int value = 0;
+	
+	if (user_flag_get(u, feature_ping))
+	{
+/*
+		FIXME: These are missing:
+		HH - Hub Host address ( DNS or IP )
+		WS - Hub Website
+		NE - Hub Network
+		OW - Hub Owner name
+*/
+		adc_msg_add_named_argument(info, "UC", uhub_itoa(hub_get_user_count(hub)));
+		adc_msg_add_named_argument(info, "MC", uhub_itoa(hub_get_max_user_count(hub)));
+		adc_msg_add_named_argument(info, "SS", uhub_ulltoa(hub_get_shared_size(hub)));
+		adc_msg_add_named_argument(info, "SF", uhub_itoa(hub_get_shared_files(hub)));
+		
+		/* Maximum/minimum share size */
+		value = hub_get_max_share(hub);
+		if (value) adc_msg_add_named_argument(info, "XS", uhub_itoa(value));
+		value = hub_get_min_share(hub);
+		if (value) adc_msg_add_named_argument(info, "MS", uhub_itoa(value));
+		
+		/* Maximum/minimum upload slots allowed per user */
+		value = hub_get_max_slots(hub);
+		if (value) adc_msg_add_named_argument(info, "XL", uhub_itoa(value));
+		value = hub_get_min_slots(hub);
+		if (value) adc_msg_add_named_argument(info, "ML", uhub_itoa(value));
+		
+		/* guest users must be on min/max hubs */
+		value = hub_get_max_hubs_user(hub);
+		if (value) adc_msg_add_named_argument(info, "XU", uhub_itoa(value));
+		value = hub_get_min_hubs_user(hub);
+		if (value) adc_msg_add_named_argument(info, "MU", uhub_itoa(value));
+		
+		/* registered users must be on min/max hubs */
+		value = hub_get_max_hubs_reg(hub);
+		if (value) adc_msg_add_named_argument(info, "XR", uhub_itoa(value));
+		value = hub_get_min_hubs_reg(hub);
+		if (value) adc_msg_add_named_argument(info, "MR", uhub_itoa(value));
+		
+		/* operators must be on min/max hubs */
+		value = hub_get_max_hubs_op(hub);
+		if (value) adc_msg_add_named_argument(info, "XO", uhub_itoa(value));
+		value = hub_get_min_hubs_op(hub);
+		if (value) adc_msg_add_named_argument(info, "MO", uhub_itoa(value));
+		
+		/* uptime in seconds */
+		adc_msg_add_named_argument(info, "UP", uhub_itoa((int) difftime(time(0), hub->tm_started)));
+	}
+	
+	if (user_is_connecting(u) || user_is_logged_in(u))
+	{
+		route_to_user(u, info);
+	}
+	adc_msg_free(info);
+	
+	/* Only send banner when connecting */
+	if (hub->config->show_banner && user_is_connecting(u))
+	{
+		route_to_user(u, hub->command_banner);
+	}
+}
+
+void hub_send_handshake(struct hub_info* hub, struct user* u)
+{
+	hub_send_support(hub, u);
+	hub_send_sid(hub, u);
+	hub_send_hubinfo(hub, u);
+
+	if (!user_is_disconnecting(u))
+	{
+		user_set_state(u, state_identify);
+	}
+}
+
+void hub_send_motd(struct hub_info* hub, struct user* u)
+{
+	if (hub->command_motd)
+	{
+		route_to_user(u, hub->command_motd);
+	}
+}
+
+void hub_send_password_challenge(struct hub_info* hub, struct user* u)
+{
+	struct adc_message* igpa;
+	igpa = adc_msg_construct(ADC_CMD_IGPA, 38);
+	adc_msg_add_argument(igpa, password_generate_challenge(u));
+	user_set_state(u, state_verify);
+	route_to_user(u, igpa);
+	adc_msg_free(igpa);
+}
+
+static void hub_event_dispatcher(void* callback_data, struct event_data* message)
+{
+	struct hub_info* hub = (struct hub_info*) callback_data;
+/*
+	hub_log(log_trace, "hub_event_dispatcher: %x (ptr=%p)", message->id, message->ptr);
+*/
+	
+	switch (message->id)
+	{
+		case UHUB_EVENT_USER_JOIN:
+		{
+			if (user_is_disconnecting((struct user*) message->ptr))
+				break;
+		
+			if (message->flags)
+			{
+				hub_send_password_challenge(hub, (struct user*) message->ptr);
+			}
+			else
+			{
+				on_login_success(hub, (struct user*) message->ptr);
+			}
+			break;
+		}
+
+		case UHUB_EVENT_USER_QUIT:
+		{
+			uman_remove(hub, (struct user*) message->ptr);
+			uman_send_quit_message((struct user*) message->ptr);
+			on_logout_user(hub, (struct user*) message->ptr);
+			user_schedule_destroy((struct user*) message->ptr);
+			break;
+		}
+		
+		case UHUB_EVENT_USER_DESTROY:
+		{
+			hub_log(log_trace, "hub_event_dispatcher: UHUB_EVENT_USER_DESTROY (ptr=%p)", message->ptr);
+			user_destroy((struct user*) message->ptr);
+			break;
+		}
+		
+		default:
+			/* FIXME: ignored */
+			break;
+	}
+}
+
+
+struct hub_info* hub_start_service(struct hub_config* config)
+{
+	struct hub_info* hub = 0;
+	struct sockaddr_storage addr;
+	socklen_t sockaddr_size;
+	int server_tcp, ret, ipv6_supported, af;
+	char address_buf[INET6_ADDRSTRLEN+1];
+	
+	hub = hub_malloc_zero(sizeof(struct hub_info));
+	if (!hub)
+	{
+		hub_log(log_fatal, "Unable to allocate memory for hub");
+		return 0;
+	}
+	
+	hub->tm_started = time(0);
+	
+	ipv6_supported = net_is_ipv6_supported();
+	
+	if (ipv6_supported)
+		hub_log(log_debug, "IPv6 supported.");
+	else
+		hub_log(log_debug, "IPv6 not supported.");
+	
+	if (ip_convert_address(config->server_bind_addr, config->server_port, (struct sockaddr*) &addr, &sockaddr_size) == -1)
+	{
+		hub_free(hub);
+		return 0;
+	}
+	
+	af = addr.ss_family;
+	if (af == AF_INET)
+	{
+		net_address_to_string(AF_INET, &((struct sockaddr_in*) &addr)->sin_addr, address_buf, INET6_ADDRSTRLEN);
+	}
+	else if (af == AF_INET6)
+	{
+		net_address_to_string(AF_INET6, &((struct sockaddr_in6*) &addr)->sin6_addr, address_buf, INET6_ADDRSTRLEN);
+	}
+
+#ifdef LIBEVENT_1_4
+	hub->evbase = event_base_new();
+#else
+	hub->evbase = event_init();
+#endif
+	if (!hub->evbase)
+	{
+		hub_log(log_error, "Unable to initialize libevent.");
+		hub_free(hub);
+		return 0;
+	}
+
+	hub_log(log_info, "Starting " PRODUCT "/" VERSION ", listening on %s:%d...", address_buf, config->server_port);
+	hub_log(log_debug, "Using libevent %s, backend: %s", event_get_version(), event_get_method());
+
+	server_tcp = net_socket_create(af, SOCK_STREAM, IPPROTO_TCP);
+	if (server_tcp == -1)
+	{
+		event_base_free(hub->evbase);
+		hub_free(hub);
+		return 0;
+	}
+	
+	ret = net_set_reuseaddress(server_tcp, 1);
+	if (ret == -1)
+	{
+		event_base_free(hub->evbase);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+	
+	ret = net_set_nonblocking(server_tcp, 1);
+	if (ret == -1)
+	{
+		event_base_free(hub->evbase);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+	
+	ret = net_bind(server_tcp, (struct sockaddr*) &addr, sockaddr_size);
+	if (ret == -1)
+	{
+		hub_log(log_fatal, "hub_start_service(): Unable to bind to TCP local address. errno=%d, str=%s", net_error(), net_error_string(net_error()));
+		event_base_free(hub->evbase);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+
+	ret = net_listen(server_tcp, SERVER_BACKLOG);
+	if (ret == -1)
+	{
+		hub_log(log_fatal, "hub_start_service(): Unable to listen to socket");
+		event_base_free(hub->evbase);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+	
+	hub->fd_tcp = server_tcp;
+	hub->config = config;
+	hub->users = NULL;
+	
+	if (uman_init(hub) == -1)
+	{
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+	
+	event_set(&hub->ev_accept, hub->fd_tcp, EV_READ | EV_PERSIST, net_on_accept, hub);
+	event_base_set(hub->evbase, &hub->ev_accept);
+	if (event_add(&hub->ev_accept, NULL) == -1)
+	{
+		uman_shutdown(hub);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+
+	if (event_queue_initialize(&hub->queue, hub_event_dispatcher, (void*) hub) == -1)
+	{
+		uman_shutdown(hub);
+		hub_free(hub);
+		net_close(server_tcp);
+		return 0;
+	}
+	
+	hub->status = hub_status_running;
+	
+	return hub;
+}
+
+
+void hub_shutdown_service(struct hub_info* hub)
+{
+	hub_log(log_trace, "hub_shutdown_service()");
+
+	event_queue_shutdown(hub->queue);
+	event_del(&hub->ev_accept);
+	net_close(hub->fd_tcp);
+	uman_shutdown(hub);
+	hub->status = hub_status_stopped;
+	event_base_free(hub->evbase);
+	hub_free(hub);
+	hub = 0;
+}
+
+#define SERVER "" PRODUCT "/" VERSION ""
+
+void hub_set_variables(struct hub_info* hub, struct acl_handle* acl)
+{
+	int fd, ret;
+	char buf[MAX_RECV_BUF];
+	char* tmp;
+	
+	
+	hub->acl = acl;
+	hub->command_info = adc_msg_construct(ADC_CMD_IINF, 15 + strlen(SERVER));
+	if (hub->command_info)
+	{
+		adc_msg_add_named_argument(hub->command_info, ADC_INF_FLAG_CLIENT_TYPE, ADC_CLIENT_TYPE_HUB);
+		adc_msg_add_named_argument(hub->command_info, ADC_INF_FLAG_USER_AGENT, SERVER);
+	
+		tmp = adc_msg_escape(hub->config->hub_name);
+		adc_msg_add_named_argument(hub->command_info, ADC_INF_FLAG_NICK, tmp);
+		hub_free(tmp);
+	
+		tmp = adc_msg_escape(hub->config->hub_description);
+		adc_msg_add_named_argument(hub->command_info, ADC_INF_FLAG_DESCRIPTION, tmp);
+		hub_free(tmp);
+	}
+	
+	/* (Re-)read the message of the day */
+	hub->command_motd = 0;
+	fd = open(hub->config->file_motd, 0);
+	if (fd != -1)
+	{
+		ret = read(fd, buf, MAX_RECV_BUF);
+		if (ret > 0)
+		{
+			buf[ret] = 0;
+			tmp = adc_msg_escape(buf);
+			hub->command_motd = adc_msg_construct(ADC_CMD_IMSG, 6 + strlen(tmp));
+ 			adc_msg_add_argument(hub->command_motd, tmp);
+			hub_free(tmp);
+		}
+		else
+		{
+			
+		}
+		close(fd);
+	}
+	
+	hub->command_support = adc_msg_construct(ADC_CMD_ISUP, 6 + strlen(ADC_PROTO_SUPPORT));
+	if (hub->command_support)
+	{
+		adc_msg_add_argument(hub->command_support, ADC_PROTO_SUPPORT);
+	}
+	
+	hub->command_banner = adc_msg_construct(ADC_CMD_ISTA, 25 + strlen(SERVER));
+	if (hub->command_banner)
+	{
+		adc_msg_add_argument(hub->command_banner, "000 Powered\\sby\\s" SERVER);
+	}
+	
+	hub->status = (hub->config->hub_enabled ? hub_status_running : hub_status_disabled);
+}
+
+
+void hub_free_variables(struct hub_info* hub)
+{
+	adc_msg_free(hub->command_info);
+	adc_msg_free(hub->command_banner);
+	
+	if (hub->command_motd)
+		adc_msg_free(hub->command_motd);
+	
+	adc_msg_free(hub->command_support);
+}
+
+
+/**
+ * @return 1 if nickname is in use, or 0 if not used.
+ */
+static inline int is_nick_in_use(struct hub_info* hub, const char* nick)
+{
+	struct user* lookup = uman_get_user_by_nick(hub, nick);
+	if (lookup)
+	{
+		return 1;
+	}
+	return 0;
+}
+
+
+/**
+ * @return 1 if CID is in use, or 0 if not used.
+ */
+static inline int is_cid_in_use(struct hub_info* hub, const char* cid)
+{
+	struct user* lookup = uman_get_user_by_cid(hub, cid);
+	if (lookup)
+	{
+		return 1;
+	}
+	return 0;
+}
+
+
+
+
+static void set_status_code(enum msg_status_level level, int code, char buffer[4])
+{
+	buffer[0] = ('0' + (int) level);
+	buffer[1] = ('0' + (code / 10));
+	buffer[2] = ('0' + (code % 10));
+	buffer[3] = 0;
+}
+
+/**
+ * @param hub The hub instance this message is sent from.
+ * @param user The user this message is sent to.
+ * @param msg See enum status_message
+ * @param level See enum status_level
+ */
+void hub_send_status(struct hub_info* hub, struct user* user, enum status_message msg, enum msg_status_level level)
+{
+	struct hub_config* cfg = hub->config;
+	struct adc_message* cmd = adc_msg_construct(ADC_CMD_ISTA, 6);
+	if (!cmd) return;
+	char code[4];
+	const char* text = 0;
+	const char* flag = 0;
+	char* escaped_text = 0;
+	
+#define STATUS(CODE, MSG, FLAG) case status_ ## MSG : set_status_code(level, CODE, code); text = cfg->MSG; flag = FLAG; break
+	switch (msg)
+	{
+		STATUS(11, msg_hub_full, 0);
+		STATUS(12, msg_hub_disabled, 0);
+		STATUS(26, msg_hub_registered_users_only, 0);
+		STATUS(43, msg_inf_error_nick_missing, 0);
+		STATUS(43, msg_inf_error_nick_multiple, 0);
+		STATUS(21, msg_inf_error_nick_invalid, 0);
+		STATUS(21, msg_inf_error_nick_long, 0);
+		STATUS(21, msg_inf_error_nick_short, 0);
+		STATUS(21, msg_inf_error_nick_spaces, 0);
+		STATUS(21, msg_inf_error_nick_bad_chars, 0);
+		STATUS(21, msg_inf_error_nick_not_utf8, 0);
+		STATUS(22, msg_inf_error_nick_taken, 0);
+		STATUS(21, msg_inf_error_nick_restricted, 0);
+		STATUS(43, msg_inf_error_cid_invalid, "FBID");
+		STATUS(43, msg_inf_error_cid_missing, "FMID");
+		STATUS(24, msg_inf_error_cid_taken, 0);
+		STATUS(43, msg_inf_error_pid_missing, "FMPD");
+		STATUS(27, msg_inf_error_pid_invalid, "FBPD");
+		STATUS(31, msg_ban_permanently, 0);
+		STATUS(32, msg_ban_temporarily, "TL600"); /* FIXME: Use a proper timeout */
+		STATUS(23, msg_auth_invalid_password, 0);
+		STATUS(20, msg_auth_user_not_found, 0);
+		STATUS(30, msg_error_no_memory, 0);
+		STATUS(43, msg_user_share_size_low,   "FB" ADC_INF_FLAG_SHARED_SIZE);
+		STATUS(43, msg_user_share_size_high,  "FB" ADC_INF_FLAG_SHARED_SIZE);
+		STATUS(43, msg_user_slots_low,        "FB" ADC_INF_FLAG_UPLOAD_SLOTS);
+		STATUS(43, msg_user_slots_high,       "FB" ADC_INF_FLAG_UPLOAD_SLOTS);
+		STATUS(43, msg_user_hub_limit_low, 0);
+		STATUS(43, msg_user_hub_limit_high, 0);
+	}
+#undef STATUS
+	
+	escaped_text = adc_msg_escape(text);
+	
+	adc_msg_add_argument(cmd, code);
+	adc_msg_add_argument(cmd, escaped_text);
+	
+	hub_free(escaped_text);
+	
+	if (flag)
+	{
+		adc_msg_add_argument(cmd, flag);
+	}
+	
+	route_to_user(user, cmd);
+	adc_msg_free(cmd);
+	
+}
+
+const char* hub_get_status_message(struct hub_info* hub, enum status_message msg)
+{
+#define STATUS(MSG) case status_ ## MSG : return cfg->MSG; break
+	struct hub_config* cfg = hub->config;
+	switch (msg)
+	{
+		STATUS(msg_hub_full);
+		STATUS(msg_hub_disabled);
+		STATUS(msg_hub_registered_users_only);
+		STATUS(msg_inf_error_nick_missing);
+		STATUS(msg_inf_error_nick_multiple);
+		STATUS(msg_inf_error_nick_invalid);
+		STATUS(msg_inf_error_nick_long);
+		STATUS(msg_inf_error_nick_short);
+		STATUS(msg_inf_error_nick_spaces);
+		STATUS(msg_inf_error_nick_bad_chars);
+		STATUS(msg_inf_error_nick_not_utf8);
+		STATUS(msg_inf_error_nick_taken);
+		STATUS(msg_inf_error_nick_restricted);
+		STATUS(msg_inf_error_cid_invalid);
+		STATUS(msg_inf_error_cid_missing);
+		STATUS(msg_inf_error_cid_taken);
+		STATUS(msg_inf_error_pid_missing);
+		STATUS(msg_inf_error_pid_invalid);
+		STATUS(msg_ban_permanently);
+		STATUS(msg_ban_temporarily);
+		STATUS(msg_auth_invalid_password);
+		STATUS(msg_auth_user_not_found);
+		STATUS(msg_error_no_memory);
+		STATUS(msg_user_share_size_low);
+		STATUS(msg_user_share_size_high);
+		STATUS(msg_user_slots_low);
+		STATUS(msg_user_slots_high);
+		STATUS(msg_user_hub_limit_low);
+		STATUS(msg_user_hub_limit_high);
+	}
+#undef STATUS
+	return "Unknown";
+}
+
+const char* hub_get_status_message_log(struct hub_info* hub, enum status_message msg)
+{
+#define STATUS(MSG) case status_ ## MSG : return #MSG; break
+        switch (msg)
+        {
+                STATUS(msg_hub_full);
+                STATUS(msg_hub_disabled);
+                STATUS(msg_hub_registered_users_only);
+                STATUS(msg_inf_error_nick_missing);
+                STATUS(msg_inf_error_nick_multiple);
+                STATUS(msg_inf_error_nick_invalid);
+                STATUS(msg_inf_error_nick_long);
+                STATUS(msg_inf_error_nick_short);
+                STATUS(msg_inf_error_nick_spaces);
+                STATUS(msg_inf_error_nick_bad_chars);
+                STATUS(msg_inf_error_nick_not_utf8);
+                STATUS(msg_inf_error_nick_taken);
+                STATUS(msg_inf_error_nick_restricted);
+                STATUS(msg_inf_error_cid_invalid);
+                STATUS(msg_inf_error_cid_missing);
+                STATUS(msg_inf_error_cid_taken);
+                STATUS(msg_inf_error_pid_missing);
+                STATUS(msg_inf_error_pid_invalid);
+                STATUS(msg_ban_permanently);
+                STATUS(msg_ban_temporarily);
+                STATUS(msg_auth_invalid_password);
+                STATUS(msg_auth_user_not_found);
+                STATUS(msg_error_no_memory);
+                STATUS(msg_user_share_size_low);
+                STATUS(msg_user_share_size_high);
+                STATUS(msg_user_slots_low);
+                STATUS(msg_user_slots_high);
+                STATUS(msg_user_hub_limit_low);
+                STATUS(msg_user_hub_limit_high);
+        }
+#undef STATUS
+        return "unknown";
+}
+
+
+size_t hub_get_user_count(struct hub_info* hub)
+{
+	return hub->users->count;
+}
+
+size_t hub_get_max_user_count(struct hub_info* hub)
+{
+	return hub->config->max_users;
+}
+
+uint64_t hub_get_shared_size(struct hub_info* hub)
+{
+	return hub->users->shared_size;
+}
+
+uint64_t hub_get_shared_files(struct hub_info* hub)
+{
+	return hub->users->shared_files;
+}
+
+uint64_t hub_get_min_share(struct hub_info* hub)
+{
+	return 1024 * 1024 * hub->config->limit_min_share;
+}
+
+uint64_t hub_get_max_share(struct hub_info* hub)
+{
+	return 1024 * 1024 * hub->config->limit_max_share;
+}
+
+size_t hub_get_min_slots(struct hub_info* hub)
+{
+	return hub->config->limit_min_slots;
+}
+
+size_t hub_get_max_slots(struct hub_info* hub)
+{
+	return hub->config->limit_max_slots;
+}
+
+size_t hub_get_max_hubs_total(struct hub_info* hub)
+{
+	return hub->config->limit_max_hubs;
+}
+
+size_t hub_get_max_hubs_user(struct hub_info* hub)
+{
+	return hub->config->limit_max_hubs_user;
+}
+
+size_t hub_get_min_hubs_user(struct hub_info* hub)
+{
+	return hub->config->limit_min_hubs_user;
+}
+
+size_t hub_get_max_hubs_reg(struct hub_info* hub)
+{
+	return hub->config->limit_max_hubs_reg;
+}
+
+size_t hub_get_min_hubs_reg(struct hub_info* hub)
+{
+	return hub->config->limit_min_hubs_reg;
+}
+
+size_t hub_get_max_hubs_op(struct hub_info* hub)
+{
+	return hub->config->limit_max_hubs_op;
+}
+
+size_t hub_get_min_hubs_op(struct hub_info* hub)
+{
+	return hub->config->limit_min_hubs_op;
+}
+
+
+void hub_event_loop(struct hub_info* hub)
+{
+	int ret;
+	do
+	{
+		 ret = event_base_loop(hub->evbase, EVLOOP_ONCE);
+		 
+		 if (ret != 0)
+		 {
+			 hub_log(log_debug, "event_base_loop returned: %d", (int) ret);
+		 }
+		 
+		 if (ret < 0)
+			break;
+		 
+		 event_queue_process(hub->queue);
+	}
+	while (hub->status == hub_status_running || hub->status == hub_status_disabled);
+}

src/hub.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -53,10 +53,6 @@ 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 */
-	
-
 };
 
 
@@ -83,37 +79,23 @@ struct hub_stats
 	size_t net_rx_total;
 };
 
-struct hub_logout_info
-{
-	time_t time;
-	char cid[MAX_CID_LEN+1];
-	char nick[MAX_NICK_LEN+1];
-	struct ip_addr_encap addr;
-	enum user_quit_reason reason;
-};
-
 struct hub_info
 {
-	struct net_connection* server;
+	int fd_tcp;
-	struct linked_list* server_alt_ports;
+	struct event ev_accept;
+	struct event ev_timer;
 	struct hub_stats stats;
 	struct event_queue* queue;
+	struct event_base* evbase;
 	struct hub_config* config;
-	struct hub_user_manager* users;
+	struct user_manager* users;
 	struct acl_handle* acl;
 	struct adc_message* command_info;    /* The hub's INF command */
 	struct adc_message* command_support; /* The hub's SUP command */
 	struct adc_message* command_motd;    /* The message of the day */
-	struct adc_message* command_rules;   /* The hub rules */
 	struct adc_message* command_banner;  /* The default welcome message */
 	time_t tm_started;
 	int status;
-	char* recvbuf; /* Global receive buffer */
-	char* sendbuf; /* Global send buffer */
-
-	struct linked_list* chat_history;    /* Chat history */
-	struct linked_list* logout_info;     /* Log of people logging out. */
-
 #ifdef SSL_SUPPORT
 	SSL_METHOD* ssl_method;
 	SSL_CTX* ssl_ctx;
@@ -128,109 +110,87 @@ struct hub_info
  *
  * @return 0 on success, -1 on error
  */
-extern int hub_handle_message(struct hub_info* hub, struct hub_user* u, const char* message, size_t length);
+extern int hub_handle_message(struct hub_info* hub, struct user* u, const char* message, size_t length);
 
 /**
  * Handle protocol support/subscription messages received clients.
  *
  * @return 0 on success, -1 on error
  */
-extern int hub_handle_support(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
+extern int hub_handle_support(struct hub_info* hub, struct user* u, struct adc_message* cmd);
 
 /**
  * Handle password messages received from clients.
  *
  * @return 0 on success, -1 on error
  */
-extern int hub_handle_password(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
+extern int hub_handle_password(struct hub_info* hub, struct user* u, struct adc_message* cmd);
 
 /**
  * Handle chat messages received from clients.
  * @return 0 on success, -1 on error.
  */
-extern int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
+extern int hub_handle_chat_message(struct hub_info* hub, struct user* u, struct adc_message* cmd);
-
-/**
- * Add a chat message to the chat history
- */
-extern void hub_chat_history_add(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd);
-
-/**
- * Clear the chat history.
- */
-extern void hub_chat_history_clear(struct hub_info* hub);
 
 /**
  * Used internally by hub_handle_info
  * @return 1 if nickname is OK, or 0 if nickname is not accepted.
  */
-extern int  hub_handle_info_check_nick(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
+extern int  hub_handle_info_check_nick(struct hub_info* hub, struct user* u, struct adc_message* cmd);
 
 /**
  * Used internally by hub_handle_info
  * @return 1 if CID/PID is OK, or 0 if not valid.
  */
-extern int  hub_handle_info_check_cid(struct hub_info* hub, struct hub_user* u, struct adc_message* cmd);
+extern int  hub_handle_info_check_cid(struct hub_info* hub, struct user* u, struct adc_message* cmd);
 
 /**
  * Send the support line for the hub to a particular user.
  * Only used during the initial handshake.
  */
-extern void hub_send_support(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_support(struct hub_info* hub, struct user* u);
 
 /**
  * Send a message assigning a SID for a user.
  * This is only sent after hub_send_support() during initial handshake.
  */
-extern void hub_send_sid(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_sid(struct hub_info* hub, struct user* u);
 
 /**
  * Send a 'ping' message to user.
  */
-extern void hub_send_ping(struct hub_info* hub, struct hub_user* user);
+extern void hub_send_ping(struct hub_info* hub, struct user* user);
 
 /**
  * Send a message containing hub information to a particular user.
  * This is sent during user connection, but can safely be sent at any
  * point later.
  */
-extern void hub_send_hubinfo(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_hubinfo(struct hub_info* hub, struct user* u);
 
 /**
  * Send handshake. This basically calls
  * hub_send_support() and hub_send_sid()
  */
-extern void hub_send_handshake(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_handshake(struct hub_info* hub, struct user* u);
 
 /**
  * Send a welcome message containing the message of the day to 
  * one particular user. This can be sent in any point in time.
- * @return 1 if the motd were sent.
  */
-extern int hub_send_motd(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_motd(struct hub_info* hub, struct user* u);
-
-/**
- * Send the rules if configured.
- * @return 1 if the rules were sent.
- */
-extern int hub_send_rules(struct hub_info* hub, struct hub_user* u);
 
 /**
  * Send a password challenge to a user.
  * This is only used if the user tries to access the hub using a
  * password protected nick name.
  */
-extern void hub_send_password_challenge(struct hub_info* hub, struct hub_user* u);
+extern void hub_send_password_challenge(struct hub_info* hub, struct user* u);
 
 /**
  * Sends a status_message to a user.
  */
-extern void hub_send_status(struct hub_info*, struct hub_user* user, enum status_message msg, enum msg_status_level level);
+extern void hub_send_status(struct hub_info*, struct 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,
@@ -358,21 +318,6 @@ extern void hub_schedule_runslice(struct hub_info* hub);
  */
 extern void hub_event_loop(struct hub_info* hub);
 
-/**
- * Schedule destroying a user.
- */
-extern void hub_schedule_destroy_user(struct hub_info* hub, struct hub_user* user);
-
-/**
- * Disconnect a user from the hub.
- */
-extern void hub_disconnect_user(struct hub_info* hub, struct hub_user* user, int reason);
-
-/**
- * Log a user logging out.
- */
-extern void hub_logout_log(struct hub_info* hub, struct hub_user* user);
-
 
 #endif /* HAVE_UHUB_HUB_H */
 

src/hubevent.c

@@ -0,0 +1,122 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+static void log_user_login(struct user* u)
+{
+	const char* cred = get_user_credential_string(u->credentials);
+	const char* addr = ip_convert_to_string(&u->ipaddr);
+	hub_log(log_user, "LoginOK     %s/%s %s \"%s\" (%s) \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, cred, u->user_agent);
+}
+
+static void log_user_login_error(struct user* u, enum status_message msg)
+{
+	const char* addr = ip_convert_to_string(&u->ipaddr);
+	const char* message = hub_get_status_message_log(u->hub, msg);
+	hub_log(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_logout(struct user* u, const char* message)
+{
+	const char* addr = ip_convert_to_string(&u->ipaddr);
+	hub_log(log_user, "Logout      %s/%s %s \"%s\" (%s)", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, message);
+}
+
+static void log_user_nick_change(struct user* u, const char* nick)
+{
+	const char* addr = ip_convert_to_string(&u->ipaddr);
+	hub_log(log_user, "NickChange  %s/%s %s \"%s\" -> \"%s\"", sid_to_string(u->id.sid), u->id.cid, addr, u->id.nick, nick);
+}
+
+
+/* Send MOTD, do logging etc */
+void on_login_success(struct hub_info* hub, struct user* u)
+{
+	struct timeval timeout = { TIMEOUT_IDLE, 0 };
+	
+	/* Send user list of all existing users */
+	if (!uman_send_user_list(u))
+		return;
+
+	/* Mark as being in the normal state, and add user to the user list */
+	user_set_state(u, state_normal);
+	uman_add(hub, u);
+
+	/* Print log message */
+	log_user_login(u);
+
+	/* Announce new user to all connected users */
+	if (user_is_logged_in(u))
+		route_info_message(u);
+	
+	/* Send message of the day (if any) */
+	if (user_is_logged_in(u)) /* Previous send() can fail! */
+		hub_send_motd(hub, u);
+		
+	/* reset to idle timeout */
+	if (u->ev_read)
+		event_add(u->ev_read, &timeout);
+}
+
+void on_login_failure(struct hub_info* hub, struct user* u, enum status_message msg)
+{
+	log_user_login_error(u, msg);
+	hub_send_status(hub, u, msg, status_level_fatal);
+	user_disconnect(u, quit_logon_error);
+}
+
+void on_nick_change(struct hub_info* hub, struct user* u, const char* nick)
+{
+	if (user_is_logged_in(u))
+	{
+		log_user_nick_change(u, nick);
+	}
+}
+
+void on_logout_user(struct hub_info* hub, struct user* user)
+{
+	const char* reason = "";
+	
+	/* These are used for logging purposes */
+	switch (user->quit_reason)
+	{
+		case quit_disconnected:     reason = "disconnected";   break;
+		case quit_kicked:           reason = "kicked";         break;
+		case quit_banned:           reason = "banned";         break;
+		case quit_timeout:          reason = "timeout";        break;
+		case quit_send_queue:       reason = "send queue";     break;
+		case quit_memory_error:     reason = "out of memory";  break;
+		case quit_socket_error:     reason = "socket error";   break;
+		case quit_protocol_error:   reason = "protocol error"; break;
+		case quit_logon_error:      reason = "login error";    break;
+		case quit_hub_disabled:     reason = "hub disabled";   break;
+		case quit_ghost_timeout:    reason = "ghost";          break;
+		default:
+			if (hub->status == hub_status_shutdown)
+				reason = "hub shutdown";
+			else
+				reason = "unknown error";
+			break;
+	}
+	
+	log_user_logout(user, reason);
+	user->quit_reason = 0;
+}
+

src/hubevent.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -23,23 +23,22 @@
 /**
  * This event is triggered whenever a user successfully logs in to the hub.
  */
-extern void on_login_success(struct hub_info* hub, struct hub_user* u);
+extern void on_login_success(struct hub_info* hub, struct 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_login_failure(struct hub_info* hub, struct 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.
  */
-extern void on_logout_user(struct hub_info* hub, struct hub_user* u);
+extern void on_logout_user(struct hub_info* hub, struct user* u);
 
 /**
  * This event is triggered whenever a user changes his/her nickname.
  */
-extern void on_nick_change(struct hub_info* hub, struct hub_user* u, const char* nick);
+extern void on_nick_change(struct hub_info* hub, struct user* u, const char* nick);
 
 
 #endif /* HAVE_UHUB_HUB_EVENT_H */

src/includes.h

@@ -1,109 +0,0 @@
-/*
- * 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_INCLUDES_H
-#define HAVE_UHUB_INCLUDES_H
-
-#define _FILE_OFFSET_BITS 64
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#ifdef WINSOCK
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#else
-# include <sys/types.h>
-# include <sys/time.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <sys/ioctl.h>
-# include <sys/socket.h>
-#endif
-
-# include <assert.h>
-# include <errno.h>
-# include <fcntl.h>
-
-#ifndef __sun__
-# include <getopt.h>
-# include <stdint.h>
-#endif
-
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#if !defined(WIN32)
-# include <grp.h>
-# include <pwd.h>
-# include <sys/resource.h>
-#endif
-
-#ifdef SSL_SUPPORT
-# include <openssl/ssl.h>
-# include <openssl/err.h>
-#endif
-
-#ifdef __linux__
-# define USE_EPOLL
-# include <sys/epoll.h>
-#endif
-
-#ifdef BSD_LIKE
-# define USE_KQUEUE
-# include <sys/event.h>
-#endif
-
-#define USE_SELECT
-# ifndef WINSOCK
-# include <sys/select.h>
-#endif
-
-#if !defined(WIN32)
-# define HAVE_STRNDUP
-# define HAVE_GETRLIMIT
-# if !defined(__HAIKU__)
-#  define HAVE_MEMMEM
-# endif
-#endif
-
-#if defined(BSD_LIKE) || defined(__sun__)
-# undef HAVE_STRNDUP
-# undef HAVE_MEMMEM
-#endif
-
-#if defined(WIN32)
-/* Windows uses %Iu for size_t */
-#define PRINTF_SIZE_T "%Iu"
-#else
-/* NOTE: does not work for old versions of gcc (like 2.95) */
-#define PRINTF_SIZE_T "%zu"
-#endif
-
-#define uhub_assert assert
-
-
-#endif /* HAVE_UHUB_INCLUDES_H */

src/inf.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -39,16 +39,15 @@ static void remove_server_restricted_flags(struct adc_message* cmd)
 	adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_REFERER);
 }
 
-static int set_feature_cast_supports(struct hub_user* u, struct adc_message* cmd)
+static int user_is_protected(struct user* user);
+
+static int set_feature_cast_supports(struct user* u, struct adc_message* cmd)
 {
 	char *it, *tmp;
 	
 	if (adc_msg_has_named_argument(cmd, ADC_INF_FLAG_SUPPORT))
 	{
 		tmp = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_SUPPORT);
-		if (!tmp)
-			return -1; // FIXME: OOM
-
 		user_clear_feature_cast_support(u);
 		
 		it = tmp;
@@ -90,7 +89,7 @@ static int check_hash_tiger(const char* cid, const char* pid)
 /*
  * FIXME: Only works for tiger hash. If a client doesnt support tiger we cannot let it in!
  */
-static int check_cid(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_cid(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	size_t pos;
 	char* cid = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_CLIENT_ID);
@@ -151,7 +150,7 @@ static int check_cid(struct hub_info* hub, struct hub_user* user, struct adc_mes
 }
 
 
-static int check_required_login_flags(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_required_login_flags(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	int num = 0;
 	
@@ -187,15 +186,15 @@ 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.
  */
-static int check_network(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+int check_network(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
-	const char* address = user_get_address(user);
+	const char* address = ip_convert_to_string(&user->ipaddr);
 	
 	/* Check for NAT override address */
 	if (acl_is_ip_nat_override(hub->acl, address))
 	{
 		char* client_given_ip = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR);
-		if (client_given_ip && strcmp(client_given_ip, "0.0.0.0") != 0)
+		if (strcmp(client_given_ip, "0.0.0.0") != 0)
 		{
 			user_set_nat_override(user);
 			adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR);
@@ -223,7 +222,7 @@ static int check_network(struct hub_info* hub, struct hub_user* user, struct adc
 	return 0;
 }
 
-static void strip_network(struct hub_user* user, struct adc_message* cmd)
+void strip_network(struct 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);
@@ -277,7 +276,7 @@ static int nick_is_utf8(const char* nick)
 }
 
 
-static int check_nick(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_nick(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	char* nick;
 	char* tmp;
@@ -325,10 +324,10 @@ static int check_nick(struct hub_info* hub, struct hub_user* user, struct adc_me
 }
 
 
-static int check_logged_in(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_logged_in(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
-	struct hub_user* lookup1 = uman_get_user_by_nick(hub, user->id.nick);
+	struct user* lookup1 = uman_get_user_by_nick(hub, user->id.nick);
-	struct hub_user* lookup2 = uman_get_user_by_cid(hub,  user->id.cid);
+	struct user* lookup2 = uman_get_user_by_cid(hub,  user->id.cid);
 	
 	if (lookup1 == user)
 	{
@@ -339,20 +338,20 @@ static int check_logged_in(struct hub_info* hub, struct hub_user* user, struct a
 	{
 		if (lookup1 == lookup2)
 		{
-			LOG_DEBUG("check_logged_in: exact same user is logged in: %s", user->id.nick);
+			hub_log(log_debug, "check_logged_in: exact same user is logged in: %s", user->id.nick);
-			hub_disconnect_user(hub, lookup1, quit_ghost_timeout);
+			user_disconnect(lookup1, quit_ghost_timeout);
 			return 0;
 		}
 		else
 		{
 			if (lookup1)
 			{
-				LOG_DEBUG("check_logged_in: nickname is in use: %s", user->id.nick);
+				hub_log(log_debug, "check_logged_in: nickname is in use: %s", user->id.nick);
 				return status_msg_inf_error_nick_taken;
 			}
 			else
 			{
-				LOG_DEBUG("check_logged_in: CID is in use: %s", user->id.cid);
+				hub_log(log_debug, "check_logged_in: CID is in use: %s", user->id.cid);
 				return status_msg_inf_error_cid_taken;
 			}
 		}
@@ -366,7 +365,7 @@ static int check_logged_in(struct hub_info* hub, struct hub_user* user, struct a
  * But this is not something we want to do, and is deprecated in the ADC specification.
  * One should rather look at capabilities/features.
  */
-static int check_user_agent(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_user_agent(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	char* ua_encoded = 0;
 	char* ua = 0;
@@ -387,7 +386,7 @@ static int check_user_agent(struct hub_info* hub, struct hub_user* user, struct
 }
 
 
-static int check_acl(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_acl(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	if (acl_is_cid_banned(hub->acl, user->id.cid))
 	{
@@ -407,7 +406,7 @@ static int check_acl(struct hub_info* hub, struct hub_user* user, struct adc_mes
 	return 0;
 }
 
-static int check_limits(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int check_limits(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	char* arg = adc_msg_get_named_argument(cmd, ADC_INF_FLAG_SHARED_SIZE);
 	if (arg)
@@ -526,16 +525,17 @@ 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.
  * If the hub is configured to allow only registered users and the user
  * is not recognized this will return 1.
  */
-static int set_credentials(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int set_credentials(struct hub_info* hub, struct 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 user_access_info* info = acl_get_access_info(hub->acl, user->id.nick);
 	
 	if (info)
 	{
@@ -584,8 +584,49 @@ static int set_credentials(struct hub_info* hub, struct hub_user* user, struct a
 }
 
 
+/**
+ * Determines if a user is to be let into the hub even if the hub is "full".
+ */
+static int user_is_protected(struct user* user)
+{
+	switch (user->credentials)
+	{
+		case cred_bot:
+		case cred_operator:
+		case cred_super:
+		case cred_admin:
+		case cred_link:
+			return 1;
+		default:
+			break;
+ 	}
+	return 0;
+}
 
-static int check_is_hub_full(struct hub_info* hub, struct hub_user* user)
+/**
+ * Returns 1 if a user is registered.
+ * Only registered users will be let in if the hub is configured for registered
+ * users only.
+ */
+static int user_is_registered(struct user* user)
+{
+	switch (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;
+}
+
+
+static int check_is_hub_full(struct hub_info* hub, struct user* user)
 {
 	/*
 	 * If hub is full, don't let users in, but we still want to allow
@@ -599,7 +640,7 @@ static int check_is_hub_full(struct hub_info* hub, struct hub_user* user)
 }
 
 
-static int check_registered_users_only(struct hub_info* hub, struct hub_user* user)
+static int check_registered_users_only(struct hub_info* hub, struct user* user)
 {
 	if (hub->config->registered_users_only && !user_is_registered(user))
 	{
@@ -608,7 +649,7 @@ static int check_registered_users_only(struct hub_info* hub, struct hub_user* us
 	return 0;
 }
 
-static int hub_handle_info_common(struct hub_user* user, struct adc_message* cmd)
+static int hub_handle_info_common(struct user* user, struct adc_message* cmd)
 {
 	/* Remove server restricted flags */
 	remove_server_restricted_flags(cmd);
@@ -619,7 +660,7 @@ static int hub_handle_info_common(struct hub_user* user, struct adc_message* cmd
 	return 0;
 }
 
-static int hub_handle_info_low_bandwidth(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+static int hub_handle_info_low_bandwidth(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	if (hub->config->low_bandwidth_mode)
 	{
@@ -647,7 +688,7 @@ static int hub_handle_info_low_bandwidth(struct hub_info* hub, struct hub_user*
 			return ret; \
 	} while(0)
 
-static int hub_perform_login_checks(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
+int hub_perform_login_checks(struct hub_info* hub, struct user* user, struct adc_message* cmd)
 {
 	/* Make syntax checks.  */
 	INF_CHECK(check_required_login_flags, hub, user, cmd);
@@ -657,24 +698,21 @@ static int hub_perform_login_checks(struct hub_info* hub, struct hub_user* user,
 	INF_CHECK(check_user_agent,           hub, user, cmd);
 	INF_CHECK(check_acl,                  hub, user, cmd);
 	INF_CHECK(check_logged_in,            hub, user, cmd);
+	
 	return 0;
 }
 
-/**
+int hub_handle_info_login(struct hub_info* hub, struct user* user, struct adc_message* cmd)
- * Perform additional INF checks used at time of login.
- *
- * @return 0 if success, <0 if error, >0 if authentication needed.
- */
-int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct adc_message* cmd)
 {
-	int code = 0;
+	int need_auth = 0;
 
 	INF_CHECK(hub_perform_login_checks, hub, user, cmd);
 	
 	/* 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);
+	/* FIXME: This needs some cleaning up */
+	need_auth = set_credentials(hub, user, cmd);
 	
 	/* Note: this must be done *after* set_credentials. */
 	if (check_is_hub_full(hub, user))
@@ -695,7 +733,7 @@ int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct ad
 	/* Set initial user info */
 	user_set_info(user, cmd);
 	
-	return code;
+	return need_auth;
 }
 
 /*
@@ -711,9 +749,8 @@ int hub_handle_info_login(struct hub_info* hub, struct hub_user* user, struct ad
  * - CID/PID (valid, not taken, etc).
  * - IP addresses (IPv4 and IPv6)
  */
-int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct adc_message* cmd_unmodified)
+int hub_handle_info(struct hub_info* hub, struct user* user, const struct adc_message* cmd_unmodified)
 {
-	int ret;
 	struct adc_message* cmd = adc_msg_copy(cmd_unmodified);
 	if (!cmd) return -1; /* OOM */
 
@@ -736,7 +773,7 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 			return 0;
 		}
 	
-		ret = hub_handle_info_login(hub, user, cmd);
+		int ret = hub_handle_info_login(hub, user, cmd);
 		if (ret < 0)
 		{
 			on_login_failure(hub, user, ret);
@@ -768,20 +805,14 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 		 */
 		if (adc_msg_has_named_argument(cmd, ADC_INF_FLAG_NICK))
 		{
-#ifdef ALLOW_CHANGE_NICK
+#if ALLOW_CHANGE_NICK
 			if (!check_nick(hub, user, cmd))
 #endif
 				adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_NICK);
 		}
 		
-		ret = check_limits(hub, user, cmd);
+		/* FIXME - What if limits are not met ? */
-		if (ret < 0)
+		check_limits(hub, user, cmd);
-		{
-			on_update_failure(hub, user, ret);
-			adc_msg_free(cmd);
-			return -1;
-		}
-
 		strip_network(user, cmd);
 		hub_handle_info_low_bandwidth(hub, user, cmd);
 		
@@ -789,7 +820,7 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 		
 		if (!adc_msg_is_empty(cmd))
 		{
-			route_message(hub, user, cmd);
+			route_message(user, cmd);
 		}
 		
 		adc_msg_free(cmd);
@@ -797,5 +828,3 @@ int hub_handle_info(struct hub_info* hub, struct hub_user* user, const struct ad
 	
 	return 0;
 }
-
-

src/inf.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -47,7 +47,7 @@ enum nick_status
  *
  * @return 0 on success, -1 on error
  */
-extern int hub_handle_info(struct hub_info* hub, struct hub_user* u, const struct adc_message* cmd);
+extern int hub_handle_info(struct hub_info* hub, struct user* u, const struct adc_message* cmd);
 
 
 #endif /* HAVE_UHUB_INF_PARSER_H */

src/ipcalc.c

@@ -19,6 +19,7 @@
 
 #include "uhub.h"
 
+
 int ip_is_valid_ipv4(const char* address)
 {
 	int i = 0; /* address index */
@@ -146,7 +147,7 @@ int ip_convert_address(const char* text_address, int port, struct sockaddr* addr
 		addr6.sin6_port = htons(port);
 		if (net_string_to_address(AF_INET6, taddr, &addr6.sin6_addr) <= 0)
 		{
-			LOG_ERROR("Unable to convert socket address (ipv6)");
+			hub_log(log_fatal, "Unable to convert socket address (ipv6)");
 			return 0;
 		}
 
@@ -162,7 +163,7 @@ int ip_convert_address(const char* text_address, int port, struct sockaddr* addr
 		addr4.sin_port = htons(port);
 		if (net_string_to_address(AF_INET, taddr, &addr4.sin_addr) <= 0)
 		{
-			LOG_ERROR("Unable to convert socket address (ipv4)");
+			hub_log(log_fatal, "Unable to convert socket address (ipv4)");
 			return 0;
 		}
 		memcpy(addr, &addr4, sockaddr_size);
@@ -218,7 +219,7 @@ int ip_mask_create_left(int af, int bits, struct ip_addr_encap* result)
 
 #ifdef IP_CALC_DEBUG
 	char* r_str = hub_strdup(ip_convert_to_string(result));
-	LOG_DUMP("Created left mask: %s", r_str);
+	hub_log(log_debug, "Created left mask: %s", r_str);
 	hub_free(r_str);
 #endif
 
@@ -271,7 +272,7 @@ int ip_mask_create_right(int af, int bits, struct ip_addr_encap* result)
 	
 #ifdef IP_CALC_DEBUG
 	char* r_str = hub_strdup(ip_convert_to_string(result));
-	LOG_DUMP("Created right mask: %s", r_str);
+	hub_log(log_debug, "Created right mask: %s", r_str);
 	hub_free(r_str);
 #endif
 	
@@ -404,7 +405,7 @@ int ip_compare(struct ip_addr_encap* a, struct ip_addr_encap* b)
 #ifdef IP_CALC_DEBUG
 	char* a_str = hub_strdup(ip_convert_to_string(a));
 	char* b_str = hub_strdup(ip_convert_to_string(b));
-	LOG_DUMP("Comparing IPs '%s' AND '%s' => %d", a_str, b_str, ret);
+	hub_log(log_debug, "Comparing IPs '%s' AND '%s' => %d", a_str, b_str, ret);
 	hub_free(a_str);
 	hub_free(b_str);
 #endif
@@ -412,81 +413,13 @@ int ip_compare(struct ip_addr_encap* a, struct ip_addr_encap* b)
 	return ret;
 }
 
-static int check_ip_mask(const char* text_addr, int bits, struct ip_range* range)
-{
-	if (ip_is_valid_ipv4(text_addr) || ip_is_valid_ipv6(text_addr))
-	{
-		struct ip_addr_encap addr;
-		struct ip_addr_encap mask1;
-		struct ip_addr_encap mask2;
-		int af = ip_convert_to_binary(text_addr, &addr);  /* 192.168.1.2 */
-		int maxbits = (af == AF_INET6 ? 128 : 32);
-		bits = MIN(MAX(bits, 0), maxbits);
-		ip_mask_create_left(af, bits, &mask1);            /* 255.255.255.0 */
-		ip_mask_create_right(af, maxbits - bits, &mask2); /* 0.0.0.255 */
-		ip_mask_apply_AND(&addr, &mask1, &range->lo);     /* 192.168.1.0 */
-		ip_mask_apply_OR(&range->lo, &mask2, &range->hi); /* 192.168.1.255 */
-		return 1;
-	}
-	return 0;
-}
 
-static int check_ip_range(const char* lo, const char* hi, struct ip_range* range)
-{
-	int ret1, ret2;
-	if ((ip_is_valid_ipv4(lo) && ip_is_valid_ipv4(hi)) || (ip_is_valid_ipv6(lo) && ip_is_valid_ipv6(hi)))
-	{
-		ret1 = ip_convert_to_binary(lo, &range->lo);
-		ret2 = ip_convert_to_binary(hi, &range->hi);
-		if (ret1 == -1 || ret2 == -1 || ret1 != ret2)
-		{
-			return 0;
-		}
-		return 1;
-	}
-	return 0;
-}
 
-int ip_convert_address_to_range(const char* address, struct ip_range* range)
-{
-	int ret = 0;
-	char* addr = 0;
-	const char* split;
 
-	if (!address || !range)
-		return 0;
 
-	split = strrchr(address, '/');
-	if (split)
-	{
-		int mask = uhub_atoi(split+1);
-		if (mask == 0 && split[1] != '0') return 0;
-		addr = hub_strndup(address, split - address);
-		ret = check_ip_mask(addr, mask, range);
-		hub_free(addr);
-		return ret;
-	}
 
-	split = strrchr(address, '-');
-	if (split)
-	{
-		addr = hub_strndup(address, split - address);
-		ret = check_ip_range(addr, split+1, range);
-		hub_free(addr);
-		return ret;
-	}
 
-	if (ip_is_valid_ipv4(address) || ip_is_valid_ipv6(address))
-	{
-		if (ip_convert_to_binary(address, &range->lo) == -1)
-			return 0;
-		memcpy(&range->hi, &range->lo, sizeof(struct ip_addr_encap));
-		return 1;
-	}
-	return 0;
-}
 
-int ip_in_range(struct ip_addr_encap* addr, struct ip_range* range)
+
-{
+
-	return (addr->af == range->lo.af && ip_compare(&range->lo, addr) <= 0 && ip_compare(addr, &range->hi) <= 0);
+
-}

src/ipcalc.h

@@ -33,57 +33,26 @@ struct ip_addr_encap {
 	} internal_ip_data;
 };
 
-struct ip_range
-{
-	struct ip_addr_encap lo;
-	struct ip_addr_encap hi;
-};
 
 extern int ip_convert_to_binary(const char* text_addr, struct ip_addr_encap* raw);
 
 extern const char* ip_convert_to_string(struct ip_addr_encap* raw);
 
-/**
- * Convert a string on the form:
- * ip-ip or ip/mask to an iprange.
- *
- * Note: both IPv4 and IPv6 addresses are valid, but if a range is given
- * both addresses must be of the same address family.
- *
- * Valid examples of address
- * IPv4:
- * 192.168.2.1
- * 192.168.0.0/16
- * 192.168.0.0-192.168.255.255
- *
- * IPv6:
- * 2001:4860:A005::68
- * 2001:4860:A005::0/80
- * 2001:4860:A005::0-2001:4860:A005:ffff:ffff:ffff:ffff:ffff
- *
- * @return 0 if invalid, 1 if OK
- */
-extern int ip_convert_address_to_range(const char* address, struct ip_range* range);
 
-/**
+/*
- * @return 1 if addr is inside range, 0 otherwise
- */
-extern int ip_in_range(struct ip_addr_encap* addr, struct ip_range* range);
-
-/**
  * @return 1 if address is a valid IPv4 address in text notation
  *         0 if invalid
  */
 extern int ip_is_valid_ipv4(const char* address);
 
-/**
+/*
  * @return 1 if address is a valid IPv6 address in text notation
  *         0 if invalid
  */
 extern int ip_is_valid_ipv6(const char* address);
 
 
-/**
+/*
  * This function converts an IP address in text_address to a binary
  * struct sockaddr.
  * This will auto-detect if the IP-address is IPv6 (and that is supported),
@@ -97,6 +66,7 @@ extern int ip_is_valid_ipv6(const char* address);
  */
 extern int ip_convert_address(const char* text_address, int port, struct sockaddr* addr, socklen_t* addr_len);
 
+
 extern int ip_mask_create_left(int af, int bits, struct ip_addr_encap* result);
 extern int ip_mask_create_right(int af, int bits, struct ip_addr_encap* result);
 

src/list.c

@@ -54,11 +54,6 @@ void list_clear(struct linked_list* list, void (*free_handle)(void* ptr))
 void list_append(struct linked_list* list, void* data_ptr)
 {
 	struct node* new_node = (struct node*) hub_malloc_zero(sizeof(struct node));
-	if (!new_node)
-	{
-		LOG_FATAL("Unable to allocate memory");
-		return;
-	}
 	new_node->ptr = data_ptr;
 	
 	if (list->last)

src/log.h

@@ -33,31 +33,6 @@ enum log_verbosity {
 	log_protocol = 9,
 };
 
-#define LOG_FATAL(format, ...)  hub_log(log_fatal,    format, ## __VA_ARGS__)
-#define LOG_ERROR(format, ...)  hub_log(log_error,    format, ## __VA_ARGS__)
-#define LOG_WARN(format, ...)   hub_log(log_warning,  format, ## __VA_ARGS__)
-#define LOG_USER(format, ...)   hub_log(log_user,     format, ## __VA_ARGS__)
-#define LOG_INFO(format, ...)   hub_log(log_info,     format, ## __VA_ARGS__)
-
-#ifdef DEBUG
-# define LOG_DEBUG(format, ...)  hub_log(log_debug,    format, ## __VA_ARGS__)
-# define LOG_TRACE(format, ...)  hub_log(log_trace,    format, ## __VA_ARGS__)
-#else
-# define LOG_DEBUG(format, ...)  do { } while(0)
-# define LOG_TRACE(format, ...)  do { } while(0)
-#endif
-
-#ifdef LOWLEVEL_DEBUG
-# define LOG_DUMP(format, ...)   hub_log(log_dump,     format, ## __VA_ARGS__)
-# define LOG_MEMORY(format, ...) hub_log(log_memory,   format, ## __VA_ARGS__)
-# define LOG_PROTO(format, ...)  hub_log(log_protocol, format, ## __VA_ARGS__)
-#else
-# define LOG_DUMP(format, ...)   do { } while(0)
-# define LOG_MEMORY(format, ...) do { } while(0)
-# define LOG_PROTO(format, ...)  do { } while(0)
-#endif
-
-
 /**
  * Specify a minimum log verbosity for what messages should
  * be printed in the log.

src/main.c

@@ -29,25 +29,24 @@ static const char* arg_uid = 0;
 static const char* arg_gid = 0;
 static const char* arg_config  = 0;
 static const char* arg_log = 0;
-static const char* arg_pid = 0;
 static int arg_log_syslog = 0;
 
 
-#if !defined(WIN32)
+#ifndef WIN32
-extern struct hub_info* g_hub;
+void hub_handle_signal(int fd, short events, void* arg)
-void hub_handle_signal(int sig)
 {
-	struct hub_info* hub = g_hub;
+	struct hub_info* hub = (struct hub_info*) arg;
+	int signal = fd;
 
-	switch (sig)
+	switch (signal)
 	{
 		case SIGINT:
-			LOG_INFO("Interrupted. Shutting down...");
+			hub_log(log_info, "Interrupted. Shutting down...");
 			hub->status = hub_status_shutdown;
 			break;
 
 		case SIGTERM:
-			LOG_INFO("Terminated. Shutting down...");
+			hub_log(log_info, "Terminated. Shutting down...");
 			hub->status = hub_status_shutdown;
 			break;
 
@@ -59,12 +58,13 @@ void hub_handle_signal(int sig)
 			break;
 
 		default:
-			LOG_TRACE("hub_handle_signal(): caught unknown signal: %d", signal);
+			hub_log(log_trace, "hub_handle_signal(): caught unknown signal: %d", signal);
 			hub->status = hub_status_shutdown;
 			break;
 	}
 }
 
+static struct event signal_events[10];
 static int signals[] =
 {
 	SIGINT,  /* Interrupt the application */
@@ -76,28 +76,28 @@ static int signals[] =
 
 void setup_signal_handlers(struct hub_info* hub)
 {
-	sigset_t sig_set;
+	int i = 0;
-	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++)
 	{
-		if (sigaction(signals[i], &act, 0) != 0)
+		signal_set(&signal_events[i], signals[i], hub_handle_signal, hub);
+		event_base_set(hub->evbase, &signal_events[i]);
+		if (signal_add(&signal_events[i], NULL))
 		{
-			LOG_ERROR("Error setting signal handler %d", signals[i]);
+			hub_log(log_error, "Error setting signal handler %d", signals[i]);
 		}
     }
 }
 
 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 */
 
 
 int main_loop()
@@ -113,13 +113,8 @@ int main_loop()
 	{
 		if (hub)
 		{
-			LOG_INFO("Reloading configuration files...");
+			hub_log(log_info, "Reloading configuration files...");
-			LOG_DEBUG("Hub status: %d", (int) hub->status);
+			hub_log(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)
@@ -138,7 +133,7 @@ int main_loop()
 			hub = hub_start_service(&configuration);
 			if (!hub)
 				return -1;
-#if !defined(WIN32)
+#ifndef WIN32
 			setup_signal_handlers(hub);
 #endif
 		}
@@ -151,9 +146,9 @@ int main_loop()
 		acl_shutdown(&acl);
 		free_config(&configuration);
 
-	} while (hub->status == hub_status_restart);
+	} while(hub->status != hub_status_shutdown);
 
-#if !defined(WIN32)
+#ifndef WIN32
 	shutdown_signal_handlers(hub);
 #endif
 	
@@ -162,7 +157,7 @@ int main_loop()
 		hub_shutdown_service(hub);
 	}
 
-	net_destroy();
+	net_shutdown();
 	hub_log_shutdown();
 	return 0;
 }
@@ -195,8 +190,8 @@ int check_configuration(int dump)
 
 void print_version()
 {
-	fprintf(stdout, PRODUCT_STRING "\n");
+	fprintf(stdout, "" PRODUCT " " VERSION " " PRODUCT_TITLE "\n");
-	fprintf(stdout, COPYRIGHT "\n"
+	fprintf(stdout, "Copyright (C) 2007-2009, Jan Vidar Krey <janvidar@extatic.org>\n"
 			"This is free software with ABSOLUTELY NO WARRANTY.\n\n");
 	exit(0);
 }
@@ -220,7 +215,6 @@ void print_usage(char* program)
 #ifndef WIN32
 		"   -u <user>   Run as given user\n"
 		"   -g <group>  Run with given group permissions\n"
-		"   -p <file>   Store pid in file (process id)\n"
 #endif
 		"   -V          Show version number.\n"
 	);
@@ -232,7 +226,7 @@ void print_usage(char* program)
 void parse_command_line(int argc, char** argv)
 {
 	int opt;
-	while ((opt = getopt(argc, argv, "vqfc:l:hu:g:VCsSLp:")) != -1)
+	while ((opt = getopt(argc, argv, "vqfc:l:hu:g:VCsSL")) != -1)
 	{
 		switch (opt)
 		{
@@ -292,10 +286,6 @@ void parse_command_line(int argc, char** argv)
 				arg_gid = optarg;
 				break;
 
-			case 'p':
-				arg_pid = optarg;
-				break;
-
 			default:
 				print_usage(argv[0]);
 				break;
@@ -339,15 +329,15 @@ int drop_privileges()
 
 		if (!ret)
 		{
-			LOG_FATAL("Unable to determine group id, check group name.");
+			hub_log(log_fatal, "Unable to determine group id, check group name.");
 			return -1;
 		}
 
-		LOG_TRACE("Setting group id %d (%s)", (int) perm_gid, arg_gid);
+		hub_log(log_trace, "Setting group id %d (%s)", (int) perm_gid, arg_gid);
 		ret = setgid(perm_gid);
 		if (ret == -1)
 		{
-			LOG_FATAL("Unable to change group id, permission denied.");
+			hub_log(log_fatal, "Unable to change group id, permission denied.");
 			return -1;
 		}
 		gid_ok = 1;
@@ -372,58 +362,31 @@ int drop_privileges()
 
 		if (!ret)
 		{
-			LOG_FATAL("Unable to determine user id, check user name.");
+			hub_log(log_fatal, "Unable to determine user id, check user name.");
 			return -1;
 		}
 
 		if (!gid_ok) {
-			LOG_TRACE("Setting group id %d (%s)", (int) perm_gid, arg_gid);
+			hub_log(log_trace, "Setting group id %d (%s)", (int) perm_gid, arg_gid);
 			ret = setgid(perm_gid);
 			if (ret == -1)
 			{
-				LOG_FATAL("Unable to change group id, permission denied.");
+				hub_log(log_fatal, "Unable to change group id, permission denied.");
 				return -1;
 			}
 		}
 
-		LOG_TRACE("Setting user id %d (%s)", (int) perm_uid, arg_uid);
+		hub_log(log_trace, "Setting user id %d (%s)", (int) perm_uid, arg_uid);
 		ret = setuid(perm_uid);
 		if (ret == -1)
 		{
-			LOG_FATAL("Unable to change user id, permission denied.");
+			hub_log(log_fatal, "Unable to change user id, permission denied.");
 			return -1;
 		}
 	}
 
 	return 0;
 }
-
-int pidfile_create()
-{
-	if (arg_pid)
-	{
-		FILE* pidfile = fopen(arg_pid, "w");
-	        if (!pidfile)
-		{
-			LOG_FATAL("Unable to write pid file: %s\n", arg_pid);
-			return -1;
-		}
-
-		fprintf(pidfile, "%d", (int) getpid());
-		fclose(pidfile);
-	}
-	return 0;
-}
-
-int pidfile_destroy()
-{
-	if (arg_pid)
-	{
-		return unlink(arg_pid);
-	}
-	return 0;
-}
-
 #endif /* WIN32 */
 
 
@@ -444,40 +407,26 @@ int main(int argc, char** argv)
 		ret = fork();
 		if (ret == -1)
 		{
-			LOG_FATAL("Unable to fork to background!");
+			hub_log(log_fatal, "Unable to fork to background!");
 			return -1;
 		}
 		else if (ret == 0)
 		{
-			/* child process - detatch from TTY */
+			/* child process */
-			fclose(stdin);
-			fclose(stdout);
-			fclose(stderr);
-			close(0);
-			close(1);
-			close(2);
 		}
 		else
 		{
 			/* parent process */
-			LOG_DEBUG("Forked to background\n");
+			hub_log(log_debug, "Forked to background\n");
 			return 0;
 		}
 	}
 
-	if (pidfile_create() == -1)
-		return -1;
-
 	if (drop_privileges() == -1)
 		return -1;
 #endif /* WIN32 */
 
 	ret = main_loop();
-
-#ifndef WIN32
-	pidfile_destroy();
-#endif
-
 	return ret;
 }
 

src/memory.c

@@ -47,7 +47,7 @@ void internal_debug_print_leaks()
 	size_t n = 0;
 	size_t leak = 0;
 	size_t count = 0;
-	LOG_MEMORY("--- exit (allocs: %d, size: " PRINTF_SIZE_T ") ---", hub_alloc_count, hub_alloc_size);
+	hub_log(log_memory, "--- exit (allocs: %d, size: %zu) ---", hub_alloc_count, hub_alloc_size);
 	
 	for (; n < UHUB_MAX_ALLOCS; n++)
 	{
@@ -55,11 +55,11 @@ void internal_debug_print_leaks()
 		{
 			leak += hub_allocs[n].size;
 			count++;
-			LOG_MEMORY("leak %p size: " PRINTF_SIZE_T " (bt: %p %p)", hub_allocs[n].ptr, hub_allocs[n].size, hub_allocs[n].stack1, hub_allocs[n].stack2);
+			hub_log(log_memory, "leak %p size: %zu (bt: %p %p)", hub_allocs[n].ptr, hub_allocs[n].size, hub_allocs[n].stack1, hub_allocs[n].stack2);
 		}
 	}
 	
-	LOG_MEMORY("--- done (allocs: %d, size: " PRINTF_SIZE_T ", peak: %d/" PRINTF_SIZE_T ", oom: " PRINTF_SIZE_T ") ---", count, leak, hub_alloc_peak_count, hub_alloc_peak_size, hub_alloc_oom);
+	hub_log(log_memory, "--- done (allocs: %d, size: %zu, peak: %d/%zu, oom: %zu) ---", count, leak, hub_alloc_peak_count, hub_alloc_peak_size, hub_alloc_oom);
 }
 #endif /* REALTIME_MALLOC_TRACKING */
 
@@ -73,7 +73,7 @@ void* internal_debug_mem_malloc(size_t size, const char* where)
 	/* Make sure the malloc info struct is initialized */
 	if (!hub_alloc_count)
 	{
-		LOG_MEMORY("--- start ---");
+		hub_log(log_memory, "--- start ---");
 		for (n = 0; n < UHUB_MAX_ALLOCS; n++)
 		{
 			hub_allocs[n].ptr    = 0;
@@ -107,14 +107,14 @@ void* internal_debug_mem_malloc(size_t size, const char* where)
 				hub_alloc_peak_count = MAX(hub_alloc_count, hub_alloc_peak_count);
 				hub_alloc_peak_size  = MAX(hub_alloc_size,  hub_alloc_peak_size);
 				
-				LOG_MEMORY("%s %p (%d bytes) (bt: %p %p) {allocs: %d, size: " PRINTF_SIZE_T "}", where, ptr, (int) size, hub_allocs[n].stack1, hub_allocs[n].stack2, hub_alloc_count, hub_alloc_size);
+				hub_log(log_memory, "%s %p (%d bytes) (bt: %p %p) {allocs: %d, size: %zu}", where, ptr, (int) size, hub_allocs[n].stack1, hub_allocs[n].stack2, hub_alloc_count, hub_alloc_size);
 				break;
 			}
 		}
 	}
 	else
 	{
-		LOG_MEMORY("%s *** OOM for %d bytes", where, size);
+		hub_log(log_memory, "%s *** OOM for %d bytes", where, size);
 		hub_alloc_oom++;
 		return 0;
 	}
@@ -141,7 +141,7 @@ void internal_debug_mem_free(void* ptr)
 			hub_allocs[n].size   = 0;
 			hub_allocs[n].stack1 = 0;
 			hub_allocs[n].stack2 = 0;
-			LOG_MEMORY("free %p (bt: %p %p) {allocs: %d, size: " PRINTF_SIZE_T "}", ptr, stack1, stack2, hub_alloc_count, hub_alloc_size);
+			hub_log(log_memory, "free %p (bt: %p %p) {allocs: %d, size: %zu}", ptr, stack1, stack2, hub_alloc_count, hub_alloc_size);
 			malloc_slot = n;
 			free(ptr);
 			return;
@@ -150,7 +150,7 @@ void internal_debug_mem_free(void* ptr)
 	
 	malloc_slot = -1;
 	abort();
-	LOG_MEMORY("free %p *** NOT ALLOCATED *** (bt: %p %p)", ptr, stack1, stack2);
+	hub_log(log_memory, "free %p *** NOT ALLOCATED *** (bt: %p %p)", ptr, stack1, stack2);
 #else
 	free(ptr);
 #endif /* REALTIME_MALLOC_TRACKING */

src/message.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -26,51 +26,17 @@
 	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)); \
-	uhub_assert(X->length == strlen(X->cache));
+	uhub_assert(X->references >= 0);
-#define ADC_MSG_NULL_ON_FREE
 #else
 #define ADC_MSG_ASSERT(X) do { } while(0)
-#endif /* DEBUG */
+#endif
-
-#ifdef MSG_MEMORY_DEBUG
-#undef msg_malloc
-#undef msg_malloc_zero
-#undef msg_free
-
-static void* msg_malloc(size_t size)
-{
-	void* ptr = valloc(size);
-	LOG_MEMORY("msg_malloc: %p %d", ptr, (int) size);
-	return ptr;
-}
-
-static void* msg_malloc_zero(size_t size)
-{
-	void* ptr = msg_malloc(size);
-	memset(ptr, 0, size);
-	return ptr;
-}
-
-static void msg_free(void* ptr)
-{
-	LOG_MEMORY("msg_free:   %p", ptr);
-	hub_free(ptr);
-}
-#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
 	msg->references++;
-#ifdef MSG_MEMORY_DEBUG
-	adc_msg_protect(msg);
-#endif
 	return msg;
 #else
 	struct adc_message* copy = adc_msg_copy(msg);
@@ -88,9 +54,6 @@ 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;
 	
@@ -99,19 +62,18 @@ static int adc_msg_grow(struct adc_message* msg, size_t size)
 	newsize += 2; /* termination */
 	newsize += (newsize % sizeof(size_t)); /* alignment padding */
 	
-	buf = msg_malloc_zero(newsize);
+	buf = hub_malloc_zero(newsize);
 	if (!buf)
 		return 0;
 	
 	if (msg->cache)
 	{
 		memcpy(buf, msg->cache, msg->length);
-		msg_free(msg->cache);
+		hub_free(msg->cache);
 	}
 	
 	msg->cache = buf;
 	msg->capacity = newsize;
-
 	return 1;
 }
 
@@ -187,17 +149,13 @@ void adc_msg_free(struct adc_message* msg)
 	
 	ADC_MSG_ASSERT(msg);
 	
+	if (msg->references > 0)
+	{
 		msg->references--;
-
-	if (msg->references == 0)
-	{
-#ifdef ADC_MSG_NULL_ON_FREE
-		if (msg->cache)
-		{
-			*msg->cache = 0;
 	}
-#endif
+	else
-		msg_free(msg->cache);
+	{
+		hub_free(msg->cache);
 		
 		if (msg->feature_cast_include)
 		{
@@ -213,7 +171,7 @@ void adc_msg_free(struct adc_message* msg)
 			msg->feature_cast_exclude = 0;
 		}
 		
-		msg_free(msg);
+		hub_free(msg);
 	}
 }
 
@@ -221,7 +179,7 @@ void adc_msg_free(struct adc_message* msg)
 struct adc_message* adc_msg_copy(const struct adc_message* cmd)
 {
 	char* tmp = 0;
-	struct adc_message* copy = (struct adc_message*) msg_malloc_zero(sizeof(struct adc_message));
+	struct adc_message* copy = (struct adc_message*) hub_malloc_zero(sizeof(struct adc_message));
 	if (!copy) return NULL; /* OOM */
 
 	ADC_MSG_ASSERT(cmd);
@@ -234,24 +192,20 @@ struct adc_message* adc_msg_copy(const struct adc_message* cmd)
 	copy->length               = cmd->length;
 	copy->capacity             = 0;
 	copy->priority             = cmd->priority;
-	copy->references           = 1;
+	copy->references           = 0;
 	copy->feature_cast_include = 0;
 	copy->feature_cast_exclude = 0;
 	
+	if (cmd->cache)
+	{
 		if (!adc_msg_grow(copy, copy->length))
 		{
 			adc_msg_free(copy);
 			return NULL; /* OOM */
 		}
-
-	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)
 	{
@@ -281,7 +235,7 @@ struct adc_message* adc_msg_copy(const struct adc_message* cmd)
 }
 
 
-struct adc_message* adc_msg_parse_verify(struct hub_user* u, const char* line, size_t length)
+struct adc_message* adc_msg_parse_verify(struct user* u, const char* line, size_t length)
 {
 	struct adc_message* command = adc_msg_parse(line, length);
 	
@@ -290,7 +244,6 @@ struct adc_message* adc_msg_parse_verify(struct hub_user* u, const char* line, s
 	
 	if (command->source && (!u || command->source != u->id.sid))
 	{
-		LOG_DEBUG("Command does not match user's SID (command->source=%d, user->id.sid=%d)", command->source, (u ? u->id.sid : 0));
 		adc_msg_free(command);
 		return 0;
 	}
@@ -301,7 +254,7 @@ struct adc_message* adc_msg_parse_verify(struct hub_user* u, const char* line, s
 
 struct adc_message* adc_msg_parse(const char* line, size_t length)
 {
-	struct adc_message* command = (struct adc_message*) msg_malloc_zero(sizeof(struct adc_message));
+	struct adc_message* command = (struct adc_message*) hub_malloc_zero(sizeof(struct adc_message));
 	char prefix = line[0];
 	size_t n = 0;
 	char temp_sid[5];
@@ -314,8 +267,8 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 		
 	if (!is_printable_utf8(line, length))
 	{
-		LOG_DEBUG("Dropped message with non-printable UTF-8 characters.");
+		hub_log(log_debug, "Dropped message with non-printable UTF-8 characters.");
-		msg_free(command);
+		hub_free(command);
 		return NULL;
 	}
 
@@ -326,7 +279,7 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 
 	if (!adc_msg_grow(command, length + need_terminate))
 	{
-		msg_free(command);
+		hub_free(command);
 		return NULL; /* OOM */
 	}
 	
@@ -339,7 +292,6 @@ 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)
 	{
@@ -399,8 +351,8 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 			{
 				list_destroy(command->feature_cast_include);
 				list_destroy(command->feature_cast_exclude);
-				msg_free(command->cache);
+				hub_free(command->cache);
-				msg_free(command);
+				hub_free(command);
 				return NULL; /* OOM */
 			}
 			
@@ -423,6 +375,7 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 			
 			if  (n == 10)
 				ok = 0;
+			
 			break;
 			
 		case 'D':
@@ -489,19 +442,21 @@ struct adc_message* adc_msg_parse(const char* line, size_t length)
 	}
 	
 	ADC_MSG_ASSERT(command);
+	
 	return command;
 }
 
 
 struct adc_message* adc_msg_create(const char* line)
 {
-	return adc_msg_parse(line, strlen(line));
+	return adc_msg_parse_verify(NULL, line, strlen(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));
+	struct adc_message* msg = (struct adc_message*) hub_malloc_zero(sizeof(struct adc_message));
+	
 	if (!msg)
 		return NULL; /* OOM */
 
@@ -509,7 +464,7 @@ struct adc_message* adc_msg_construct(fourcc_t fourcc, size_t size)
 
 	if (!adc_msg_grow(msg, size+1))
 	{
-		msg_free(msg);
+		hub_free(msg);
 		return NULL; /* OOM */
 	}
 	
@@ -528,7 +483,7 @@ struct adc_message* adc_msg_construct(fourcc_t fourcc, size_t size)
 	
 	msg->cmd = fourcc;
 	msg->priority = 0;
-	msg->references = 1;
+	
 	return msg;
 }
 
@@ -564,6 +519,7 @@ int adc_msg_remove_named_argument(struct adc_message* cmd, const char prefix_[2]
 		{
 			
 			temp_len = &end[0] - &start[0]; // strlen(start);
+			/* hub_log(log_trace, "                     length=%d", (int) (temp_len)); */
 			endlen = strlen(end);
 			
 			memmove(start, end, endlen);
@@ -698,27 +654,6 @@ int adc_msg_add_named_argument(struct adc_message* cmd, const char prefix[2], co
 	return ret;
 }
 
-int adc_msg_add_named_argument_string(struct adc_message* cmd, const char prefix[2], const char* string)
-{
-	char* escaped = adc_msg_escape(string);
-	int ret = adc_msg_add_named_argument(cmd, prefix, escaped);
-	hub_free(escaped);
-	return ret;
-}
-
-int adc_msg_add_named_argument_int(struct adc_message* cmd, const char prefix[2], int num)
-{
-	const char* s = uhub_itoa(num);
-	int ret = adc_msg_add_named_argument(cmd, prefix, s);
-	return ret;
-}
-
-int adc_msg_add_named_argument_uint64(struct adc_message* cmd, const char prefix[2], uint64_t num)
-{
-	const char* s = uhub_ulltoa(num);
-	int ret = adc_msg_add_named_argument(cmd, prefix, s);
-	return ret;
-}
 
 int adc_msg_add_argument(struct adc_message* cmd, const char* string)
 {
@@ -747,6 +682,7 @@ char* adc_msg_get_argument(struct adc_message* cmd, int offset)
 	while (start)
 	{
 		end = strchr(&start[1], ' ');
+		
 		if (count == offset)
 		{
 			if (end)
@@ -756,23 +692,17 @@ char* adc_msg_get_argument(struct adc_message* cmd, int offset)
 			else
 			{
 				argument = hub_strdup(&start[1]);
-				if (argument && *argument && argument[strlen(argument)-1] == '\n')
+				if (argument[strlen(argument)-1] == '\n')
 					argument[strlen(argument)-1] = 0;
 			}
 			
-			if (!argument)
-				return 0; // FIXME: OOM
-
 			if (*argument)
 			{
 				adc_msg_terminate(cmd);
 				return argument;
 			}
-			else
-			{
-				hub_free(argument);
-			}
 		}
+		
 		count++;
 		start = end;
 	}
@@ -846,9 +776,12 @@ 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);
+	char* new_string = hub_malloc(adc_msg_unescape_length(string)+1);
 	char* ptr = (char*) new_string;
 	char* str = (char*) string;
 	int escaped = 0;
@@ -864,12 +797,14 @@ char* adc_msg_unescape(const char* string)
 				*ptr++ = '\n';
 			else
 				*ptr++ = *str;
+			
 			escaped = 0;
 		} else {
 			if (*str == '\\')
 				escaped = 1;
 			else
 				*ptr++ = *str;
+				
 		}
 		str++;
 	}

src/message.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -20,7 +20,7 @@
 #ifndef HAVE_UHUB_COMMAND_H
 #define HAVE_UHUB_COMMAND_H
 
-struct hub_user;
+struct user;
 
 struct adc_message
 {
@@ -70,7 +70,7 @@ extern struct adc_message* adc_msg_copy(const struct adc_message* cmd);
  * The message is only considered valid if the user who sent it
  * is the rightful origin of the message.
  */
-extern struct adc_message* adc_msg_parse_verify(struct hub_user* u, const char* string, size_t length);
+extern struct adc_message* adc_msg_parse_verify(struct user* u, const char* string, size_t length);
 
 /**
  * This will parse 'string' and return it as a adc_message struct, or
@@ -173,22 +173,6 @@ extern int adc_msg_add_argument(struct adc_message* cmd, const char* string);
  */
 extern int adc_msg_add_named_argument(struct adc_message* cmd, const char prefix[2], const char* string);
 
-/**
- * Append a string as a named argument.
- * The string will automatcally be escaped, if you do not wish to escape th string use adc_msg_add_named_argument() instead.
- *
- * @arg prefix a 2 character argument prefix
- * @arg string must NOT be escaped
- * @return  0 if successful, or -1 if an error occured (out of memory).
- */
-extern int adc_msg_add_named_argument_string(struct adc_message* cmd, const char prefix[2], const char* string);
-
-/**
- * Append an integer as a named argument.
- */
-extern int adc_msg_add_named_argument_int(struct adc_message* cmd, const char prefix[2], int integer);
-extern int adc_msg_add_named_argument_uint64(struct adc_message* cmd, const char prefix[2], uint64_t num);
-
 /**
  * Convert a ADC command escaped string to a regular string.
  * @return string or NULL if out of memory

src/misc.c

@@ -46,13 +46,10 @@ char* strip_white_space(char* string)
 {
 	char* pos;
 	
-	if (!string)
-		return "";
-
 	while (string[0] && is_white_space(string[0])) string++;
 	
 	if (!*string)
-		return string;
+		return 0;
 	
 	/* Strip appending whitespace */
 	pos = &string[strlen(string)-1];
@@ -171,96 +168,67 @@ void base32_decode(const char* src, unsigned char* dst, size_t len) {
 	}
 }
 
-int string_split(const char* string, const char* split, void* data, string_split_handler_t handler)
-{
-	char* buf = strdup(string);
-	char* start;
-	char* pos;
-	int count = 0;
-
-	start = buf;
-	while ((pos = strstr(start, split)))
-	{
-		pos[0] = '\0';
-		start = strip_white_space(start);
-		if (*start)
-		{
-			if (handler(start, count, data) < 0)
-			{
-				hub_free(buf);
-				return -1;
-			}
-		}
-		start = &pos[1];
-		count++;
-	}
-
-	start = strip_white_space(start);
-	if (*start)
-	{
-		if (handler(start, count, data) < 0)
-		{
-			hub_free(buf);
-			return -1;
-		}
-	}
-	hub_free(buf);
-	return count+1;
-}
-
-struct file_read_line_data
-{
-	file_line_handler_t handler;
-	void* data;
-};
-
-static int file_read_line_handler(char* line, int count, void* ptr)
-{
-	struct file_read_line_data* data = (struct file_read_line_data*) ptr;
-
-	LOG_DUMP("Line: %s", line);
-	if (data->handler(line, count+1, data->data) < 0)
-		return -1;
-	return 0;
-}
 
 int file_read_lines(const char* file, void* data, file_line_handler_t handler)
 {
 	int fd;
 	ssize_t ret;
 	char buf[MAX_RECV_BUF];
-	struct file_read_line_data split_data;
+	char *pos, *start;
+	size_t line_count = 0;
 
 	memset(buf, 0, MAX_RECV_BUF);
 
-	LOG_TRACE("Opening file %s for line reading.", file);
+	hub_log(log_trace, "Opening file %s for line reading.", file);
 
 	fd = open(file, 0);
 	if (fd == -1)
 	{
-		LOG_ERROR("Unable to open file %s: %s", file, strerror(errno));
+		hub_log(log_error, "Unable to open file %s: %s", file, strerror(errno));
 		return -2;
 	}
 	
 	ret = read(fd, buf, MAX_RECV_BUF);
-	close(fd);
-
 	if (ret < 0)
 	{
-		LOG_ERROR("Unable to read from file %s: %s", file, strerror(errno));
+		hub_log(log_error, "Unable to read from file %s: %s", file, strerror(errno));
+		close(fd);
 		return -1;
 	}
 	else  if (ret == 0)
 	{
-		LOG_WARN("File is empty.");
+		close(fd);
+		hub_log(log_warning, "File is empty.");
 		return 0;
 	}
+	else
+	{
+		close(fd);
 		
 		/* Parse configuaration */
-	split_data.handler = handler;
+		start = buf;
-	split_data.data = data;
+		while ((pos = strchr(start, '\n')))
+		{
+			pos[0] = '\0';
+			if (*start)
+			{
+				hub_log(log_dump, "Line: %s", start);
+				if (handler(start, line_count+1, data) < 0)
+					return -1;
+			}
+			start = &pos[1];
+			line_count++;
+		}
 		
-	return string_split(buf, "\n", &split_data, file_read_line_handler);
+		if (*start)
+		{
+			buf[strlen(start)] = 0;
+			hub_log(log_dump, "Line: %s", start);
+			if (handler(start, line_count+1, data) < 0)
+				return -1;
+		}
+	}
+	return line_count+1;
 }
 
 
@@ -351,121 +319,4 @@ void* memmem(const void *haystack, size_t haystacklen, const void *needle, size_
 }
 #endif
 
-int split_string(const char* string, const char* split, struct linked_list* list, int allow_empty)
-{
-	char* tmp1, *tmp2;
-	int n = 0;
-
-	if (!string || !*string || !split || !*split || !list)
-		return -1;
-
-	for (;;)
-	{
-		tmp1 = strstr(string, split);
-		
-		if (tmp1) tmp2 = hub_strndup(string, tmp1 - string);
-		else      tmp2 = hub_strdup(string);
-
-		if (!tmp2)
-		{
-			list_clear(list, &hub_free);
-			return -1;
-		}
-
-		if (*tmp2 || allow_empty)
-		{
-			/* store in list */
-			list_append(list, tmp2);
-			n++;
-		}
-		else
-		{
-			/* ignore element */
-			hub_free(tmp2);
-		}
-
-		if (!tmp1) break; /* last element found */
-
-		string = tmp1;
-		string += strlen(split);
-	}
-
-	return n;
-}
-
-const char* get_timestamp(time_t now)
-{
-	static char ts[32] = {0, };
-	struct tm* t  = localtime(&now);
-	sprintf(ts, "[%02d:%02d]", t->tm_hour, t->tm_min);
-	return ts;
-}
-
-void strip_off_ini_line_comments(char* line, int line_count)
-{
-	char* p = line;
-	char* out = line;
-	int backslash = 0;
-
-	if (!*line)
-		return;
-
-	for (; *p; p++)
-	{
-		if (!backslash)
-		{
-			if (*p == '\\')
-			{
-				backslash = 1;
-			}
-			else if (*p == '#')
-			{
-				*out = '\0';
-				out++;
-				break;
-			}
-			else
-			{
-				*out = *p;
-				out++;
-			}
-		}
-		else
-		{
-			if (*p == '\\' || *p == '#' || *p == '\"')
-			{
-				*out = *p;
-				out++;
-			}
-			else
-			{
-				LOG_WARN("Invalid backslash escape on line %d", line_count);
-				*out = *p;
-				out++;
-			}
-			backslash = 0;
-		}
-	}
-	*out = '\0';
-}
-
-char* strip_off_quotes(char* line)
-{
-	size_t len;
-
-	if (!*line)
-		return line;
-
-	len = strlen(line);
-	if (len < 2)
-		return line;
-
-	if ((line[0] == '"' && line[len - 1] == '"') ||
-	    (line[0] == '\'' && line[len - 1] == '\''))
-	{
-		line[len-1] = '\0';
-		return line + 1;
-	}
-	return line;
-}
 

src/misc.h

@@ -22,8 +22,6 @@
 
 typedef int (*file_line_handler_t)(char* line, int line_number, void* data);
 
-extern const char* get_timestamp(time_t time);
-
 extern int is_num(char c);
 extern int is_space(char c);
 extern int is_white_space(char c);
@@ -33,13 +31,10 @@ extern int is_valid_base32_char(char c);
 extern void base32_encode(const unsigned char* buffer, size_t len, char* result);
 extern void base32_decode(const char* src, unsigned char* dst, size_t len);
 extern char* strip_white_space(char* string);
-extern void strip_off_ini_line_comments(char* line, int line_count);
-extern char* strip_off_quotes(char* line);
 
 extern int file_read_lines(const char* file, void* data, file_line_handler_t handler);
 
 
-
 extern const char* uhub_itoa(int val);
 extern const char* uhub_ulltoa(uint64_t val);
 
@@ -58,15 +53,6 @@ extern char* strndup(const char* string, size_t n);
 void* memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen);
 #endif
 
-/**
- * Split the string based on split, and place the different parts into list.
- * @return the number of items in the list after split, or -1 if an error occured.
- */
-struct linked_list;
-extern int split_string(const char* string, const char* split, struct linked_list* list, int allow_empty);
-
-typedef int (*string_split_handler_t)(char* string, int count, void* data);
-extern int string_split(const char* string, const char* split, void* data, string_split_handler_t handler);
 
 #endif /* HAVE_UHUB_MISC_H */
 

src/netevent.c

@@ -0,0 +1,319 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+
+void net_on_read(int fd, short ev, void *arg)
+{
+	static char buf[MAX_RECV_BUF];
+	struct user* user = (struct user*) arg;
+	char* pos;
+	size_t offset;
+	size_t buflen;
+	ssize_t size;
+	int more = 1;
+	int flag_close = 0;
+	
+	hub_log(log_trace, "net_on_read() : fd=%d, ev=%d, arg=%p", fd, (int) ev, arg);
+	
+	if (ev == EV_TIMEOUT)
+	{
+		more = 0;
+		if (user_is_connecting(user))
+		{
+			flag_close = quit_timeout;
+		}
+		else
+		{
+			// FIXME: hub is not neccesarily set!
+			// hub_send_ping(hub, user);
+		}
+	}
+	
+	while (more)
+	{
+		offset = 0;
+		if (user->recv_buf)
+		{
+			memcpy(buf, user->recv_buf, user->recv_buf_offset);
+			offset = user->recv_buf_offset;
+		}
+		
+		size = net_recv(fd, &buf[offset], MAX_RECV_BUF - offset, 0);
+		if (size == -1)
+		{
+			if (net_error() != EWOULDBLOCK)
+				flag_close = quit_socket_error;
+			break;
+		}
+		else if (size == 0)
+		{
+			flag_close = quit_disconnected;
+			break;
+		}
+		else
+		{
+			buflen = offset + size;
+			ssize_t handled = 0;
+			
+			while ((pos = memchr(&buf[handled], '\n', (buflen - handled))))
+			{
+				pos[0] = '\0';
+				size_t msglen = &pos[0] - &buf[handled];
+				
+				if (user_flag_get(user, flag_maxbuf))
+				{
+					user_flag_unset(user, flag_maxbuf);
+				}
+				else
+				{
+					if (msglen < user->hub->config->max_recv_buffer)
+					{
+						// FIXME: hub is not set????
+						if (hub_handle_message(user->hub, user, &buf[handled], msglen) == -1)
+						{
+							flag_close = quit_protocol_error;
+							more = 0;
+							break;
+						}
+					}
+				}
+				handled += msglen;
+				handled++;
+			}
+			
+			if (handled == 0 && user_flag_get(user, flag_maxbuf))
+				handled = buflen;
+			
+			if (!more)
+				break;
+			
+			if (handled < buflen)
+			{
+				if ((buflen - handled) > user->hub->config->max_recv_buffer)
+				{
+					user_flag_set(user, flag_maxbuf);
+					hub_free(user->recv_buf);
+					user->recv_buf = 0;
+					user->recv_buf_offset = 0;
+				}
+				else
+				{
+					if (!user->recv_buf)
+						user->recv_buf = hub_malloc(user->hub->config->max_recv_buffer);
+				
+					if (user->recv_buf)
+					{
+						memcpy(user->recv_buf, &buf[handled], buflen - handled);
+						user->recv_buf_offset = buflen - handled;
+					}
+					else
+					{
+						flag_close = quit_memory_error;
+						break;
+					}
+				}
+			}
+			else
+			{
+				if (user->recv_buf)
+				{
+					hub_free(user->recv_buf);
+					user->recv_buf = 0;
+					user->recv_buf_offset = 0;
+				}
+			}
+		}
+	}
+	
+	if (flag_close)
+	{
+		user_disconnect(user, flag_close);
+		return;
+	}
+	
+	if (user_is_logged_in(user))
+	{
+		if (user->ev_read)
+		{
+			struct timeval timeout = { TIMEOUT_IDLE, 0 };
+			event_add(user->ev_read, &timeout);
+		}
+	}
+	else if (user_is_connecting(user))
+	{
+		if (user->ev_read)
+		{
+			struct timeval timeout = { TIMEOUT_HANDSHAKE, 0 };
+			event_add(user->ev_read, &timeout);
+		}
+	}
+}
+
+
+void net_on_write(int fd, short ev, void *arg)
+{
+	struct user* user = (struct user*) arg;
+	struct adc_message* msg;
+	int ret;
+	int length;
+	int close_flag = 0;
+	
+	msg = list_get_first(user->send_queue);
+	while (msg)
+	{
+		length = msg->length - user->send_queue_offset;
+		ret = net_send(user->sd, &msg->cache[user->send_queue_offset], length, UHUB_SEND_SIGNAL);
+	
+		if (ret == 0 || (ret == -1 && net_error() == EWOULDBLOCK))
+		{
+			close_flag = 0;
+			break;
+		}
+		else if (ret > 0)
+		{
+			
+			user->tm_last_write = time(NULL);
+			
+			if (ret == length)
+			{
+#ifdef DEBUG_SENDQ
+				hub_log(log_error, "SENDQ: sent=%d bytes/%d (all), send_queue_size=%d, offset=%d", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
+#endif
+				user->send_queue_size -= ret;
+				user->send_queue_offset = 0;
+			
+#ifdef DEBUG_SENDQ
+				if ((user->send_queue_size < 0) || (user->send_queue_offset < 0))
+				{
+					hub_log(log_error, "INVALID: send_queue_size=%d, send_queue_offset=%d", user->send_queue_size, user->send_queue_offset);
+				}
+#endif
+			
+				list_remove(user->send_queue, msg);
+				
+				if (user_flag_get(user, flag_user_list) && (msg == user->info || user->send_queue_size == 0))
+				{
+				    user_flag_unset(user, flag_user_list);
+				}
+				
+				adc_msg_free(msg);
+				msg = 0;
+				
+				if (user->send_queue_size == 0)
+					break;
+			}
+			else
+			{
+#ifdef DEBUG_SENDQ
+                                hub_log(log_error, "SENDQ: sent=%d bytes/%d (part), send_queue_size=%d, offset=%d", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
+#endif
+				user->send_queue_size -= ret;
+				user->send_queue_offset += ret;
+				
+#ifdef DEBUG_SENDQ				
+				if ((user->send_queue_size < 0) || (user->send_queue_offset < 0) || (user->send_queue_offset > msg->length))
+				{
+					hub_log(log_error, "INVALID: send_queue_size=%d, send_queue_offset=%d", user->send_queue_size, user->send_queue_offset);
+				}
+#endif
+				break;
+			}
+		}
+		else
+		{
+			close_flag = quit_socket_error;
+			break;
+		}
+		msg = list_get_first(user->send_queue);
+	}
+	
+	
+	if (close_flag)
+	{
+		user_disconnect(user, close_flag);
+	}
+	else
+	{
+		if (user->send_queue_size > 0 && user->ev_write)
+			event_add(user->ev_write, NULL);
+	}
+}
+
+
+void net_on_accept(int server_fd, short ev, void *arg)
+{
+	struct hub_info* hub = (struct hub_info*) arg;
+	struct user* user = 0;
+	struct ip_addr_encap ipaddr;
+	const char* addr;
+	struct timeval timeout = { TIMEOUT_CONNECTED, 0 };
+	
+	for (;;)
+	{
+		int fd = net_accept(server_fd, &ipaddr);
+		if (fd == -1)
+		{
+			if (net_error() == EWOULDBLOCK)
+			{
+				break;
+			}
+			else
+			{
+				hub_log(log_error, "Accept error: %d %s", net_error(), strerror(net_error()));
+				break;
+			}
+		}
+		
+		addr = ip_convert_to_string(&ipaddr); 
+
+		/* FIXME: Should have a plugin log this */
+		hub_log(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))
+		{
+			hub_log(log_info, "Denied      [%s] (IP banned)", addr);
+			net_close(fd);
+			continue;
+		}
+		
+		user = user_create(hub, fd);
+		if (!user)
+		{
+			hub_log(log_error, "Unable to create user after socket accepted. Out of memory?");
+			net_close(fd);
+			break;
+		}
+		
+		/* Store IP address in user object */
+		memcpy(&user->ipaddr, &ipaddr, sizeof(ipaddr));
+		
+		net_set_nonblocking(fd, 1);
+		net_set_nosigpipe(fd, 1);
+		
+		event_set(user->ev_read,  fd, EV_READ | EV_PERSIST, net_on_read,  user);
+		event_set(user->ev_write, fd, EV_WRITE,             net_on_write, user);
+		event_base_set(hub->evbase, user->ev_read);
+		event_base_set(hub->evbase, user->ev_write);
+		event_add(user->ev_read,  &timeout);
+	}
+}
+

src/netevent.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -20,15 +20,25 @@
 #ifndef HAVE_UHUB_NET_EVENT_H
 #define HAVE_UHUB_NET_EVENT_H
 
+/**
+ * Network callback for reading data from a socket.
+ */
+extern void net_on_read(int fd, short ev, void *arg);
+
+/**
+ * Network callback for writing data to a socket.
+ */
+extern void net_on_write(int fd, short ev, void *arg);
+
+/**
+ * Network callback for timers.
+ */
+extern void net_on_read_timeout(int fd, short ev, void* arg);
+
 /**
  * Network callback to accept incoming connections.
  */
-extern void net_on_accept(struct net_connection* con, int event, void *arg);
+extern void net_on_accept(int fd, short ev, void *arg);
-extern void net_event(struct net_connection* con, int event, void *arg);
-
-extern int handle_net_read(struct hub_user* user);
-extern int handle_net_write(struct hub_user* user);
-
 
 #endif /* HAVE_UHUB_NET_EVENT_H */
 

src/network-epoll.c

@@ -0,0 +1,326 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007, 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 HAVE_EPOLL
+
+// #define DEBUG_EPOLL
+static struct epoll_event* events = 0;
+static int epfd = -1;
+
+#ifdef DEBUG_EPOLL
+static void dump_listeners()
+{
+	int i;
+	struct net_event_listener* listener;
+	
+	
+	hub_log(log_dump, "listeners: number=%d", num_connections);
+	
+	for (i = 0; i < num_connections; i++)
+	{
+		listener = &listeners[i];
+		
+		if (listener)
+		{
+			if (listener->fd != -1)
+			{
+				hub_log(log_dump, "epoll_dump_listeners: pos=%d/%d fd=%d, ptr=%p", i, num_connections, listeners->fd, listeners);
+			}
+			else
+			{
+				hub_log(log_dump, "epoll_dump_listeners: pos=%d/%d (unused)", i, num_connections);
+			}
+			
+			listener = 0;
+		}
+	}
+	
+	getc(stdin);
+	
+}
+
+#endif
+
+
+static void set_poll_events(struct epoll_event* handle, short trigger)
+{
+	memset(handle, 0, sizeof(struct epoll_event));
+	
+	if (trigger & evt_accept || trigger & evt_read || trigger & evt_close)
+		handle->events |= EPOLLIN;
+	
+	if (trigger & evt_write)
+		handle->events |= EPOLLOUT;
+
+	if (trigger & evt_urgent)
+		handle->events |= EPOLLPRI;
+
+#ifdef EPOLLRDHUP
+	if (triggers & evt_close)
+		handle->events |= EPOLLRDHUP;
+#endif
+}
+
+static short get_poll_events(struct epoll_event* handle)
+{
+	short trig = handle->events;
+	short evt  = 0;
+	
+	if (trig & EPOLLIN)
+		evt |= evt_read;
+		
+	if (trig & EPOLLPRI)
+		evt |= evt_urgent;
+	
+	if (trig & EPOLLOUT)
+		evt |= evt_write;
+	
+	if (trig & EPOLLHUP)
+		evt |= evt_close;
+
+	if (trig & EPOLLERR)
+		evt |= evt_error;
+
+#ifdef EPOLLRDHUP
+	if (trig & EPOLLRDHUP)
+		evt |= evt_close;
+#endif
+
+	return evt;
+}
+
+
+int net_initialize(int capacity)
+{
+	int i;
+	max_connections = capacity;
+	num_connections = 0;
+	epfd = epoll_create(max_connections);
+	if (epfd == -1)
+	{
+		hub_log(log_error, "net_initialize(): epoll_create failed");
+		return -1;
+	}
+	
+	events = hub_malloc_zero(sizeof(struct epoll_event) * max_connections);
+	if (!events)
+	{
+		hub_log(log_error, "net_initialize(): hub_malloc failed");
+		return -1;
+	}
+	
+	monitor_allocate((size_t) capacity);
+	
+
+	
+#ifdef DEBUG_EPOLL
+	dump_listeners();
+#endif
+	
+	net_stats_initialize();
+	
+	return 0;
+}
+
+
+int net_shutdown()
+{
+	hub_log(log_trace, "Shutting down network monitor");
+	if (epfd != -1)
+	{
+		close(epfd);
+	}
+	
+	hub_free(events);
+	hub_free(listeners);
+	return 0;
+}
+
+#ifdef DEBUG_EPOLL
+uint64_t get_time_difference_in_msec(struct timeval before, struct timeval after)
+{
+	uint64_t seconds = (after.tv_sec - before.tv_sec);
+	uint64_t out = seconds*1000;
+	if (seconds > 0)
+		out += ((after.tv_usec / 1000) + (1000 - (before.tv_usec / 1000)));
+	else
+		out += ((after.tv_usec - before.tv_usec) / 1000);
+	return out;
+}
+#endif
+
+int net_wait(int timeout_ms)
+{
+	int fired, n, max, ret;
+	struct net_event_listener* listener;
+	
+#ifdef DEBUG_EPOLL
+	struct timeval tm_before;
+	struct timeval tm_after;
+	gettimeofday(&tm_before, NULL);
+	dump_listeners();
+#endif
+	
+	fired = epoll_wait(epfd, events, num_connections, timeout_ms);
+	if (fired == -1) {
+		if (errno != EINTR)
+		{
+			hub_log(log_error, "net_wait(): epoll_wait failed");
+		}
+		return -1;
+	}
+	
+	for (n = 0; n < fired; n++)
+	{
+		listener = (struct net_event_listener*) events[n].data.ptr;
+		listener->revents = get_poll_events(&events[n]);
+		hub_log(log_dump, "net_wait(): epoll event detected (fd=%d, evt=%d, ptr=%p)", listener->fd, listener->revents, listener);
+	}
+	
+	max = num_connections;
+	
+	for (n = 0; n < max; n++)
+	{
+		listener = &listeners[n];
+		if (listener && listener->fd != -1 && listener->revents)
+		{
+			hub_log(log_dump, "net_wait(): epoll trigger call  (fd=%d, evt=%d, ptr=%p)", listener->fd, listener->revents, listener);
+			ret = listener->handler(listener);
+			listener->revents = 0;
+		}
+#ifdef DEBUG_EPOLL
+		else
+		{
+			if (listener)
+				hub_log(log_dump, "net_wait(): epoll trigger ignore (fd=%d, evt=%d, ptr=%p)", listener->fd, listener->revents, listener);
+		}
+#endif
+	}
+
+#ifdef DEBUG_EPOLL
+	gettimeofday(&tm_after, NULL);
+	size_t diff = (size_t) get_time_difference_in_msec(tm_before, tm_after);
+	dump_listeners();
+	hub_log(log_debug, "net_wait(): time=%dms, triggered=%d", diff, fired);
+#endif
+	
+	return 0;
+}
+
+
+int net_add(int fd, short events, void* data, net_event_handler_t handler)
+{
+	struct epoll_event ev;
+	struct net_event_listener* listener = monitor_get_free_listener();
+	
+	hub_log(log_trace, "net_add(): adding socket (fd=%d, pos=%d)", fd, pos);
+	
+	if (!listener)
+	{
+		hub_log(log_error, "net_add(): unable to poll more sockets");
+		return -1;
+	}
+	
+	net_event_listener_set(listener, fd, events, data, handler);
+	
+	set_poll_events(&ev, events);
+	ev.data.ptr = listener;
+	
+	if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &ev) < 0)
+	{
+		hub_log(log_error, "net_add(): epoll_ctl error while adding socket (fd=%d)", fd);
+		net_event_listener_clear(listener);
+		return -1;
+	}
+	
+	num_connections++;
+	
+#ifdef DEBUG_EPOLL
+	dump_listeners();
+#endif
+	return 0;
+}
+
+int net_modify(int fd, short events)
+{
+	struct epoll_event ev;
+	struct net_event_listener* listener = monitor_get_listener(fd);
+	hub_log(log_trace, "net_modify(): modifying socket events (fd=%d)", fd);
+	
+	if (!listener)
+	{
+		hub_log(log_error, "net_modify(): unable to find socket.");
+		return -1;
+	}
+	
+	listener->events = events;
+	set_poll_events(&ev, events);
+	ev.data.ptr = listener;
+	
+	if (epoll_ctl(epfd, EPOLL_CTL_MOD, fd, &ev) < 0)
+	{
+		hub_log(log_error, "net_add(): epoll_ctl error while modifying socket (fd=%d)", fd);
+		return -1;
+	}
+	
+#ifdef DEBUG_EPOLL
+	dump_listeners();
+#endif
+
+	return 0;
+}
+
+
+int net_remove(int fd)
+{
+	struct epoll_event ev;
+	struct net_event_listener* listener = monitor_get_listener(fd);
+	
+	hub_log(log_trace, "net_remove(): removing socket (fd=%d, pos=%d)", fd, pos);
+	
+	if (!listener)
+	{
+		/* The socket is not being monitored */
+		hub_log(log_error, "net_remove(): unable to remove socket (fd=%d)", fd);
+		return -1;
+	}
+	
+	net_event_listener_clear(listener);
+
+	if (epoll_ctl(epfd, EPOLL_CTL_DEL, fd, &ev) < 0)
+	{
+		hub_log(log_error, "net_remove(): epoll_ctl error while removing socket (fd=%d)", fd);
+		return -1;
+	}
+	num_connections--;
+	
+#ifdef DEBUG_EPOLL
+	dump_listeners();
+#endif
+	
+	return 0;
+}
+
+
+#endif /* HAVE_EPOLL */
+
+
+

src/network-kqueue.c

@@ -0,0 +1,290 @@
+/*
+ * 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/>.
+ *
+ */
+
+#include "uhub.h"
+
+#ifdef HAVE_KQUEUE
+
+static struct kevent* events = 0;
+static struct kevent* change = 0;
+static int kfd = -1;
+
+
+static void set_poll_events(struct kevent* handle, short trigger)
+{
+	if (!handle) {
+		hub_log(log_error, "OOOPS!!");
+		return;
+	}
+
+	memset(handle, 0, sizeof(struct kevent));
+	
+	if (trigger & evt_accept || trigger & evt_read || trigger & evt_close)
+		handle->filter |= EVFILT_READ;
+	
+	if (trigger & evt_write /* || trigger & evt_accept*/)
+		handle->filter |= EVFILT_WRITE;
+}
+
+static short get_poll_events(struct kevent* handle)
+{
+	short trig = handle->flags;
+	short evt  = 0;
+	
+	if (trig & EVFILT_READ)
+		evt |= evt_read;
+		
+	if (trig & EVFILT_WRITE)
+		evt |= evt_write;
+	
+	if (trig & EV_EOF)
+	{
+		evt |= evt_close;
+		
+		if (handle->fflags)
+			evt |= evt_error;
+	}
+	
+	if (handle->filter == -1)
+	{
+		
+		evt |= evt_error;
+	}
+	
+	if (handle->data)
+	{
+		evt |= evt_accept;
+	}
+	
+	if (evt)
+	{
+		hub_log(log_error, "Evt: fd=%d, filter=%d, flags=%d, fflags=%d, data=%d evt=%#x", handle->ident, handle->filter, handle->flags, handle->fflags, (int) handle->data, evt);
+		
+		
+	}
+	
+	
+	return evt;
+}
+
+int net_initialize(int capacity)
+{
+	int i;
+	max_connections = capacity;
+	num_connections = 0;
+	kfd = kqueue();
+	if (kfd == -1)
+	{
+		hub_log(log_error, "net_initialize(): kqueue failed");
+		return -1;
+	}
+	
+	events = (void*) hub_malloc_zero(sizeof(struct kevent) * max_connections);
+	if (!events)
+	{
+		hub_log(log_error, "net_initialize(): hub_malloc failed");
+		return -1;
+	}
+	
+	change = (void*) hub_malloc_zero(sizeof(struct kevent) * max_connections);
+	if (!events)
+	{
+		hub_log(log_error, "net_initialize(): hub_malloc failed");
+		hub_free(events);
+		return -1;
+	}
+	
+	
+	listeners = (void*) hub_malloc_zero(sizeof(struct net_event_listener) * max_connections);
+	if (!listeners)
+	{
+		hub_log(log_error, "net_initialize(): hub_malloc failed");
+		hub_free(change);
+		hub_free(events);
+		return -1;
+	}
+	
+	for (i = 0; i < max_connections; i++)
+	{
+		listeners[i].fd = -1;
+	}
+	
+	net_stats_initialize();
+	
+	return 0;
+}
+
+
+int net_shutdown()
+{
+	if (kfd != -1) {
+		return close(kfd);
+	}
+	
+	hub_free(events);
+	hub_free(change);
+	hub_free(listeners);
+	return 0;
+}
+
+
+int net_wait(int timeout_ms)
+{
+	int fired, n, max, ret;
+	struct net_event_listener* listener;
+	struct timespec timeout = { (timeout_ms / 1000), (timeout_ms % 1000) * 1000 };
+	
+	fired = kevent(kfd, events, num_connections, change, num_connections, &timeout);
+	if (fired == -1) {
+		if (errno != EINTR)
+		{
+			hub_log(log_error, "net_wait(): kevent failed");
+		}
+		return -1;
+	}
+	
+	for (n = 0; n < fired; n++)
+	{
+		listener = (struct net_event_listener*) events[n].udata;
+		if (listener)
+		{
+			listener->revents = get_poll_events(&events[n]);
+			hub_log(log_dump, "net_wait(): kqueue event detected (fd=%d, evt=%d, ptr=%p)", listener->fd, listener->revents, listener);
+		}
+	}
+	
+	max = num_connections;
+	for (n = 0; n < max; n++)
+	{
+		listener = &listeners[n];
+		if (listener && listener->fd != -1 && listener->revents != 0)
+		{
+			hub_log(log_dump, "net_wait(): kqueue trigger call  (fd=%d, evt=%d, ptr=%p)", listener->fd, listener->revents, listener);
+			ret = listener->handler(listener);
+			listener->revents = 0;
+		}
+	}
+	
+	return 0;
+}
+
+
+int net_add(int fd, short events_, void* data, net_event_handler_t handler)
+{
+	struct kevent* event;
+	struct net_event_listener* listener = monitor_get_listener(fd);
+	
+	hub_log(log_trace, "net_add(): adding socket (fd=%d)", fd);
+	
+	if (listener)
+	{
+		/* Already added! */
+		return -1;
+	}
+	
+	listener = monitor_get_free_listener();
+	if (!listener)
+	{
+		hub_log(log_error, "net_add(): unable to poll more sockets");
+		return -1;
+	}
+	
+	net_event_listener_set(listener, fd, events_, data, handler);
+	
+	event = &events[pos];
+	set_poll_events(event, events_);
+	event->ident = fd;
+	
+	event->flags |= EV_ADD;
+	event->flags |= EV_ONESHOT;
+	
+#ifdef __APPLE__
+	 event->flags |= EV_ENABLE;
+#endif
+	event->udata = listener;
+
+	num_connections++;
+	return 0;
+}
+
+int net_modify(int fd, short events_)
+{
+	struct kevent* event;
+	struct net_event_listener* listener = monitor_get_listener(fd);
+	
+	hub_log(log_trace, "net_modify(): modifying socket (fd=%d)", fd);
+	
+	if (!listener)
+	{
+		/* The socket is not being monitored */
+		hub_log(log_error, "net_modify(): unable to find socket (fd=%d)", fd);
+		return -1;
+	}
+	
+	event = &events[pos];
+	// set_poll_events(event, events_);
+	
+	event->ident = fd;
+	event->flags |= EV_ADD;
+	event->flags |= EV_ONESHOT;
+#ifdef __APPLE__
+	event->flags |= EV_ENABLE;
+#endif
+	return 0;
+}
+
+
+int net_remove(int fd)
+{
+	struct kevent* event;
+	struct net_event_listener* listener = monitor_get_listener(fd);
+	
+	hub_log(log_trace, "net_remove(): removing socket (fd=%d)", fd);
+	
+	if (!listener)
+	{
+		/* The socket is not being monitored */
+		hub_log(log_error, "net_remove(): unable to remove socket (fd=%d)", fd);
+		return -1;
+	}
+
+	net_event_listener_clear(listener);
+	
+	event = &events[pos];
+	event->ident = fd;
+	event->filter = 0;
+	event->flags = EV_DELETE;
+
+#ifdef __APPLE__
+	event->flasg |= EV_DISABLE;
+#endif
+
+	event->fflags = 0;
+	event->data = 0;
+	event->udata = 0;
+
+	num_connections--;
+	return 0;
+}
+
+
+#endif /* HAVE_KQUEUE */
+
+
+

src/network.c

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -21,7 +21,6 @@
 
 static int is_ipv6_supported = -1; /* -1 = CHECK, 0 = NO, 1 = YES */
 static int net_initialized = 0;
-
 static struct net_statistics stats;
 static struct net_statistics stats_total;
 
@@ -36,30 +35,21 @@ int net_initialize()
 {
 	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.");
+			hub_log(log_error, "Unable to initialize winsock.");
 			return -1;
 		}
 #endif /* WINSOCK */
 
-		if (!net_backend_init())
+		hub_log(log_trace, "Initializing network monitor.");
-		{
-#ifdef WINSOCK
-			WSACleanup();
-#endif
-			return -1;
-		}
 		net_stats_initialize();
 
 #ifdef SSL_SUPPORT
-		LOG_TRACE("Initializing OpenSSL...");
+		/* FIXME: Initialize OpenSSL here. */
-		SSL_library_init();
-		SSL_load_error_strings();
 #endif /*  SSL_SUPPORT */
 
 		net_initialized = 1;
@@ -68,40 +58,15 @@ int net_initialize()
 	return -1;
 }
 
-size_t net_get_max_sockets()
-{
-#ifdef HAVE_GETRLIMIT
-	struct rlimit limits;
-	if (getrlimit(RLIMIT_NOFILE, &limits) == 0)
-	{
-		return MIN(limits.rlim_max, 65536);
-	}
-	LOG_ERROR("getrlimit() failed");
-	return 1024;
-#else
-#ifdef WIN32
-	LOG_WARN("Windows system, limited to 4096 connections.");
-	return 4096;
-#else
-	LOG_WARN("System does not have getrlimit(): constrained to 1024 sockets");
-	return 1024;
-#endif
-#endif /* HAVE_GETRLIMIT */
-}
 
-
+int net_shutdown()
-int net_destroy()
 {
 	if (net_initialized)
 	{
-		LOG_TRACE("Shutting down network monitor");
+		hub_log(log_trace, "Shutting down network monitor");
-
-		net_backend_shutdown();
 
 #ifdef SSL_SUPPORT
-		ERR_free_strings();
+		/* FIXME: Shutdown OpenSSL here. */
-		EVP_cleanup();
-		CRYPTO_cleanup_all_ex_data();
 #endif
 
 #ifdef WINSOCK
@@ -113,18 +78,6 @@ int net_destroy()
 	return -1;
 }
 
-#ifdef USE_LIBEVENT
-struct event_base* net_get_evbase()
-{
-	return net_evbase;
-}
-#endif
-
-static void net_error_out(int fd, const char* func)
-{
-	int err = net_error();
-	LOG_ERROR("%s, fd=%d: %s (%d)", func, fd, net_error_string(err), err);
-}
 
 int net_error()
 {
@@ -150,81 +103,60 @@ const char* net_error_string(int code)
 
 static int net_setsockopt(int fd, int level, int opt, const void* optval, socklen_t optlen)
 {
-	int ret = -1;
 #ifdef WINSOCK
-	ret = setsockopt(fd, level, opt, (const char*) optval, optlen);
+	return setsockopt(fd, level, opt, (const char*) optval, optlen);
 #else
-	ret = setsockopt(fd, level, opt, optval, optlen);
+	return setsockopt(fd, level, opt, optval, optlen);
 #endif
-
-	if (ret == -1)
-	{
-		net_error_out(fd, "net_setsockopt");
-	}
-
-	return ret;
-}
-
-static int net_getsockopt(int fd, int level, int opt, void* optval, socklen_t* optlen)
-{
-	int ret = -1;
-#ifdef WINSOCK
-	ret = getsockopt(fd, level, opt, (char*) optval, optlen);
-#else
-	ret = getsockopt(fd, level, opt, optval, optlen);
-#endif
-
-	if (ret == -1)
-	{
-		net_error_out(fd, "net_getsockopt");
-	}
-
-	return ret;
 }
 
 
 int net_set_nonblocking(int fd, int toggle)
 {
-	int ret = -1;
+	int ret;
+
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_nonblocking(): fd=%d", fd);
+#endif
+
 #ifdef WINSOCK
 	u_long on = toggle ? 1 : 0;
 	ret = ioctlsocket(fd, FIONBIO, &on);
-#else
-#ifdef __sun__
-	int flags = fcntl(fd, F_GETFL, 0);
-	if (flags != -1)
-	{
-		if (toggle) flags |= O_NONBLOCK;
-		else        flags &= ~O_NONBLOCK;
-		ret = fcntl(fd, F_SETFL, flags);
-	}
 #else
 	ret = ioctl(fd, FIONBIO, &toggle);
-#endif
 #endif
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_set_nonblocking");
+		hub_log(log_error, "net_set_nonblocking(): ioctl failed (fd=%d): %s", fd, net_error_string(net_error()));
+		return -1;
 	}
-	return ret;
+	return 0;
 }
 
+
 /* NOTE: Possibly only supported on BSD and OSX? */
 int net_set_nosigpipe(int fd, int toggle)
 {
-	int ret = -1;
 #ifdef SO_NOSIGPIPE
+	int ret;
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_nosigpipe(): fd=%d", fd);
+#endif
 	ret = net_setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &toggle, sizeof(toggle));
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_set_nosigpipe");
+		hub_log(log_error, "net_set_linger(): setsockopt failed (fd=%d): %s", fd, net_error_string(net_error()));
+		return -1;
 	}
 #endif
-	return ret;
+	return 0;
 }
 
 int net_set_close_on_exec(int fd, int toggle)
 {
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_close_on_exec(): fd=%d", fd);
+#endif
 #ifdef WINSOCK
 	return -1; /* FIXME: How is this done on Windows? */
 #else
@@ -232,63 +164,54 @@ int net_set_close_on_exec(int fd, int toggle)
 #endif
 }
 
+
 int net_set_linger(int fd, int toggle)
 {
 	int ret;
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_linger(): fd=%d", fd);
+#endif
 	ret = net_setsockopt(fd, SOL_SOCKET, SO_LINGER, &toggle, sizeof(toggle));
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_set_linger");
+		hub_log(log_error, "net_set_linger(): setsockopt failed (fd=%d): %s", fd, net_error_string(net_error()));
+		return -1;
 	}
-	return ret;
+	return 0;
 }
 
+
 int net_set_keepalive(int fd, int toggle)
 {
 	int ret;
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_keepalive(): fd=%d", fd);
+#endif
 	ret = net_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &toggle, sizeof(toggle));
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_set_keepalive");
+		hub_log(log_error, "net_set_keepalive(): setsockopt failed (fd=%d): %s", fd, net_error_string(net_error()));
+		return -1;
 	}
-	return ret;
+	return 0;
 }
 
 
 int net_set_reuseaddress(int fd, int toggle)
 {
 	int ret;
+#ifdef NETAPI_DUMP
+	hub_log(log_dump, "net_set_reuseaddress(): fd=%d", fd);
+#endif
 	ret = net_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &toggle, sizeof(toggle));
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_set_reuseaddress");
+		hub_log(log_error, "net_set_reuseaddress(): setsockopt failed (fd=%d): %s", fd, net_error_string(net_error()));
+		return -1;
 	}
-	return ret;
+	return 0;
 }
 
-int net_set_sendbuf_size(int fd, size_t size)
-{
-	return net_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size));
-}
-
-int net_get_sendbuf_size(int fd, size_t* size)
-{
-	socklen_t sz = sizeof(*size);
-	return net_getsockopt(fd, SOL_SOCKET, SO_SNDBUF, size, &sz);
-}
-
-int net_set_recvbuf_size(int fd, size_t size)
-{
-	return net_setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
-}
-
-int net_get_recvbuf_size(int fd, size_t* size)
-{
-	socklen_t sz = sizeof(*size);
-	return net_getsockopt(fd, SOL_SOCKET, SO_RCVBUF, size, &sz);
-}
-
-
 
 int net_close(int fd)
 {
@@ -304,7 +227,7 @@ int net_close(int fd)
 	}
 	else
 	{
-		if (ret != -1)
+		if (fd != -1)
 		{
 			net_stats_add_error();
 		}
@@ -312,32 +235,6 @@ int net_close(int fd)
 	return ret;
 }
 
-int net_shutdown_r(int fd)
-{
-#ifdef WINSOCK
-	return shutdown(fd, SD_RECEIVE);
-#else
-	return shutdown(fd, SHUT_RD);
-#endif
-}
-
-int net_shutdown_w(int fd)
-{
-#ifdef WINSOCK
-	return shutdown(fd, SD_SEND);
-#else
-	return shutdown(fd, SHUT_WR);
-#endif
-}
-
-int net_shutdown_rw(int fd)
-{
-#ifdef WINSOCK
-	return shutdown(fd, SD_BOTH);
-#else
-	return shutdown(fd, SHUT_RDWR);
-#endif
-}
 
 int net_accept(int fd, struct ip_addr_encap* ipaddr)
 {
@@ -358,9 +255,6 @@ 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:
@@ -374,7 +268,7 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
 			case EWOULDBLOCK:
 				break;
 			default:
-				net_error_out(fd, "net_accept");
+				hub_log(log_error, "net_accept(): accept failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 				net_stats_add_error();
 				return -1;
 		}
@@ -386,22 +280,11 @@ int net_accept(int fd, struct ip_addr_encap* ipaddr)
 		if (ipaddr)
 		{
 			memset(ipaddr, 0, sizeof(struct ip_addr_encap));
-			ipaddr->af = addr.ss_family;;
+			ipaddr->af = addr4->sin_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 (strchr(address, '.'))
-				{
-					/* Hack to convert IPv6 mapped IPv4 addresses to true IPv4 addresses */
-					ipaddr->af = AF_INET;
-					net_string_to_address(AF_INET, address, (void*) &ipaddr->internal_ip_data.in);
-				}
-				else
 			{
 				memcpy(&ipaddr->internal_ip_data.in6, &addr6->sin6_addr, sizeof(struct in6_addr));	
 			}
-			}
 			else
 			{
 				memcpy(&ipaddr->internal_ip_data.in, &addr4->sin_addr, sizeof(struct in_addr));
@@ -420,7 +303,7 @@ int net_connect(int fd, const struct sockaddr *serv_addr, socklen_t addrlen)
 	{
 		if (net_error() != EINPROGRESS)
 		{
-			net_error_out(fd, "net_connect");
+			hub_log(log_error, "net_connect(): connect failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 			net_stats_add_error();
 		}
 	}
@@ -442,12 +325,13 @@ int net_is_ipv6_supported()
 			if (net_error() == EAFNOSUPPORT)
 #endif
 			{
-				LOG_TRACE("net_is_ipv6_supported(): IPv6 is not supported on this system.");
+				hub_log(log_trace, "net_is_ipv6_supported(): IPv6 is not supported on this system.");
 				is_ipv6_supported = 0;
 				return 0;
 			}
 			
-			net_error_out(ret, "net_is_ipv6_supported");
+			hub_log(log_error, "net_is_ipv6_supported(): Unknown error (errno=%d, msg=%s)", net_error(), net_error_string(net_error()));
+
 		}
 		else
 		{
@@ -455,7 +339,7 @@ int net_is_ipv6_supported()
 			int off = 0;
 			if (net_setsockopt(ret, IPPROTO_IPV6, SOCK_DUAL_STACK_OPT, (char*) &off, sizeof(off)) < 0)
 			{
-				LOG_ERROR("net_socket_create(): Dual stack IPv6/IPv4 is not supported.");
+				hub_log(log_error, "net_socket_create(): Dual stack IPv6/IPv4 is not supported.");
 				is_ipv6_supported = 0;
 			}
 			else
@@ -477,8 +361,7 @@ int net_socket_create(int af, int type, int protocol)
 	int sd = socket(af, type, protocol);
 	if (sd == -1)
 	{
-		net_error_out(sd, "net_socket_create");
+		hub_log(log_error, "net_socket_create(): socket failed (errno=%d, msg=%s)", net_error(), net_error_string(net_error()));
-		return -1;
 	}
 
 #ifdef SOCK_DUAL_STACK_OPT
@@ -488,7 +371,7 @@ int net_socket_create(int af, int type, int protocol)
 		int off = 0;
 		if (net_setsockopt(sd, IPPROTO_IPV6, SOCK_DUAL_STACK_OPT, (char*) &off, sizeof(off)) < 0)
 		{
-			LOG_ERROR("net_socket_create():  Cannot set socket to dual stack mode IPv6/IPv4 (%d - %s).", net_error(), net_error_string(net_error()));
+			hub_log(log_error, "net_socket_create():  Cannot set socket to dual stack mode IPv6/IPv4 (%d - %s).", net_error(), net_error_string(net_error()));
 		}
 	}
 #endif
@@ -536,15 +419,7 @@ const char* net_address_to_string(int af, const void* src, char* dst, socklen_t
 
 	return NULL;
 #else
-	if (inet_ntop(af, src, dst, cnt))
+	return 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
 }
 
@@ -591,6 +466,9 @@ 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];
@@ -598,10 +476,9 @@ 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);
-	namelen = sizeof(struct sockaddr_storage);
+	socklen_t namelen = sizeof(struct sockaddr_storage);
 	memset(&storage, 0, namelen);
 	
 	name6 = (struct sockaddr_in6*) &storage;
@@ -610,67 +487,33 @@ const char* net_get_peer_address(int fd)
 	
 	if (getpeername(fd, (struct sockaddr*) name, &namelen) != -1)
 	{
-		int af = storage.ss_family;
+		int af = name4->sin_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. */
-		else
 			{
-			net_address_to_string(af, (void*) &name4->sin_addr, address, INET6_ADDRSTRLEN);
+				return &address[7];
 			}
+			hub_log(log_trace, "net_get_peer_address(): address=%s", address);
 			return address;
 		}
 		else
-	{
-		net_error_out(fd, "net_get_peer_address");
-		net_stats_add_error();
-	}
-
-	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)
-	{
-		int af = storage.ss_family;
-		if (af == AF_INET6)
-		{
-			net_address_to_string(af, (void*) &name6->sin6_addr, address, INET6_ADDRSTRLEN);
-		}
-		else
 		{
 			net_address_to_string(af, (void*) &name4->sin_addr, address, INET6_ADDRSTRLEN);
-		}
+			hub_log(log_trace, "net_get_peer_address(): address=%s", address);
 			return address;
 		}
+	}
 	else
 	{
-		net_error_out(fd, "net_get_local_address");
+		hub_log(log_error, "net_get_peer_address(): getsockname failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
-		net_stats_add_error();
 	}
 
 	return "0.0.0.0";
 }
 
 
-
 ssize_t net_recv(int fd, void* buf, size_t len, int flags)
 {
 	ssize_t ret = recv(fd, buf, len, flags);
@@ -682,7 +525,7 @@ ssize_t net_recv(int fd, void* buf, size_t len, int flags)
 	{
 		if (net_error() != EWOULDBLOCK)
 		{
-			/* net_error_out(fd, "net_recv"); */
+			hub_log(log_debug, "net_recv(): failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 			net_stats_add_error();
 		}
 	}
@@ -690,7 +533,7 @@ ssize_t net_recv(int fd, void* buf, size_t len, int flags)
 }
 
 
-ssize_t net_send(int fd, const void* buf, size_t len, int flags)
+ssize_t net_send(int fd, void* buf, size_t len, int flags)
 {
 	ssize_t ret = send(fd, buf, len, flags);
 	if (ret >= 0)
@@ -701,7 +544,7 @@ ssize_t net_send(int fd, const void* buf, size_t len, int flags)
 	{
 		if (net_error() != EWOULDBLOCK)
 		{
-			/* net_error_out(fd, "net_send"); */
+			hub_log(log_debug, "net_send(): failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 			net_stats_add_error();
 		}
 	}
@@ -714,7 +557,7 @@ int net_bind(int fd, const struct sockaddr *my_addr, socklen_t addrlen)
 	int ret = bind(fd, my_addr, addrlen);
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_bind");
+		hub_log(log_error, "net_bind(): failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 		net_stats_add_error();
 	}
 	return ret;
@@ -726,7 +569,7 @@ int net_listen(int fd, int backlog)
 	int ret = listen(fd, backlog);
 	if (ret == -1)
 	{
-		net_error_out(fd, "net_listen");
+		hub_log(log_error, "net_listen(): failed (fd=%d, errno=%d, msg=%s)", fd, net_error(), net_error_string(net_error()));
 		net_stats_add_error();
 	}
 	return ret;
@@ -742,12 +585,14 @@ void net_stats_initialize()
 	stats.timestamp = time(NULL);
 }
 
+
 void net_stats_get(struct net_statistics** intermediate, struct net_statistics** total)
 {
 	*intermediate = &stats;
 	*total = &stats_total;
 }
 
+
 void net_stats_reset()
 {
 	stats_total.tx += stats.tx;
@@ -760,31 +605,37 @@ void net_stats_reset()
 	stats.timestamp = time(NULL);
 }
 
+
 int net_stats_timeout()
 {
 	return (difftime(time(NULL), stats.timestamp) > TIMEOUT_STATS) ? 1 : 0;
 }
 
+
 void net_stats_add_tx(size_t bytes)
 {
 	stats.tx += bytes;
 }
 
+
 void net_stats_add_rx(size_t bytes)
 {
 	stats.rx += bytes;
 }
 
+
 void net_stats_add_accept()
 {
 	stats.accept++;
 }
 
+
 void net_stats_add_error()
 {
 	stats.errors++;
 }
 
+
 void net_stats_add_close()
 {
 	stats.closed++;

src/network.h

@@ -1,6 +1,6 @@
 /*
  * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2010, Jan Vidar Krey
+ * 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
@@ -30,8 +30,6 @@ struct net_statistics
 	size_t errors;
 };
 
-struct net_socket_t;
-
 /**
  * Initialize the socket monitor subsystem.
  * On some operating systems this will also involve loading the TCP/IP stack
@@ -49,9 +47,7 @@ extern int net_initialize();
  *
  * @return -1 on error, 0 on success
  */
-extern int net_destroy();
+extern int net_shutdown();
-
-extern struct event_base* net_get_evbase();
 
 /**
  * @return the number of sockets currrently being monitored.
@@ -80,20 +76,11 @@ extern const char* net_error_string(int code);
  */
 extern int net_socket_create(int af, int type, int protocol);
 
-/**
- * Returns the maximum number of file/socket descriptors.
- */
-extern size_t net_get_max_sockets();
-
 /**
  * A wrapper for the close() function call.
  */
 extern int net_close(int fd);
 
-extern int net_shutdown_r(int fd);
-extern int net_shutdown_w(int fd);
-extern int net_shutdown_rw(int fd);
-
 /**
  * A wrapper for the accept() function call.
  * @param fd socket descriptor
@@ -164,38 +151,6 @@ extern int net_set_linger(int fd, int toggle);
  */
 extern int net_set_reuseaddress(int fd, int toggle);
 
-/**
- * Set the send buffer size for the socket.
- * @param fd socket descriptor
- * @param size size to set
- * @return -1 on error, 0 on success.
- */
-extern int net_set_sendbuf_size(int fd, size_t size);
-
-/**
- * Get the send buffer size for the socket.
- * @param fd socket descriptor
- * @param[out] size existing size, cannot be NULL.
- * @return -1 on error, 0 on success.
- */
-extern int net_get_sendbuf_size(int fd, size_t* size);
-
-/**
- * Set the receive buffer size for the socket.
- * @param fd socket descriptor
- * @param size size to set
- * @return -1 on error, 0 on success.
- */
-extern int net_set_recvbuf_size(int fd, size_t size);
-
-/**
- * Get the receive buffer size for the socket.
- * @param fd socket descriptor
- * @param[out] size existing size, cannot be NULL.
- * @return -1 on error, 0 on success.
- */
-extern int net_get_recvbuf_size(int fd, size_t* size);
-
 /**
  * A wrapper for the recv() function call.
  */
@@ -204,7 +159,7 @@ extern ssize_t net_recv(int fd, void* buf, size_t len, int flags);
 /**
  * A wrapper for the send() function call.
  */
-extern ssize_t net_send(int fd, const void* buf, size_t len, int flags);
+extern ssize_t net_send(int fd, void* buf, size_t len, int flags);
 
 /**
  * This tries to create a AF_INET6 socket.
@@ -224,8 +179,6 @@ 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.
  */
@@ -257,6 +210,11 @@ extern void net_stats_get(struct net_statistics** intermediate, struct net_stati
 
 #if defined(WINSOCK) && !defined(__CYGWIN__)
 
+// #define EINTR           WSAEINTR
+// #define EACCES          WSAEACCES
+// #define EFAULT          WSAEFAULT
+// #define EINVAL          WSAEINVAL
+// #define EMFILE          WSAEMFILE
 #define EWOULDBLOCK     WSAEWOULDBLOCK
 #define EINPROGRESS     WSAEINPROGRESS
 #define EALREADY        WSAEALREADY
@@ -285,8 +243,10 @@ extern void net_stats_get(struct net_statistics** intermediate, struct net_stati
 #define ETIMEDOUT       WSAETIMEDOUT
 #define ECONNREFUSED    WSAECONNREFUSED
 #define ELOOP           WSAELOOP
+// #define ENAMETOOLONG    WSAENAMETOOLONG
 #define EHOSTDOWN       WSAEHOSTDOWN
 #define EHOSTUNREACH    WSAEHOSTUNREACH
+// #define ENOTEMPTY       WSAENOTEMPTY
 #define EPROCLIM        WSAEPROCLIM
 #define EUSERS          WSAEUSERS
 #define EDQUOT          WSAEDQUOT

src/network/backend.c

@@ -1,229 +0,0 @@
-/*
- * 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);
-
-#ifdef SSL_SUPPORT
-	if (con->ssl)
-	{
-		SSL_shutdown(con->ssl);
-		SSL_clear(con->ssl);
-	}
-#endif
-
-	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)
-{
-	net_cleanup_process(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

@@ -1,94 +0,0 @@
-/*
- * 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_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)(void);
-
-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_init();
-
-/**
- * Shutdown the network connection backend.
- */
-extern void net_backend_shutdown();
-
-/**
- * Process the network backend.
- */
-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,51 +0,0 @@
-/*
- * 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           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_CLEANUP               0x8000
-
-#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 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 /* SSL_SUPPORT */
-

src/network/connection.c

@@ -1,331 +0,0 @@
-/*
- * 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/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(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);
-			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);
-			con->flags |= NET_WANT_SSL_WRITE;
-			net_con_update(con, NET_EVENT_READ | NET_EVENT_WRITE);
-			return 0;
-
-		case SSL_ERROR_SYSCALL:
-			LOG_PROTO("SSL_get_error: ret=%d, error=%d: SSL_ERROR_SYSCALL", ret, error);
-			/* if ret == 0, connection closed, if ret == -1, check with errno */
-			if (ret == 0)
-				return -1;
-			else
-				return -net_error();
-
-		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;
-	}
-
-	return -1;
-}
-
-ssize_t net_con_ssl_accept(struct net_connection* con)
-{
-	uhub_assert(con);
-	con->ssl_state = tls_st_accepting;
-	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
-	{
-		return handle_openssl_error(con, ret);
-	}
-	return ret;
-}
-
-ssize_t net_con_ssl_connect(struct net_connection* con)
-{
-	uhub_assert(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
-	{
-		return handle_openssl_error(con, ret);
-	}
-	return ret;
-}
-
-ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode ssl_mode, SSL_CTX* ssl_ctx)
-{
-	uhub_assert(con);
-	SSL* ssl = 0;
-
-	if (ssl_mode == net_con_ssl_mode_server)
-	{
-		ssl = SSL_new(ssl_ctx);
-		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, con->sd);
-		net_con_set_ssl(con, ssl);
-		return net_con_ssl_connect(con);
-	}
-}
-#endif /* SSL_SUPPORT */
-
-
-ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len)
-{
-	int ret;
-#ifdef SSL_SUPPORT
-	if (!con->ssl)
-	{
-#endif
-		ret = net_send(con->sd, buf, len, UHUB_SEND_SIGNAL);
-		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)
-{
-	int ret;
-#ifdef SSL_SUPPORT
-	if (!net_con_is_ssl(con))
-	{
-#endif
-		ret = net_recv(con->sd, buf, len, 0);
-		if (ret == -1)
-		{
-			if (net_error() == EWOULDBLOCK || net_error() == EINTR)
-				return 0;
-			return -net_error();
-		}
-		else if (ret == 0)
-		{
-			return -1;
-		}
-#ifdef SSL_SUPPORT
-	}
-	else
-	{
-		if (con->ssl_state == tls_st_error)
-			return -1;
-
-		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);
-		}
-		else
-		{
-			return handle_openssl_error(con, ret);
-		}
-	}
-#endif
-	return ret;
-}
-
-ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len)
-{
-	int ret = net_recv(con->sd, buf, len, MSG_PEEK);
-	if (ret == -1)
-	{
-		if (net_error() == EWOULDBLOCK || net_error() == EINTR)
-			return 0;
-		return -net_error();
-	}
-	else if (ret == 0)
-		return -1;
-	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)
-{
-#ifdef SSL_SUPPORT
-	SSL_free(con->ssl);
-#endif
-	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

@@ -1,111 +0,0 @@
-/*
- * 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_NETWORK_CONNECTION_H
-#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
-
-struct net_connection
-{
-	NET_CON_STRUCT_COMMON
-};
-
-extern int   net_con_get_sd(struct net_connection* con);
-extern void* net_con_get_ptr(struct net_connection* con);
-
-extern struct net_connection* net_con_create();
-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).
- */
-extern void net_con_close(struct net_connection* con);
-
-/**
- * Send data
- *
- * @return returns the number of bytes sent.
- *         0 if no data is sent, and this function should be called again (EWOULDBLOCK/EINTR)
- *        <0 if an error occured, the negative number contains the error code.
- */
-extern ssize_t net_con_send(struct net_connection* con, const void* buf, size_t len);
-
-/**
- * Receive data
- *
- * @return returns the number of bytes sent.
- *         0 if no data is sent, and this function should be called again (EWOULDBLOCK/EINTR)
- *        <0 if an error occured, the negative number contains the error code.
- */
-extern ssize_t net_con_recv(struct net_connection* con, void* buf, size_t len);
-
-/**
- * Receive data without removing them from the recv() buffer.
- * NOTE: This does not currently work for SSL connections after the SSL handshake has been
- * performed.
- */
-extern ssize_t net_con_peek(struct net_connection* con, void* buf, size_t len);
-
-/**
- * Set timeout for connetion.
- *
- * @param seconds the number of seconds into the future.
- */
-extern void net_con_set_timeout(struct net_connection* con, int seconds);
-extern void net_con_clear_timeout(struct net_connection* con);
-
-#ifdef SSL_SUPPORT
-/**
- * Start SSL_accept()
- */
-extern ssize_t net_con_ssl_accept(struct net_connection*);
-
-/**
- * Start SSL_connect()
- */
-extern ssize_t net_con_ssl_connect(struct net_connection*);
-
-enum net_con_ssl_mode
-{
-	net_con_ssl_mode_server,
-	net_con_ssl_mode_client,
-};
-
-extern ssize_t net_con_ssl_handshake(struct net_connection* con, enum net_con_ssl_mode, SSL_CTX* ssl_ctx);
-
-extern int   net_con_is_ssl(struct net_connection* con);
-extern SSL* net_con_get_ssl(struct net_connection* con);
-extern void net_con_set_ssl(struct net_connection* con, SSL*);
-#endif /* SSL_SUPPORT */
-
-#endif /* HAVE_UHUB_NETWORK_CONNECTION_H */
-