huge refactoring of build structure as well as other changes...sorry for the hug…

…e diff. These are the changes done within the sister project taskrambler, including reactivation of the existing tests as well as code coverage reports

 .*.swp
 .*.swp
 *.o
 *.o
+*.a
+*.gcda
+*.gcno
 .dirstamp
 .dirstamp
 .deps/
 .deps/
 Makefile
 Makefile
@@ -8,6 +11,10 @@ Makefile.in
 m4/
 m4/
 /docs/
 /docs/
 /INSTALL
 /INSTALL
+coverage.base
+coverage.run
+coverage.info
+coveragereport/
 *.m4
 *.m4
 /autom4te.cache/
 /autom4te.cache/
 /compile
 /compile
@@ -18,4 +25,5 @@ m4/
 /ltmain.sh
 /ltmain.sh
 /missing
 /missing
 stamp-h1
 stamp-h1
-src/webgameserver
+src/taskrambler
+/tests/*Test

+Georg Hopp <georg@steffers.org>

@@ -5,6 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
 #create_token_LDADD   = src/libtoken.la $(LIBOBJS)
 #create_token_LDADD   = src/libtoken.la $(LIBOBJS)
 #create_token_CFLAGS  = -Wall -I include
 #create_token_CFLAGS  = -Wall -I include
 
 
-EXTRA_DIST = include assets
+EXTRA_DIST = include assets certs
 
 
 SUBDIRS = src tests
 SUBDIRS = src tests
+
+include $(top_srcdir)/Makefile.am.coverage

+
+# Coverage targets
+
+#if HAVE_GCOV
+
+  .PHONY: clean-gcda
+  clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+  
+  .PHONY: coverage-html generate-coverage-html clean-coverage-html
+  coverage-html: clean-gcda
+	-$(MAKE) -C tests $(AM_MAKEFLAGS) -k check-build
+	$(MAKE) $(AM_MAKEFLAGS) init-coverage-html
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+  init-coverage-html:
+	$(LCOV) -d $(top_builddir) -c -i -o coverage.base --no-checksum --compat-libtool
+  
+  generate-coverage-html:
+	@echo Collecting coverage data
+	$(LCOV) -d $(top_builddir) -c -o coverage.run --no-checksum --compat-libtool
+	$(LCOV) -d $(top_builddir) -a ./coverage.base -a ./coverage.run -o coverage.info --no-checksum --compat-libtool
+	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --branch-coverage --show-details coverage.info
+  
+  clean-coverage-html: clean-gcda
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf coverage.info coveragereport
+  
+  clean-local: clean-coverage-html
+
+#endif # HAVE_GCOV

@@ -3,13 +3,22 @@
 
 
 AC_PREREQ([2.68])
 AC_PREREQ([2.68])
 AC_INIT([webgameserver], [0.0.2], [Georg Hopp <georg@steffers.org>])
 AC_INIT([webgameserver], [0.0.2], [Georg Hopp <georg@steffers.org>])
+LT_INIT
 AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE
-AC_COPYRIGHT([Copyright (C) 2012 Georg Hopp])
-AC_REVISION([$Revision: 0.03 $])
+#AM_INIT_AUTOMAKE([subdir-objects])
+AM_SILENT_RULES([yes])
+AC_COPYRIGHT([Copyright © 2012 Georg Hopp])
+AC_REVISION([$Revision: 0.04 $])
 AC_CONFIG_SRCDIR([src/webgameserver.c])
 AC_CONFIG_SRCDIR([src/webgameserver.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_MACRO_DIR([m4])
 
 
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_CXXFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+
 # Checks for programs.
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CC
@@ -37,5 +46,17 @@ AC_TYPE_SIZE_T
 #AC_FUNC_MALLOC
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([memset])
 AC_CHECK_FUNCS([memset])
 
 
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile
+		 src/Makefile
+		 src/auth/Makefile
+		 src/cbuf/Makefile
+		 src/class/Makefile
+		 src/hash/Makefile
+		 src/http/Makefile
+		 src/logger/Makefile
+		 src/server/Makefile
+		 src/session/Makefile
+		 src/socket/Makefile
+		 src/stream/Makefile
+		 tests/Makefile])
 AC_OUTPUT
 AC_OUTPUT

-/**
- * \file
- * Authenticatio module factory
- *
- * A factory to get a specific authentication module.
- * An authentication module is a class that implement the Auth interface.
- *
- * \author	Georg Hopp
- *
- * \copyright
- * Copyright © 2012  Georg Hopp
- *
- * 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 __AUTH_H__
 #ifndef __AUTH_H__
 #define __AUTH_H__
 #define __AUTH_H__
 
 
-#include "class.h"
+#include "auth/auth.h"
 #include "auth/ldap.h"
 #include "auth/ldap.h"
-
-typedef enum e_AuthModule {
-	AUTH_LDAP = 0
-} AuthModule;
-
-CLASS(Auth) {
-};
-
-void *   authCreateById(Auth, int);
-AuthLdap authCreateLdap(Auth);
+#include "auth/credential.h"
+#include "auth/interface/auth.h"
 
 
 #endif // __AUTH_H__
 #endif // __AUTH_H__
 
 

+/**
+ * \file
+ * Authenticatio module factory
+ *
+ * A factory to get a specific authentication module.
+ * An authentication module is a class that implement the Auth interface.
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __AUTH_AUTH_H__
+#define __AUTH_AUTH_H__
+
+#include "class.h"
+#include "auth/ldap.h"
+
+typedef enum e_AuthModule {
+	AUTH_LDAP = 0
+} AuthModule;
+
+CLASS(Auth) {
+};
+
+void *   authCreateById(Auth, int);
+AuthLdap authCreateLdap(Auth);
+
+#endif // __AUTH_AUTH_H__
+
+// vim: set ts=4 sw=4:

-#ifndef __CREDENTIAL_H__
-#define __CREDENTIAL_H__
+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __AUTH_CREDENTIAL_H__
+#define __AUTH_CREDENTIAL_H__
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
@@ -27,6 +49,6 @@ CLASS(Credential) {
 	} cred;
 	} cred;
 };
 };
 
 
-#endif // __CREDENTIAL_H__
+#endif // __AUTH_CREDENTIAL_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

@@ -25,13 +25,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __INTERFACE_AUTH_H__
-#define __INTERFACE_AUTH_H__
+#ifndef __AUTH_INTERFACE_AUTH_H__
+#define __AUTH_INTERFACE_AUTH_H__
 
 
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "interface.h"
-#include "credential.h"
+#include "class.h"
+#include "auth/credential.h"
 
 
 typedef int (* fptr_authenticate)(void *, Credential);
 typedef int (* fptr_authenticate)(void *, Credential);
 
 
@@ -44,6 +44,6 @@ struct i_Auth {
 
 
 extern int authenticate(void *, Credential);
 extern int authenticate(void *, Credential);
 
 
-#endif // __INTERFACE_AUTH_H__
+#endif // __AUTH_INTERFACE_AUTH_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __AUTH_LDAP_H__
 #ifndef __AUTH_LDAP_H__
 #define __AUTH_LDAP_H__
 #define __AUTH_LDAP_H__
 
 

@@ -11,7 +11,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

-/**
- * \file
- * My own class implementation for C. It combines a data structure
- * with a set of dynamically linked methods defined by an interface. A
- * dynamically linked method will be called via a selector method which in
- * turn gets the implementation stored in the class.
- *
- * \author	Georg Hopp
- *
- * \copyright
- * Copyright (C) 2012  Georg Hopp
- *
- * 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 __CLASS_H__
 #ifndef __CLASS_H__
 #define __CLASS_H__
 #define __CLASS_H__
 
 
-#include <stdarg.h>
-#include <sys/types.h>
-#include <string.h>
-#include <assert.h>
-
-#include "interface.h"
-
-#ifndef _ISOC99_SOURCE
-#define _ISOC99_SOURCE
-#endif
-
-#define CLASS_MAGIC    0xFEFE
-
-#define CLASS(name)                    \
-	struct c_##name;                   \
-	typedef struct c_##name * name;    \
-	extern struct class * const _##name; \
-	struct c_##name
-
-#define EXTENDS(parent) \
-	const char _[sizeof(struct c_##parent)]
-
-#define _NULL	NULL
-#define CREATE_CLASS(name,_parent,...) \
-	static struct class c_##name;      \
-	static void _classInit_(void) {    \
-		c_##name.parent = _##_parent;  \
-		c_##name.init   = NULL;        \
-	}                                  \
-	static struct class c_##name = {   \
-		CLASS_MAGIC,                   \
-		NULL,                          \
-		sizeof(struct c_##name),       \
-		_classInit_,                   \
-		INIT_IMPL(__VA_ARGS__)         \
-	}; struct class * const _##name = &c_##name
-
-#define GET_CLASS(object)			(*(class_ptr *)((object) - sizeof(void*)))
-#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
-#define IFACE_EXISTS(class,iface)	(NULL != IFACE_GET((class),(iface)))
-
-/**
- * \todo actually i use gcc feature ## for variadoc... think about
- * a way to make this standard.
- */
-#define _CALL(object,_iface,method,...)                                           \
-	do {                                                                          \
-		class_ptr class = GET_CLASS((object));                                \
-		if (class->init) class->init();                                           \
-		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);      \
-		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) {   \
-			class = class->parent;                                                \
-			if (class->init) class->init();                                       \
-			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);  \
-		};                                                                        \
-		assert(NULL != iface->method);                                            \
-	} while(0)
-
-#define CALL(object,_iface,method,...)                \
-	do {                                              \
-		struct i_##_iface * iface;                    \
-		_CALL(object, _iface, method, ##__VA_ARGS__); \
-		iface->method(object, ##__VA_ARGS__);         \
-	} while(0)
-
-#define RETCALL(object,_iface,method,ret,...)         \
-	do {                                              \
-		struct i_##_iface * iface;                    \
-		_CALL(object, _iface, method, ##__VA_ARGS__); \
-		ret = iface->method(object, ##__VA_ARGS__);   \
-	} while(0)
-
-#define PARENTCALL(object,_iface,method,...)                                  \
-	do {                                                                      \
-		struct i_##_iface * iface;                                            \
-		class_ptr class = GET_CLASS((object));                            \
-		if (class->init) class->init();                                       \
-		assert(HAS_PARENT(class));                                            \
-		class = class->parent;                                                \
-		if (class->init) class->init();                                       \
-		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);  \
-		assert(NULL != iface->method);                                        \
-		iface->method(object, ##__VA_ARGS__);                                 \
-	} while(0)
-
-
-#define HAS_PARENT(class)			(NULL != ((class)->parent))
-
-typedef void (* fptr_classInit)(void);
-
-struct class;
-typedef struct class * class_ptr;
-struct class {
-	const int         magic;
-	class_ptr         parent;
-	size_t            object_size;
-	fptr_classInit    init;
-	struct iface_impl impl;
-};
+#include "class/class.h"
+#include "class/interface.h"
+#include "class/interface/class.h"
 
 
 #endif // __CLASS_H__
 #endif // __CLASS_H__
 
 

+/**
+ * \file
+ * My own class implementation for C. It combines a data structure
+ * with a set of dynamically linked methods defined by an interface. A
+ * dynamically linked method will be called via a selector method which in
+ * turn gets the implementation stored in the class.
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __CLASS_CLASS_H__
+#define __CLASS_CLASS_H__
+
+#include <stdarg.h>
+#include <sys/types.h>
+#include <string.h>
+#include <assert.h>
+
+#include "class/interface.h"
+
+#ifndef _ISOC99_SOURCE
+#define _ISOC99_SOURCE
+#endif
+
+#define CLASS_MAGIC    0xFEFE
+
+#define CLASS(name)                      \
+	struct c_##name;                     \
+	typedef struct c_##name * name;      \
+	extern struct class * const _##name; \
+	struct c_##name
+
+#define EXTENDS(parent) \
+	const char _[sizeof(struct c_##parent)]
+
+#define _NULL	NULL
+#define CREATE_CLASS(name,_parent,...)              \
+	static struct class c_##name;                   \
+	static class_ptr _classInit##name##_(void) {    \
+		c_##name.parent = _##_parent;               \
+		c_##name.init   = NULL;                     \
+		return &c_##name;                           \
+	}                                               \
+	static struct class c_##name = {                \
+		CLASS_MAGIC,                                \
+		NULL,                                       \
+		sizeof(struct c_##name),                    \
+		_classInit##name##_,                        \
+		INIT_IFACE_IMPL(__VA_ARGS__)                \
+	}; struct class * const _##name = &c_##name
+
+#define INIT_CLASS(class)			((class)->init? (class)->init() : (class))
+#define GET_CLASS(object)			(INIT_CLASS(*(class_ptr *)((void*)(object) - sizeof(void*))))
+#define IFACE_GET(class,iface)		(interfaceGet(&((class)->impl),(iface)))
+#define HAS_PARENT(class)			(NULL != ((class)->parent) &&  INIT_CLASS((class)->parent))
+
+#define IS_OBJECT(obj)				((GET_CLASS((obj)))->magic == CLASS_MAGIC)
+#define INSTANCE_OF(class,obj)		((GET_CLASS((obj))) == _##class)
+
+/**
+ * \todo actually i use gcc feature ## for variadoc... think about
+ * a way to make this standard.
+ */
+#define _CALL(_class,_iface,method,...)                                         \
+	do {                                                                        \
+		class_ptr class = _class;                                               \
+		iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);             \
+		while ((NULL == iface || NULL == iface->method) && HAS_PARENT(class)) { \
+			class = class->parent;                                              \
+			iface = (struct i_##_iface *)IFACE_GET(class, &i_##_iface);         \
+		}                                                                       \
+		assert(NULL != iface->method);                                          \
+	} while(0)
+
+#define CALL(object,_iface,method,...)                           \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                    \
+	} while(0)
+
+#define RETCALL(object,_iface,method,ret,...)                    \
+	do {                                                         \
+		struct i_##_iface * iface;                               \
+		_CALL(GET_CLASS(object), _iface, method, ##__VA_ARGS__); \
+		ret = iface->method(object, ##__VA_ARGS__);              \
+	} while(0)
+
+#define PARENTCALL(object,_iface,method,...)                    \
+	do {                                                        \
+		struct i_##_iface * iface;                              \
+		class_ptr pc_class = GET_CLASS((object));               \
+		assert(HAS_PARENT(pc_class));                           \
+		_CALL(pc_class->parent, _iface, method, ##__VA_ARGS__); \
+		iface->method(object, ##__VA_ARGS__);                   \
+	} while(0)
+
+
+struct class;
+typedef struct class * class_ptr;
+typedef class_ptr (* fptr_classInit)(void);
+struct class {
+	const int         magic;
+	class_ptr         parent;
+	size_t            object_size;
+	fptr_classInit    init;
+	struct iface_impl impl;
+};
+
+#endif // __CLASS_CLASS_H__
+
+// vim: set ts=4 sw=4:

@@ -8,7 +8,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __INTERFACE_H__
-#define __INTERFACE_H__
+#ifndef __CLASS_INTERFACE_H__
+#define __CLASS_INTERFACE_H__
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
@@ -36,7 +36,7 @@
 	static const struct i_##name i_##name##_impl = {&i_##name,__VA_ARGS__}
 	static const struct i_##name i_##name##_impl = {&i_##name,__VA_ARGS__}
 
 
 #define NUMARGS(...)	(sizeof((const void*[]){__VA_ARGS__})/sizeof(void*))
 #define NUMARGS(...)	(sizeof((const void*[]){__VA_ARGS__})/sizeof(void*))
-#define INIT_IMPL(...)	{NUMARGS(__VA_ARGS__), 0, {__VA_ARGS__}}
+#define INIT_IFACE_IMPL(...)	{NUMARGS(__VA_ARGS__), 0, {__VA_ARGS__}}
 
 
 
 
 struct interface {
 struct interface {
@@ -52,8 +52,8 @@ struct iface_impl {
 };
 };
 typedef struct iface_impl * iface_impl_ptr;
 typedef struct iface_impl * iface_impl_ptr;
 
 
-extern struct interface * interfaceGet(iface_impl_ptr, const iface_ptr);
+extern iface_ptr interfaceGet(iface_impl_ptr, const iface_ptr);
 
 
-#endif // __INTERFACE_H__
+#endif // __CLASS_INTERFACE_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

@@ -7,7 +7,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -23,13 +23,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __INTERFACE_CLASS_H__
-#define __INTERFACE_CLASS_H__
+#ifndef __CLASS_INTERFACE_CLASS_H__
+#define __CLASS_INTERFACE_CLASS_H__
 
 
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "class.h"
-#include "interface.h"
+#include "class/class.h"
+#include "class/interface.h"
 
 
 typedef int  (* fptr_ctor)(void *, va_list *);
 typedef int  (* fptr_ctor)(void *, va_list *);
 typedef void (* fptr_dtor)(void *);
 typedef void (* fptr_dtor)(void *);
@@ -52,6 +52,6 @@ extern void * classClone(void *);
 #define delete(object)		classDelete((void **)&(object))
 #define delete(object)		classDelete((void **)&(object))
 #define clone(object)		classClone((void *)(object))
 #define clone(object)		classClone((void *)(object))
 
 
-#endif // __INTERFACE_CLASS_H__
+#endif // __CLASS_INTERFACE_CLASS_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __COMMONS_H__
 #ifndef __COMMONS_H__
 #define __COMMONS_H__
 #define __COMMONS_H__
 
 

 #ifndef __HASH_H__
 #ifndef __HASH_H__
 #define __HASH_H__
 #define __HASH_H__
 
 
-#include <sys/types.h>
-
-#include "class.h"
-
-
-CLASS(Hash) {
-	void * root;
-};
-
-void * hashAdd(Hash, void *);
-void * hashDelete(Hash, const char *, size_t);
-void * hashGet(Hash, const char *, size_t);
-void   hashEach(Hash, void (*)(const void*));
+#include "hash/hash.h"
+#include "hash/value.h"
+#include "hash/interface/hashable.h"
 
 
 #endif // __HASH_H__
 #endif // __HASH_H__
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __HASH_HASH_H__
+#define __HASH_HASH_H__
+
+#include <sys/types.h>
+
+#include "class.h"
+
+
+CLASS(Hash) {
+	void * root;
+};
+
+void * hashAdd(Hash, void *);
+void * hashDelete(Hash, const char *, size_t);
+void * hashGet(Hash, const char *, size_t);
+void   hashEach(Hash, void (*)(const void*));
+
+#endif // __HASH_HASH_H__
+
+// vim: set ts=4 sw=4:

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __INTERFACE_HASHABLE_H__
-#define __INTERFACE_HASHABLE_H__
+#ifndef __HASH_INTERFACE_HASHABLE_H__
+#define __HASH_INTERFACE_HASHABLE_H__
 
 
-#include "interface.h"
+#include "class.h"
 
 
 typedef unsigned long (* fptr_hashableGetHash)(void *);
 typedef unsigned long (* fptr_hashableGetHash)(void *);
 typedef void          (* fptr_hashableHandleDouble)(void *, void *);
 typedef void          (* fptr_hashableHandleDouble)(void *, void *);
@@ -40,6 +40,6 @@ struct i_Hashable {
 extern unsigned long hashableGetHash(void *);
 extern unsigned long hashableGetHash(void *);
 extern void          hashableHandleDouble(void *, void *);
 extern void          hashableHandleDouble(void *, void *);
 
 
-#endif // __INTERFACE_HASHABLE_H__
+#endif // __HASH_INTERFACE_HASHABLE_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __HASH_VALUE_H__
 #ifndef __HASH_VALUE_H__
 #define __HASH_VALUE_H__
 #define __HASH_VALUE_H__
 
 

+#ifndef __HTTP_H__
+#define __HTTP_H__
+
+#include "http/cookie.h"
+#include "http/header.h"
+#include "http/message.h"
+#include "http/message/queue.h"
+#include "http/request.h"
+#include "http/response.h"
+#include "http/parser.h"
+#include "http/writer.h"
+#include "http/worker.h"
+#include "http/interface/http_intro.h"
+
+#endif // __HTTP_H__
+
+// vim: set ts=4 sw=4:

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __HTTP_COOKIE_H__
 #ifndef __HTTP_COOKIE_H__
 #define __HTTP_COOKIE_H__
 #define __HTTP_COOKIE_H__
 
 

@@ -6,7 +6,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -7,7 +7,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@ CLASS(HttpMessage) {
 	char *          version;
 	char *          version;
 
 
 	Hash            header;
 	Hash            header;
-	Hash            cookies;
 
 
 	HttpMessageType type;
 	HttpMessageType type;
 	Stream          handle;
 	Stream          handle;

@@ -7,7 +7,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,20 +5,20 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * - Copyright (C) 2012  Georg Hopp
- * -
- * - 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/>.
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __HTTP_WRITER_H__
 #ifndef __HTTP_WRITER_H__

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

-/**
- * \file
- * A generic logger class and two extended classes, One that logs to
- * stderr and one that logs to the system syslog.
- *
- * \author	Georg Hopp
- *
- * \copyright
- * Copyright (C) 2012  Georg Hopp
- *
- * 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 __LOGGER_H__
 #ifndef __LOGGER_H__
 #define __LOGGER_H__
 #define __LOGGER_H__
 
 
-#include "class.h"
-
-typedef enum logger_level {
-	LOGGER_DEBUG=0,
-	LOGGER_INFO,
-	LOGGER_NOTICE,
-	LOGGER_WARNING,
-	LOGGER_ERR,
-	LOGGER_CRIT,
-	LOGGER_ALERT,
-	LOGGER_EMERG
-} logger_level;
-
-extern const char * const logger_level_str[];
-
-CLASS(Logger) {
-	logger_level min_level;
-};
-
-CLASS(LoggerStderr) {
-	EXTENDS(Logger);
-};
-
-CLASS(LoggerSyslog) {
-	EXTENDS(Logger);
-};
+#include "logger/logger.h"
+#include "logger/interface/logger.h"
 
 
 #endif // __LOGGER_H__
 #endif // __LOGGER_H__
 
 

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __INTERFACE_LOGGER_H__
-#define __INTERFACE_LOGGER_H__
+#ifndef __LOGGER_INTERFACE_LOGGER_H__
+#define __LOGGER_INTERFACE_LOGGER_H__
 
 
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "interface.h"
+#include "class.h"
 #include "logger.h"
 #include "logger.h"
 
 
 typedef void (* fptr_log)(void *, logger_level, const char * const);
 typedef void (* fptr_log)(void *, logger_level, const char * const);
@@ -40,6 +40,6 @@ struct i_Logger {
 
 
 extern void loggerLog(void *, logger_level, const char * const, ...);
 extern void loggerLog(void *, logger_level, const char * const, ...);
 
 
-#endif // __INTERFACE_LOGGER_H__
+#endif // __LOGGER_INTERFACE_LOGGER_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

+/**
+ * \file
+ * A generic logger class and two extended classes, One that logs to
+ * stderr and one that logs to the system syslog.
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __LOGGER_LOGGER_H__
+#define __LOGGER_LOGGER_H__
+
+#include "class.h"
+
+typedef enum logger_level {
+	LOGGER_DEBUG=0,
+	LOGGER_INFO,
+	LOGGER_NOTICE,
+	LOGGER_WARNING,
+	LOGGER_ERR,
+	LOGGER_CRIT,
+	LOGGER_ALERT,
+	LOGGER_EMERG
+} logger_level;
+
+extern const char * const logger_level_str[];
+
+CLASS(Logger) {
+	logger_level min_level;
+};
+
+CLASS(LoggerStderr) {
+	EXTENDS(Logger);
+};
+
+CLASS(LoggerSyslog) {
+	EXTENDS(Logger);
+};
+
+#endif // __LOGGER_LOGGER_H__
+
+// vim: set ts=4 sw=4:

@@ -7,7 +7,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -6,7 +6,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

 #ifndef __STREAM_H__
 #ifndef __STREAM_H__
 #define __STREAM_H__
 #define __STREAM_H__
 
 
-#include <sys/types.h>
-#include <openssl/ssl.h>
-
-#include "class.h"
-
-typedef enum e_StreamHandleType {
-	STREAM_FD = 0,
-	STREAM_SSL
-} StreamHandleType;
-
-CLASS(Stream) {
-	StreamHandleType type;
-	union {
-		int   fd;
-		SSL * ssl;
-	}              handle;
-};
-
-ssize_t streamRead(Stream, void *, size_t);
-ssize_t streamWrite(Stream, void *, size_t);
+#include "stream/stream.h"
+#include "stream/interface/reader.h"
+#include "stream/interface/writer.h"
 
 
 #endif // __STREAM_H__
 #endif // __STREAM_H__
 
 

@@ -6,7 +6,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __STREAM_READER_H__
-#define __STREAM_READER_H__
+#ifndef __STREAM_INTERFACE_READER_H__
+#define __STREAM_INTERFACE_READER_H__
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
-#include "stream.h"
+#include "stream/stream.h"
 
 
 typedef ssize_t (* fptr_streamReaderRead)(void *, Stream);
 typedef ssize_t (* fptr_streamReaderRead)(void *, Stream);
 
 
@@ -40,6 +40,6 @@ struct i_StreamReader {
 
 
 extern ssize_t streamReaderRead(void *, Stream);
 extern ssize_t streamReaderRead(void *, Stream);
 
 
-#endif // __STREAM_READER_H__
+#endif // __STREAM_INTERFACE_READER_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

@@ -6,7 +6,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#ifndef __STREAM_WRITER_H__
-#define __STREAM_WRITER_H__
+#ifndef __STREAM_INTERFACE_WRITER_H__
+#define __STREAM_INTERFACE_WRITER_H__
 
 
 #include <sys/types.h>
 #include <sys/types.h>
 
 
-#include "stream.h"
+#include "stream/stream.h"
 
 
 typedef ssize_t (* fptr_streamWriterWrite)(void *, Stream);
 typedef ssize_t (* fptr_streamWriterWrite)(void *, Stream);
 
 
@@ -40,6 +40,6 @@ struct i_StreamWriter {
 
 
 extern ssize_t streamWriterWrite(void *, Stream);
 extern ssize_t streamWriterWrite(void *, Stream);
 
 
-#endif // __STREAM_WRITER_H__
+#endif // __STREAM_INTERFACE_WRITER_H__
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __STREAM_STREAM_H__
+#define __STREAM_STREAM_H__
+
+#include <sys/types.h>
+#include <openssl/ssl.h>
+
+#include "class.h"
+
+typedef enum e_StreamHandleType {
+	STREAM_FD = 0,
+	STREAM_SSL
+} StreamHandleType;
+
+CLASS(Stream) {
+	StreamHandleType type;
+	union {
+		int   fd;
+		SSL * ssl;
+	}              handle;
+};
+
+ssize_t streamRead(Stream, void *, size_t);
+ssize_t streamWrite(Stream, void *, size_t);
+
+#endif // __STREAM_STREAM_H__
+
+// vim: set ts=4 sw=4:

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 __UTILS_HTTP_H__
 #ifndef __UTILS_HTTP_H__
 #define __UTILS_HTTP_H__
 #define __UTILS_HTTP_H__
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

 ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = subdir-objects
 
 
-IFACE  = interface/class.c interface/stream_reader.c interface/logger.c \
-	 interface/stream_writer.c interface/http_intro.c \
-	 interface/subject.c interface/observer.c interface.c
-SOCKET = socket.c socket/accept.c socket/connect.c socket/listen.c
-STREAM = stream.c stream/read.c stream/write.c
-HASH   = hash.c hash/add.c hash/get.c hash/delete.c \
-	 hash/each.c interface/hashable.c hash_value.c
-SERVER = server.c server/run.c server/close_conn.c server/poll.c \
-	 server/handle_accept.c server/read.c server/write.c
-LOGGER = logger.c logger/stderr.c logger/syslog.c
-CB     = cbuf.c cbuf/read.c cbuf/write.c \
-	 cbuf/get_line.c cbuf/set_data.c cbuf/get_data.c \
-	 cbuf/addr_index.c cbuf/get_free.c cbuf/get_read.c cbuf/get_write.c \
-	 cbuf/inc_read.c cbuf/inc_write.c cbuf/is_empty.c cbuf/memchr.c \
-	 cbuf/skip_non_alpha.c cbuf/is_locked.c cbuf/lock.c cbuf/release.c \
-	 cbuf/empty.c
-MSG    = http/message.c \
-	 http/message/has_keep_alive.c \
-	 http/message/header_size_get.c \
-	 http/message/header_to_string.c \
-	 http/message/get_version.c \
-	 http/message/has_valid_version.c
-MSGQ   = http/message/queue.c
-REQ    = http/request.c \
-	 http/request/has_valid_method.c
-RESP   = http/response.c \
-	 http/response/304.c \
-	 http/response/404.c \
-	 http/response/403.c \
-	 http/response/login_form.c \
-	 http/response/asset.c \
-	 http/response/randval.c \
-	 http/response/session.c
-PARSER = http/parser.c \
-	 http/parser/parse.c \
-	 http/parser/new_message.c \
-	 http/parser/header.c \
-	 http/parser/body.c \
-	 http/parser/request_vars.c \
-	 http/parser/post_vars.c
-WRITER = http/writer.c \
-	 http/writer/write.c
-WORKER = http/worker.c \
-	 http/worker/process.c \
-	 http/worker/write.c \
-	 http/worker/get_asset.c \
-	 http/worker/add_common_header.c
-HEADER = http/header.c \
-	 http/header/to_string.c
-SESSION = session.c session/add.c session/get.c session/delete.c
-UTILS  = utils/hash.c \
-	 utils/memory.c \
-	 utils/http.c \
-	 utils/daemonize.c \
-	 utils/signalHandling.c
-AUTH   = interface/auth.c auth/ldap.c credential.c
+IFACE = interface/subject.c \
+	interface/observer.c
+UTILS = utils/hash.c \
+	utils/memory.c \
+	utils/http.c \
+	utils/daemonize.c \
+	utils/signalHandling.c
 
 
+LIBS = ./http/libhttp.a \
+       ./auth/libauth.a \
+       ./cbuf/libcbuf.a \
+       ./class/libclass.a \
+       ./hash/libhash.a \
+       ./logger/liblogger.a \
+       ./server/libserver.a \
+       ./session/libsession.a \
+       ./socket/libsocket.a \
+       ./stream/libstream.a
 
 
 AM_CFLAGS = -Wall -I ../include/
 AM_CFLAGS = -Wall -I ../include/
 
 
 bin_PROGRAMS = webgameserver
 bin_PROGRAMS = webgameserver
 
 
-webgameserver_SOURCES = webgameserver.c \
-			$(IFACE) $(SOCKET) $(SERVER) $(LOGGER) $(MSG) $(REQ) \
-			$(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
-			$(UTILS) $(MSGQ) $(SESSION) $(STREAM) $(HASH) $(AUTH)
-webgameserver_CFLAGS  = -Wall -I ../include/
-webgameserver_LDFLAGS = -lrt -lssl -lldap
+webgameserver_SOURCES = webgameserver.c $(IFACE) $(UTILS)
+webgameserver_CFLAGS  = -Wall -I ../include/# $(COVERAGE_CFLAGS)
+webgameserver_LDADD   = $(LIBS) -lrt -lssl -lldap
+#webgameserver_LDFLAGS = $(COVERAGE_LDFLAGS)
+
+SUBDIRS = auth cbuf class hash http logger server session socket stream

+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = libauth.a
+
+libauth_a_SOURCES = interface/auth.c credential.c ldap.c
+libauth_a_CFLAGS  = -Wall -I ../../include/

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdarg.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 
 
-#include "credential.h"
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-
 #include "utils/memory.h"
 #include "utils/memory.h"
 
 
+#include "auth/credential.h"
+
 static
 static
 int
 int
 credentialCtor(void * _this, va_list * params)
 credentialCtor(void * _this, va_list * params)

@@ -20,9 +20,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-#include "auth.h"
-#include "credential.h"
-#include "interface/auth.h"
+#include "auth/auth.h"
+#include "auth/credential.h"
+#include "auth/interface/auth.h"
 
 
 const struct interface i_Auth = {
 const struct interface i_Auth = {
 	"auth",
 	"auth",

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdarg.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdio.h>
 #include <ldap.h>
 #include <ldap.h>
 
 
-#include "auth/ldap.h"
 #include "class.h"
 #include "class.h"
-#include "credential.h"
-#include "interface/class.h"
-#include "interface/auth.h"
-
 #include "utils/memory.h"
 #include "utils/memory.h"
 #include "commons.h"
 #include "commons.h"
 
 
+#include "auth/ldap.h"
+#include "auth/credential.h"
+#include "auth/interface/auth.h"
+
 static
 static
 int
 int
 authLdapCtor(void * _this, va_list * params)
 authLdapCtor(void * _this, va_list * params)

+ACLOCAL_AMFLAGS = -I m4
+
+CB = cbuf.c read.c write.c \
+     get_line.c set_data.c get_data.c \
+     addr_index.c get_free.c get_read.c get_write.c \
+     inc_read.c inc_write.c is_empty.c memchr.c \
+     skip_non_alpha.c is_locked.c lock.c release.c \
+     empty.c
+
+noinst_LIBRARIES = libcbuf.a
+
+libcbuf_a_SOURCES = $(CB)
+libcbuf_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include <fcntl.h>
 #include <fcntl.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 #include "utils/memory.h"
 #include "utils/memory.h"
 
 
 #include "cbuf.h"
 #include "cbuf.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = libclass.a
+
+libclass_a_SOURCES = interface.c interface/i_class.c
+libclass_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdlib.h>
 
 
-#include "interface.h"
+#include "class/interface.h"
 #include "commons.h"
 #include "commons.h"
 
 
 static
 static
@@ -40,25 +40,25 @@ comp(const void * _a, const void * _b)
  * this one is important in selector functions to get the correct interface
  * this one is important in selector functions to get the correct interface
  * implementation of a class.
  * implementation of a class.
  */
  */
-struct interface *
+iface_ptr
 interfaceGet(iface_impl_ptr iface_impl, const iface_ptr _iface)
 interfaceGet(iface_impl_ptr iface_impl, const iface_ptr _iface)
 {
 {
 	const iface_ptr * iface = &_iface;
 	const iface_ptr * iface = &_iface;
-	void *            dummy;
+	iface_ptr *       found;
 
 
     if (! iface_impl->simpl) {
     if (! iface_impl->simpl) {
         qsort((void**)(iface_impl->impl), iface_impl->nimpl, sizeof(iface_ptr), comp);
         qsort((void**)(iface_impl->impl), iface_impl->nimpl, sizeof(iface_ptr), comp);
         iface_impl->simpl=TRUE;
         iface_impl->simpl=TRUE;
     }
     }
 
 
-    dummy = bsearch(
+    found = bsearch(
 			&iface,
 			&iface,
 			iface_impl->impl,
 			iface_impl->impl,
 			iface_impl->nimpl,
 			iface_impl->nimpl,
 			sizeof(iface_ptr),
 			sizeof(iface_ptr),
 			comp);
 			comp);
 
 
-	return dummy? *(struct interface **)dummy : dummy;
+	return found? *found : (iface_ptr)NULL;
 }
 }
 
 
 // vim: set ts=4 sw=4:
 // vim: set ts=4 sw=4:

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <assert.h>
 
 
-#include "class.h"
-#include "interface/class.h"
+#include "class/class.h"
+#include "class/interface/class.h"
 
 
 const
 const
 struct interface i_Class = {
 struct interface i_Class = {
@@ -40,8 +40,6 @@ classNew(class_ptr class, ...)
 	va_list params;
 	va_list params;
 	int     ret;
 	int     ret;
 
 
-	if (class->init)	class->init();
-
 	* (class_ptr *)object = class;
 	* (class_ptr *)object = class;
 	object += sizeof(void*);
 	object += sizeof(void*);
 
 

+ACLOCAL_AMFLAGS = -I m4
+
+HASH = hash.c add.c get.c delete.c each.c value.c \
+       interface/hashable.c
+
+noinst_LIBRARIES = libhash.a
+
+libhash_a_SOURCES = $(HASH)
+libhash_a_CFLAGS  = -Wall -I ../../include/

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 
 
 #include "hash.h"
 #include "hash.h"
-#include "interface/hashable.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 static
 static
 inline
 inline

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "hash.h"
 #include "hash.h"
-#include "interface/hashable.h"
 #include "utils/hash.h"
 #include "utils/hash.h"
 
 
 static
 static

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 
 
 #include "hash.h"
 #include "hash.h"

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "hash.h"
 #include "hash.h"
-#include "interface/hashable.h"
 #include "utils/hash.h"
 #include "utils/hash.h"
 
 
 static
 static

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 _GNU_SOURCE
 #define _GNU_SOURCE
 
 
 #include <search.h>
 #include <search.h>
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "hash.h"
+#include "hash/hash.h"
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 static
 static
 int
 int

@@ -25,7 +25,7 @@
 #include <stdarg.h>
 #include <stdarg.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/hashable.h"
+#include "hash/interface/hashable.h"
 
 
 const struct interface i_Hashable = {
 const struct interface i_Hashable = {
 	"hashable",
 	"hashable",

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdarg.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
-#include "hash_value.h"
+#include "class.h"
 #include "utils/hash.h"
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "utils/memory.h"
 #include "commons.h"
 #include "commons.h"
-#include "interface/class.h"
-#include "interface/hashable.h"
+
+#include "hash/value.h"
+#include "hash/interface/hashable.h"
 
 
 static
 static
 int
 int

+ACLOCAL_AMFLAGS = -I m4
+
+MSG    = message.c \
+	 message/has_keep_alive.c \
+	 message/header_size_get.c \
+	 message/header_to_string.c \
+	 message/get_version.c \
+	 message/has_valid_version.c
+MSGQ   = message/queue.c
+REQ    = request.c \
+	 request/has_valid_method.c
+RESP   = response.c \
+	 response/304.c \
+	 response/404.c \
+	 response/403.c \
+	 response/login_form.c \
+	 response/asset.c \
+	 response/randval.c \
+	 response/session.c
+PARSER = parser.c \
+	 parser/parse.c \
+	 parser/new_message.c \
+	 parser/p_header.c \
+	 parser/p_body.c \
+	 parser/p_request_vars.c \
+	 parser/p_post_vars.c
+WRITER = writer.c \
+	 writer/write.c
+WORKER = worker.c \
+	 worker/process.c \
+	 worker/answer.c \
+	 worker/get_asset.c \
+	 worker/add_common_header.c
+HEADER = header.c \
+	 header/to_string.c
+
+noinst_LIBRARIES = libhttp.a
+
+libhttp_a_SOURCES = $(MSG) $(MSGQ) $(REQ) $(RESP) $(PARSER) $(WRITER) \
+		    $(WORKER) $(HEADER) interface/i_http_intro.c
+libhttp_a_CFLAGS  = -Wall -I ../../include/

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
-#include "cookie.h"
-#include "interface/class.h"
-#include "interface/hashable"
+#include "class.h"
+#include "hash.h"
+#include "http/cookie.h"
 
 
 #include "utils/hash.h"
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "utils/memory.h"

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -25,9 +25,8 @@
 #include <string.h>
 #include <string.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
+#include "hash.h"
 #include "http/header.h"
 #include "http/header.h"
-#include "interface/hashable.h"
 
 
 #include "utils/hash.h"
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "utils/memory.h"

@@ -5,7 +5,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -21,7 +21,7 @@
  */
  */
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/http_intro.h"
+#include "http/interface/http_intro.h"
 
 
 const struct interface i_HttpIntro = {
 const struct interface i_HttpIntro = {
 	"httpIntro",
 	"httpIntro",

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <unistd.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 #include "hash.h"
 #include "hash.h"
 #include "http/message.h"
 #include "http/message.h"
 #include "utils/memory.h"
 #include "utils/memory.h"
@@ -47,8 +46,7 @@ httpMessageCtor(void * _this, va_list * params)
 	this->version = calloc(1, strlen(version)+1);
 	this->version = calloc(1, strlen(version)+1);
 	strcpy(this->version, version);
 	strcpy(this->version, version);
 
 
-	this->header  = new(Hash);
-	this->cookies = new(Hash);
+	this->header = new(Hash);
 
 
 	return 0;
 	return 0;
 }
 }
@@ -60,7 +58,6 @@ httpMessageDtor(void * _this)
 	HttpMessage this = _this;
 	HttpMessage this = _this;
 
 
 	delete(this->header);
 	delete(this->header);
-	delete(this->cookies);
 
 
 	FREE(this->version);
 	FREE(this->version);
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "http/message.h"
 #include "http/message.h"
 #include "http/response.h"
 #include "http/response.h"
 #include "http/header.h"
 #include "http/header.h"
-#include "interface/http_intro.h"
+#include "http/interface/http_intro.h"
 #include "hash.h"
 #include "hash.h"
 
 
 static size_t size;
 static size_t size;

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/header.h"
 #include "http/header.h"
-#include "interface/http_intro.h"
+#include "http/interface/http_intro.h"
 #include "hash.h"
 #include "hash.h"
 
 
 static char * string;
 static char * string;

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #include <stdarg.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/message/queue.h"
 #include "http/message/queue.h"
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,7 @@
 #include <stdarg.h>
 #include <stdarg.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "interface/stream_reader.h"
+#include "stream.h"
 
 
 #include "http/parser.h"
 #include "http/parser.h"
 #include "http/message/queue.h"
 #include "http/message/queue.h"

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 "http/parser.h"
 #include "http/parser.h"
 
 
 #include "utils/http.h"
 #include "utils/http.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -25,13 +25,11 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 #include "http/header.h"
 #include "http/header.h"
 #include "http/parser.h"
 #include "http/parser.h"
 #include "http/message.h"
 #include "http/message.h"
 #include "http/request.h"
 #include "http/request.h"
 #include "hash.h"
 #include "hash.h"
-#include "hash_value.h"
 
 
 #define MAX(x,y)    ((x) > (y) ? (x) : (y))
 #define MAX(x,y)    ((x) > (y) ? (x) : (y))
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <string.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "http/parser.h"
 #include "http/parser.h"
 #include "http/request.h"
 #include "http/request.h"
-#include "hash_value.h"
 #include "hash.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 /**
 /**
  * \todo this is very similar to other pair parsing
  * \todo this is very similar to other pair parsing

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "http/parser.h"
 #include "http/parser.h"
 #include "http/request.h"
 #include "http/request.h"
-#include "hash_value.h"
 #include "hash.h"
 #include "hash.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 void
 void
 httpParserRequestVars(HttpParser this)
 httpParserRequestVars(HttpParser this)

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,13 +22,14 @@
 
 
 #include <stdlib.h>
 #include <stdlib.h>
 
 
-#include "http/parser.h"
-#include "http/header.h"
-#include "interface/class.h"
-#include "interface/http_intro.h"
+#include "class.h"
 #include "cbuf.h"
 #include "cbuf.h"
 #include "stream.h"
 #include "stream.h"
 
 
+#include "http/parser.h"
+#include "http/header.h"
+#include "http/interface/http_intro.h"
+
 #include "utils/memory.h"
 #include "utils/memory.h"
 #include "commons.h"
 #include "commons.h"
 
 
@@ -166,16 +167,16 @@ httpParserParse(void * _this, Stream st)
 						httpParserPostVars(this);
 						httpParserPostVars(this);
 					}
 					}
 
 
-					/**
-					 * enqueue current request
-					 */
-					this->queue->msgs[(this->queue->nmsgs)++] = this->current;
-					this->current                             = NULL;
+				/**
+				 * enqueue current request
+				 */
+				this->queue->msgs[(this->queue->nmsgs)++] = this->current;
+				this->current                             = NULL;
 
 
-					/**
-					 * prepare for next request
-					 */
-					this->state = HTTP_MESSAGE_GARBAGE;
+				/**
+				 * prepare for next request
+				 */
+				this->state = HTTP_MESSAGE_GARBAGE;
 				}
 				}
 				break;
 				break;
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "interface/http_intro.h"
+#include "hash.h"
+#include "http/interface/http_intro.h"
 
 
 #include "http/request.h"
 #include "http/request.h"
 #include "utils/memory.h"
 #include "utils/memory.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,10 @@
 #include <stdio.h>
 #include <stdio.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "interface/http_intro.h"
+#include "utils/memory.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
-#include "utils/memory.h"
+#include "http/interface/http_intro.h"
 
 
 
 
 static
 static

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 #include "stream.h"
 #include "stream.h"
 
 
 #include "http/response.h"
 #include "http/response.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/response.h"
 #include "http/response.h"
 #include "http/message.h"
 #include "http/message.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -34,10 +34,6 @@
 #include "http/parser.h"
 #include "http/parser.h"
 #include "http/writer.h"
 #include "http/writer.h"
 
 
-#include "interface/class.h"
-#include "interface/stream_reader.h"
-#include "interface/stream_writer.h"
-
 #include "utils/memory.h"
 #include "utils/memory.h"
 
 
 static
 static
@@ -63,7 +59,6 @@ httpWorkerCtor(void * _this, va_list * params)
 	this->writer = new(HttpWriter, this->wbuf);
 	this->writer = new(HttpWriter, this->wbuf);
 
 
 	this->sroot  = &(this->session);
 	this->sroot  = &(this->session);
-
 	this->auth   = va_arg(* params, void *);
 	this->auth   = va_arg(* params, void *);
 
 
 	return 0;
 	return 0;

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <time.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "http/message.h"
 #include "http/message.h"
 #include "http/header.h"
 #include "http/header.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <sys/types.h>
 #include <sys/types.h>
 
 
 #include "http/header.h"
 #include "http/header.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +28,7 @@
 #include <sys/time.h>
 #include <sys/time.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "interface/auth.h"
+#include "auth.h"
 
 
 #include "http/worker.h"
 #include "http/worker.h"
 #include "http/header.h"
 #include "http/header.h"
@@ -40,9 +39,7 @@
 #include "http/parser.h"
 #include "http/parser.h"
 #include "session.h"
 #include "session.h"
 #include "stream.h"
 #include "stream.h"
-#include "hash_value.h"
 #include "hash.h"
 #include "hash.h"
-#include "credential.h"
 
 
 #include "utils/memory.h"
 #include "utils/memory.h"
 #include "hash.h"
 #include "hash.h"
@@ -79,11 +76,11 @@ httpWorkerProcess(HttpWorker this, Stream st)
 			if (NULL == this->session) {
 			if (NULL == this->session) {
 				HashValue sidstr = hashGet(request->cookies, CSTRA("sid"));
 				HashValue sidstr = hashGet(request->cookies, CSTRA("sid"));
 
 
-				if (NULL != sidstr) {
-					unsigned long sid;
+					if (NULL != sidstr) {
+						unsigned long sid;
 
 
 					sid = strtoul((char*)(sidstr->value), NULL, 10);
 					sid = strtoul((char*)(sidstr->value), NULL, 10);
-					this->session = sessionGet(this->sroot, sid);
+						this->session = sessionGet(this->sroot, sid);
 				}
 				}
 			}
 			}
 
 
@@ -130,8 +127,8 @@ httpWorkerProcess(HttpWorker this, Stream st)
 							response = new(HttpResponse, "HTTP/1.1", 403, "Forbidden");
 							response = new(HttpResponse, "HTTP/1.1", 403, "Forbidden");
 						} else {
 						} else {
 							if (NULL == this->session) {
 							if (NULL == this->session) {
-								this->session = sessionAdd(
-										this->sroot,
+					this->session = sessionAdd(
+							this->sroot,
 										new(Session,
 										new(Session,
 											username->value,
 											username->value,
 											username->nvalue));
 											username->nvalue));

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +23,7 @@
 #include <stdarg.h>
 #include <stdarg.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "interface/stream_writer.h"
+#include "stream.h"
 
 
 #include "http/message/queue.h"
 #include "http/message/queue.h"
 #include "http/writer.h"
 #include "http/writer.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include <sys/stat.h>
 #include <sys/stat.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 #include "http/message.h"
 #include "http/message.h"
 #include "http/writer.h"
 #include "http/writer.h"
 #include "cbuf.h"
 #include "cbuf.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = liblogger.a
+
+liblogger_a_SOURCES = interface/i_logger.c logger.c stderr.c syslog.c
+liblogger_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "logger.h"
-#include "interface/logger.h"
+#include "logger/logger.h"
+#include "logger/interface/logger.h"
 
 
 const struct interface i_Logger = {
 const struct interface i_Logger = {
 	"logger",
 	"logger",

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,9 +22,9 @@
 
 
 #include <stdarg.h>
 #include <stdarg.h>
 
 
-#include "logger.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
+#include "logger/logger.h"
+#include "logger/interface/logger.h"
 
 
 const
 const
 char * const
 char * const

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 
 
 #include <stdio.h>
 #include <stdio.h>
 
 
-#include "logger.h"
-#include "interface/logger.h"
+#include "logger/logger.h"
+#include "logger/interface/logger.h"
 
 
 static
 static
 void
 void

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 
 
 #include <syslog.h>
 #include <syslog.h>
 
 
-#include "logger.h"
-#include "interface/logger.h"
+#include "logger/logger.h"
+#include "logger/interface/logger.h"
 
 
 static
 static
 const
 const

+ACLOCAL_AMFLAGS = -I m4
+
+SERVER = server.c run.c close_conn.c poll.c \
+	 handle_accept.c read.c write.c
+
+noinst_LIBRARIES = libserver.a
+
+libserver_a_SOURCES = $(SERVER)
+libserver_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <string.h>
 
 
 #include "server.h"
 #include "server.h"
-#include "interface/class.h"
+#include "class.h"
 #include "stream.h"
 #include "stream.h"
 
 
 void
 void

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -28,15 +28,15 @@
 
 
 #include "http/worker.h"
 #include "http/worker.h"
 #include "server.h"
 #include "server.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
+#include "logger.h"
 #include "stream.h"
 #include "stream.h"
 
 
 int
 int
 serverHandleAccept(Server this, unsigned int i)
 serverHandleAccept(Server this, unsigned int i)
 {
 {
 	char   remoteAddr[16] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 	char   remoteAddr[16] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-	Sock   acc            = NULL;
+	Sock   acc = NULL;
 	Stream st;
 	Stream st;
 
 
 	if (this->nfds >= this->max_fds) {
 	if (this->nfds >= this->max_fds) {
@@ -46,25 +46,25 @@ serverHandleAccept(Server this, unsigned int i)
 	acc = socketAccept((0 == i)? this->sock : this->sockSSL, &remoteAddr);
 	acc = socketAccept((0 == i)? this->sock : this->sockSSL, &remoteAddr);
 
 
 	if (-1 != acc->handle) {
 	if (-1 != acc->handle) {
-		switch(i) {
-			case 0:
-				// no SSL
-				st = new(Stream, STREAM_FD, acc->handle);
-				break;
-
-			case 1:
-				// SSL
-				{
-					SSL * ssl = SSL_new(this->ctx);
-					SSL_set_fd(ssl, acc->handle);
-					SSL_accept(ssl);
-					st = new(Stream, STREAM_SSL, ssl);
-				}
-				break;
-
-			default:
-				break;
-		}
+	switch(i) {
+		case 0:
+			// no SSL
+			st = new(Stream, STREAM_FD, acc->handle);
+			break;
+
+		case 1:
+			// SSL
+			{
+				SSL * ssl = SSL_new(this->ctx);
+				SSL_set_fd(ssl, acc->handle);
+				SSL_accept(ssl);
+				st = new(Stream, STREAM_SSL, ssl);
+			}
+			break;
+
+		default:
+			break;
+	}
 
 
 		// save the socket handle
 		// save the socket handle
 		(this->conns)[acc->handle].sock   = acc; 
 		(this->conns)[acc->handle].sock   = acc; 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <errno.h>
 
 
 #include "server.h"
 #include "server.h"
-#include "interface/logger.h"
+#include "logger.h"
 
 
 #include "utils/signalHandling.h"
 #include "utils/signalHandling.h"
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
  */
  */
 
 
 #include "server.h"
 #include "server.h"
-#include "interface/logger.h"
-#include "interface/stream_reader.h"
+#include "logger.h"
+#include "stream.h"
 
 
 void    serverCloseConn(Server, unsigned int);
 void    serverCloseConn(Server, unsigned int);
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  */
  */
 
 
 #include "server.h"
 #include "server.h"
-#include "interface/logger.h"
+#include "logger.h"
 
 
 #include "utils/signalHandling.h"
 #include "utils/signalHandling.h"
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
 #include "server.h"
 #include "server.h"
 #include "socket.h"
 #include "socket.h"
 #include "logger.h"
 #include "logger.h"
-#include "interface/class.h"
 
 
 #include "utils/memory.h"
 #include "utils/memory.h"
 
 

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
  */
  */
 
 
 #include "server.h"
 #include "server.h"
-#include "interface/logger.h"
-#include "interface/stream_writer.h"
+#include "logger.h"
+#include "stream.h"
 
 
 void serverCloseConn(Server, unsigned int);
 void serverCloseConn(Server, unsigned int);
 
 

+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = libsession.a
+
+libsession_a_SOURCES = session.c add.c get.c delete.c
+libsession_a_CFLAGS  = -Wall -I ../../include/

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 
 
 #include "session.h"
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 
 
 static
 static

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 
 
 #include "session.h"
 #include "session.h"
-#include "interface/class.h"
+#include "class.h"
 
 
 
 
 static
 static

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <search.h>
 #include <search.h>
 #include <time.h>
 #include <time.h>
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <time.h>
 #include <time.h>
 #include <stdarg.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdlib.h>
@@ -7,7 +29,6 @@
 
 
 #include "session.h"
 #include "session.h"
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
 
 
 #include "utils/hash.h"
 #include "utils/hash.h"
 #include "utils/memory.h"
 #include "utils/memory.h"

+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = libsocket.a
+
+libsocket_a_SOURCES = socket.c accept.c connect.c listen.c
+libsocket_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <unistd.h>
 
 
 #include "socket.h"
 #include "socket.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
+#include "logger.h"
 
 
 Sock
 Sock
 socketAccept(Sock this, char (*remoteAddr)[16])
 socketAccept(Sock this, char (*remoteAddr)[16])

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include <errno.h>      // for errno
 #include <errno.h>      // for errno
 
 
 #include "socket.h"
 #include "socket.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
+#include "logger.h"
 
 
 
 
 void
 void

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@
 #include <errno.h>      // for errno
 #include <errno.h>      // for errno
 
 
 #include "socket.h"
 #include "socket.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
+#include "logger.h"
 
 
 
 
 void
 void

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,7 @@
 
 
 #include "socket.h"
 #include "socket.h"
 #include "logger.h"
 #include "logger.h"
-#include "interface/class.h"
-#include "interface/logger.h"
+#include "class.h"
 
 
 static
 static
 int
 int

+ACLOCAL_AMFLAGS = -I m4
+
+STREAM = stream.c read.c write.c
+IFACE  = interface/reader.c \
+	 interface/writer.c
+
+noinst_LIBRARIES = libstream.a
+
+libstream_a_SOURCES = $(STREAM) $(IFACE)
+libstream_a_CFLAGS  = -Wall -I ../../include/

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
  */
  */
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/stream_reader.h"
-#include "stream.h"
+
+#include "stream/stream.h"
+#include "stream/interface/reader.h"
 
 
 const struct interface i_StreamReader = {
 const struct interface i_StreamReader = {
 	"streamReader",
 	"streamReader",

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
  */
  */
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/stream_writer.h"
-#include "stream.h"
+
+#include "stream/stream.h"
+#include "stream/interface/writer.h"
 
 
 const struct interface i_StreamWriter = {
 const struct interface i_StreamWriter = {
 	"streamWriter",
 	"streamWriter",

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <openssl/ssl.h>
 #include <openssl/ssl.h>
 #include <unistd.h>
 #include <unistd.h>
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdarg.h>
 #include <stdarg.h>
 #include <openssl/ssl.h>
 #include <openssl/ssl.h>
 
 
 #include "class.h"
 #include "class.h"
-#include "interface/class.h"
-#include "stream.h"
+#include "stream/stream.h"
 
 
 
 
 static
 static

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <openssl/ssl.h>
 #include <openssl/ssl.h>
 #include <unistd.h>
 #include <unistd.h>
 
 

@@ -6,7 +6,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ * \author	Unknown (find out)
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <ctype.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/types.h>
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdlib.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/types.h>
 #include <string.h>
 #include <string.h>
@@ -6,7 +28,7 @@
 #include "http/request.h"
 #include "http/request.h"
 #include "http/response.h"
 #include "http/response.h"
 
 
-#include "interface/class.h"
+#include "class.h"
 
 
 #include "commons.h"
 #include "commons.h"
 
 

+/**
+ * \file
+ *
+ * \author	Georg Hopp
+ *
+ * \copyright
+ * Copyright © 2012  Georg Hopp
+ *
+ * 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 <stdlib.h>
 #include <stdlib.h>
 
 
 #include "utils/memory.h"
 #include "utils/memory.h"

@@ -4,7 +4,7 @@
  * \author	Georg Hopp
  * \author	Georg Hopp
  *
  *
  * \copyright
  * \copyright
- * Copyright (C) 2012  Georg Hopp
+ * Copyright © 2012  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU General Public License as published by

 ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = subdir-objects
 
 
 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet
 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet
-TESTS = cclassTest loggerTest socketTest serverTest
-check_PROGRAMS = cclassTest loggerTest socketTest serverTest
+TESTS = classTest loggerTest socketTest serverTest
+check_PROGRAMS = classTest loggerTest socketTest serverTest
 
 
-COMMON = runtest.c ../src/interface/class.c
-CCLASS = $(COMMON) mock/class.c
-LOGGER = $(COMMON) ../src/logger.c ../src/interface/logger.c \
-	 ../src/logger/stderr.c ../src/logger/syslog.c
-SOCKET = $(LOGGER) ../src/socket.c ../src/socket/listen.c \
-	 ../src/socket/accept.c ../src/socket/connect.c
-SERVER = $(SOCKET) ../src/server.c ../src/server/run.c \
-	 ../src/server/close_conn.c ../src/utils/signalHandling.c
+COMMON = runtest.c
+CLASS  = $(COMMON) \
+	 ../src/class/interface.c \
+	 ../src/class/interface/i_class.c \
+	 mock/mock_class.c
 
 
-cclassTest_SOURCES = $(CCLASS) cclassTest.c
-cclassTest_CFLAGS  = -Wall -ggdb -O0 -finline-functions -I ../include -I .. -I .
+LOGGER = $(CLASS) \
+	 ../src/logger/logger.c \
+	 ../src/logger/stderr.c \
+	 ../src/logger/syslog.c \
+	 ../src/logger/interface/i_logger.c \
+	 mock/mock_logger.c
+
+SOCKET = $(LOGGER) \
+	 ../src/socket/socket.c \
+	 ../src/socket/listen.c \
+	 ../src/socket/accept.c \
+	 ../src/socket/connect.c
+
+STREAM_OBJ = ./stream/stream.o \
+	     ./stream/read.o \
+	     ./stream/write.o \
+	     ./stream/reader.o \
+	     ./stream/writer.o
+
+SERVER = $(SOCKET) \
+	 ../src/server/server.c \
+	 ../src/server/run.c \
+	 ../src/server/close_conn.c \
+	 ../src/server/handle_accept.c \
+	 ../src/server/poll.c \
+	 ../src/server/read.c \
+	 ../src/server/write.c \
+	 ../src/utils/signalHandling.c \
+	 ../src/utils/memory.c \
+	 mock/mock_worker.c
+
+classTest_SOURCES = $(CLASS) classTest.c
+classTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I .
+classTest_LDFLAGS = -lgcov
 
 
 loggerTest_SOURCES = $(LOGGER) loggerTest.c
 loggerTest_SOURCES = $(LOGGER) loggerTest.c
-loggerTest_CFLAGS  = -Wall -ggdb -O0 -I ../include -I .. -I .
+loggerTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I .
+loggerTest_LDFLAGS = -lgcov
 
 
 socketTest_SOURCES = $(SOCKET) socketTest.c
 socketTest_SOURCES = $(SOCKET) socketTest.c
-socketTest_CFLAGS  = -Wall -ggdb -O0 -I ../include -I .. -I .
+socketTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I .
+socketTest_LDFLAGS = -lgcov
 
 
 serverTest_SOURCES = $(SERVER) serverTest.c
 serverTest_SOURCES = $(SERVER) serverTest.c
-serverTest_CFLAGS  = -Wall -ggdb -O0 -I ../include -I .. -I .
+serverTest_CFLAGS  = -Wall -ggdb -O0 -fprofile-arcs -ftest-coverage -I ../include -I .. -I .
+serverTest_LDFLAGS = $(STREAM_OBJ) -lgcov
+
+EXTRA_DIST = runtest.h mock/mock_class.h mock/mock_logger.h
+
+.PHONY: stream
+stream:
+	$(MAKE) -C stream $(AM_MAKEFLAGS)
+
+$(check_PROGRAMS): stream
+check-build: $(check_PROGRAMS)
+
+all-local: stream
 
 
-EXTRA_DIST = runtest.h mock/class.h
+SUBDIRS = stream

@@ -18,15 +18,15 @@
  */
  */
 #include <stdio.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/types.h>
-#include <json/json.h>
 
 
 #include "runtest.h"
 #include "runtest.h"
-#include "mock/class.h"
-#include "cclass.h"
+#include "mock/mock_class.h"
+
+#include "class.h"
 
 
 const char testname[] = "cclassTest";
 const char testname[] = "cclassTest";
 
 
-MOCK_CLASS mock = NULL;
+MockClass mock = NULL;
 
 
 static
 static
 int
 int
@@ -45,7 +45,7 @@ __tearDown()
 {
 {
     if (NULL != mock) {
     if (NULL != mock) {
         ASSERT_OBJECT(mock);
         ASSERT_OBJECT(mock);
-        delete(&mock);
+        delete(mock);
     }
     }
 
 
     return TEST_OK;
     return TEST_OK;
@@ -56,27 +56,22 @@ static
 int
 int
 testNew(void)
 testNew(void)
 {
 {
-    mock = new(MOCK_CLASS, 123);
+    mock = new(MockClass, 123);
 
 
     ASSERT_OBJECT_NOT_NULL(mock);
     ASSERT_OBJECT_NOT_NULL(mock);
     ASSERT_EQUAL(1, _called);
     ASSERT_EQUAL(1, _called);
-    ASSERT_EQUAL(123, mock_class_getValue(mock));
+    ASSERT_EQUAL(123, mock->value);
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
 
 
 static
 static
 int
 int
-testNewFromJson(void)
+testNewFail(void)
 {
 {
-    struct json_object * json = json_object_new_int(123);
-
-    mock = newFromJson(MOCK_CLASS, json);
-    json_object_put(json);
+    mock = new(MockClass, 321);
 
 
-    ASSERT_OBJECT_NOT_NULL(mock);
-    ASSERT_EQUAL(1, _called);
-    ASSERT_EQUAL(123, mock_class_getValue(mock));
+    ASSERT_NULL(mock);
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
@@ -85,12 +80,12 @@ static
 int
 int
 testDelete(void)
 testDelete(void)
 {
 {
-    mock = new(MOCK_CLASS, 123);
+    mock = new(MockClass, 123);
 
 
     ASSERT_NOT_NULL(mock);
     ASSERT_NOT_NULL(mock);
 
 
     _reset();
     _reset();
-    delete(&mock);
+    delete(mock);
 
 
     ASSERT_NULL(mock);
     ASSERT_NULL(mock);
     ASSERT_EQUAL(1, _called);
     ASSERT_EQUAL(1, _called);
@@ -100,31 +95,26 @@ testDelete(void)
 
 
 static
 static
 int
 int
-testToJson(void)
+testClone(void)
 {
 {
-    struct json_object * json = NULL;
-    mock = new(MOCK_CLASS, 123);
-    int value;
-
-    _reset();
-    toJson(mock, &json);
+    MockClass clone;
 
 
-    ASSERT_NOT_NULL(json);
+    mock  = new(MockClass, 123);
+    clone = clone(mock);
 
 
-    value = json_object_get_int(json);
-    json_object_put(json);
+    ASSERT_INSTANCE_OF(MockClass, clone);
+    ASSERT_EQUAL(mock->value, clone->value);
 
 
-    ASSERT_EQUAL(123, value);
-    ASSERT_EQUAL(1, _called);
+    delete(clone);
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
 
 
 const testfunc tests[] = {
 const testfunc tests[] = {
     testNew,
     testNew,
-    testNewFromJson,
+    testNewFail,
     testDelete,
     testDelete,
-    testToJson
+    testClone
 };
 };
 const size_t count = FUNCS_COUNT(tests);
 const size_t count = FUNCS_COUNT(tests);
 
 

@@ -21,73 +21,94 @@
 #include <stdlib.h>
 #include <stdlib.h>
 
 
 #include "runtest.h"
 #include "runtest.h"
-#include "cclass.h"
+#include "class.h"
 #include "logger.h"
 #include "logger.h"
+#include "mock/mock_logger.h"
 
 
 
 
-int    level  = -1;
-char * msg    = NULL;
+const char testname[] = "loggerTest";
+Logger logger = NULL;
+
 
 
-static void
-logfnct_mock(int _level, const char * _msg)
+static
+int
+__setUp()
 {
 {
-    level = _level;
-    msg   = malloc(strlen(_msg) + 1);
-    strcpy(msg, _msg);
+    return TEST_OK;
 }
 }
+int (* const setUp)() = __setUp;
 
 
-const char testname[] = "loggerTest";
-LOGGER logger = NULL;
+static
+int
+__tearDown()
+{
+    if (NULL != logger) {
+        ASSERT_OBJECT(logger);
+        delete(logger);
+    }
 
 
+    return TEST_OK;
+}
+int (* const tearDown)() = __tearDown;
 
 
 static
 static
 int
 int
-__setUp()
+testLoggerLevel()
 {
 {
-    logger = new(LOGGER, NULL);
+    logger = new(MockLogger, LOGGER_ERR);
 
 
-    ASSERT_INSTANCE_OF(LOGGER, logger);
+    ASSERT_INSTANCE_OF(MockLogger, logger);
+    ASSERT_EQUAL(LOGGER_ERR, logger->min_level);
 
 
-    logger_add(logger, logfnct_mock);
+    loggerLog(logger, LOGGER_WARNING, "foo %d %s", 123, "bar");
+
+    ASSERT_STRING_EQUAL("", ((MockLogger)logger)->message);
+
+    loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
+    ASSERT_STRING_EQUAL("[ERR] foo 123 bar", ((MockLogger)logger)->message);
+
+    mockLoggerCleanMsg((MockLogger)logger);
+    loggerLog(logger, LOGGER_CRIT, "foo %d %s", 123, "bar");
+    ASSERT_STRING_EQUAL("[CRIT] foo 123 bar", ((MockLogger)logger)->message);
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
-int (* const setUp)() = __setUp;
 
 
 static
 static
 int
 int
-__tearDown()
+testLoggerStderr()
 {
 {
-    level = -1;
+    logger = new(LoggerStderr, LOGGER_ERR);
 
 
-    if (NULL != msg) {
-        free(msg);
-        msg = NULL;
-    }
+    freopen("/dev/null", "w", stderr);
+    loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
 
 
-    if (NULL != logger) {
-        ASSERT_OBJECT(logger);
-        delete(&logger);
-    }
+    /**
+     * \todo think about a way to assert something here
+     */
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
-int (* const tearDown)() = __tearDown;
 
 
 static
 static
 int
 int
-testLogger()
+testLoggerSyslog()
 {
 {
-    logger_log(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
+    logger = new(LoggerSyslog, LOGGER_ERR);
+
+    loggerLog(logger, LOGGER_ERR, "foo %d %s", 123, "bar");
 
 
-    ASSERT_EQUAL(LOGGER_ERR, level);
-    ASSERT_STRING_EQUAL("foo 123 bar", msg);
+    /**
+     * \todo think about a way to assert something here
+     */
 
 
     return TEST_OK;
     return TEST_OK;
 }
 }
 
 
 const testfunc tests[] = {
 const testfunc tests[] = {
-    testLogger
+    testLoggerLevel,
+    testLoggerStderr,
+    testLoggerSyslog
 };
 };
 const size_t count = FUNCS_COUNT(tests);
 const size_t count = FUNCS_COUNT(tests);
 
 

@@ -18,71 +18,55 @@
  */
  */
 
 
 #include <assert.h>
 #include <assert.h>
-#include <json/json.h>
+#include <stdarg.h>
 
 
-#include "cclass.h"
 #include "class.h"
 #include "class.h"
+#include "mock_class.h"
 
 
 char _called;
 char _called;
 
 
-INIT_CLASS(MOCK_CLASS);
-
-__construct(MOCK_CLASS)
+void
+_reset()
 {
 {
-    _called = 1;
-    this->value = va_arg(* params, int);
+    _called = 0;
 }
 }
 
 
-__jsonConst(MOCK_CLASS)
+static
+inline
+int
+mockCtor(void * _this, va_list * params)
 {
 {
-    _called = 1;
-    assert(json_type_int == json_object_get_type(json));
+    MockClass this = _this;
 
 
-    this->value = json_object_get_int(json);
-}
+    _called = 1;
+    this->value = va_arg(* params, int);
 
 
-__clear(MOCK_CLASS) {}
+    if (321 == this->value)
+        return -1;
 
 
-__destruct(MOCK_CLASS)
-{
-    _called = 1;
+    return 0;
 }
 }
 
 
-__toJson(MOCK_CLASS)
+static
+inline
+void
+mockDtor(void * _this)
 {
 {
-    *json   = json_object_new_int(this->value);
     _called = 1;
     _called = 1;
 }
 }
 
 
-/**
- * ~~~ method implementations ~~~~~~~~
- */
-
-int
-mock_class_getValue(MOCK_CLASS this)
-{
-    return this->value;
-}
-
+static
+inline
 void
 void
-mock_class_setValue(MOCK_CLASS this, int value)
+mockClone(void * _this, void * _base)
 {
 {
-    this->value = value;
-}
+    MockClass this = _this;
+    MockClass base = _base;
 
 
-/**
- * ~~~ helper for mock assertions ~~~~~~~~
- */
-void *
-getConstruct()
-{
-    return __construct;
+    this->value = base->value;
 }
 }
 
 
-void *
-getJsonConst()
-{
-    return __jsonConst;
-}
+INIT_IFACE(Class, mockCtor, mockDtor, mockClone);
+CREATE_CLASS(MockClass, NULL, IFACE(Class));
 
 
 // vim: set et ts=4 sw=4:
 // vim: set et ts=4 sw=4:

 /**
 /**
  * \file
  * \file
  * mock/class.h: definitions for my mock to test my oop stuff
  * mock/class.h: definitions for my mock to test my oop stuff
+ *
+ * \author Georg Hopp <georg@steffers.org>
+ *
+ * \copyright
  * Copyright (C) 2011  Georg Hopp
  * Copyright (C) 2011  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * This program is free software: you can redistribute it and/or modify
@@ -16,25 +20,20 @@
  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
-#ifndef __MOCK_CLASS_H__
-#define __MOCK_CLASS_H__
+#ifndef __MOCK_MOCK_CLASS_H__
+#define __MOCK_MOCK_CLASS_H__
 
 
-#include "cclass.h"
+#include "class.h"
 
 
 extern char _called;
 extern char _called;
 
 
 #ifndef _RESET
 #ifndef _RESET
 #define _RESET
 #define _RESET
-void
-inline
-_reset()
-{
-    _called = 0;
-}
-#endif//_RESET
+void _reset();
+#endif // _RESET
 
 
 
 
-CLASS(MOCK_CLASS) {
+CLASS(MockClass) {
     int value;
     int value;
 };
 };
 
 
@@ -42,8 +41,9 @@ CLASS(MOCK_CLASS) {
  * ~~~ method declarations ~~~~~~~~
  * ~~~ method declarations ~~~~~~~~
  */
  */
 
 
-int  mock_class_getValue(MOCK_CLASS this);
-void mock_class_setValue(MOCK_CLASS this, int value);
+int  mockClassGetValue(MockClass this);
+void mockClassSetValue(MockClass this, int value);
+
+#endif//__MOCK_MOCK_CLASS_H__
 
 
-#endif//__MOCK_CLASS_H__
 // vim: set et ts=4 sw=4:
 // vim: set et ts=4 sw=4:

+#include <stdio.h>
+
+#include "class.h"
+#include "logger.h"
+#include "mock/mock_logger.h"
+
+static
+void
+logMock(void * _this, logger_level level, const char * const msg)
+{
+	MockLogger this = _this;
+
+	snprintf(this->message,
+			MOCK_MESSAGE_MAX - 1,
+			"[%s] %s",
+			logger_level_str[level],
+			msg);
+}
+
+void
+mockLoggerCleanMsg(MockLogger this)
+{
+	this->message[0] = 0;
+}
+
+INIT_IFACE(Logger, logMock);
+CREATE_CLASS(MockLogger, Logger, IFACE(Logger));
+
+// vim: set ts=4 sw=4:

+#ifndef __MOCK_MOCK_LOGGER_H__
+#define __MOCK_MOCK_LOGGER_H__
+
+#define MOCK_MESSAGE_MAX	1024
+
+#include "class.h"
+#include "logger.h"
+
+CLASS(MockLogger)
+{
+	EXTENDS(Logger);
+
+	char message[MOCK_MESSAGE_MAX];
+};
+
+void mockLoggerCleanMsg(MockLogger);
+
+#endif // __MOCK_MOCK_LOGGER_H__
+
+// vim: set ts=4 sw=4:

+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+#include "class.h"
+#include "stream.h"
+#include "mock_worker.h"
+
+static
+int
+mockWorkerCtor(void * _this, va_list * params)
+{
+	MockWorker this = _this;
+
+	this->rbuf = &(this->_rbuf[0]);
+	this->wbuf = &(this->_wbuf[0]);
+
+	return 0;
+}
+
+static
+void
+mockWorkerDtor(void * _this)
+{
+}
+
+static
+void
+mockWorkerClone(void * _this, void * _base)
+{
+	MockWorker this = _this;
+	MockWorker base = _base;
+
+	this->rbuf = &(base->_rbuf[0]);
+	this->wbuf = &(base->_wbuf[0]);
+}
+
+static
+ssize_t
+mockWorkerRead(void * _this, Stream st)
+{
+	MockWorker this = _this;
+	size_t size;
+
+	size = read((st->handle).fd, this->rbuf, 1024);
+
+	return size;
+}
+
+static
+ssize_t
+mockWorkerWrite(void * _this, Stream st)
+{
+	return 0;
+}
+
+INIT_IFACE(Class, mockWorkerCtor, mockWorkerDtor, mockWorkerClone);
+INIT_IFACE(StreamReader, mockWorkerRead);
+INIT_IFACE(StreamWriter, mockWorkerWrite);
+CREATE_CLASS(
+		MockWorker,
+		NULL,
+		IFACE(Class),
+		IFACE(StreamReader),
+		IFACE(StreamWriter));
+
+// vim: set ts=4 sw=4:

+#ifndef __MOCK_MOCK_WORKER_H__
+#define __MOCK_MOCK_WORKER_H__
+#endif // __MOCK_MOCK_WORKER_H__
+
+#include "class.h"
+
+CLASS(MockWorker) {
+	char _rbuf[1024];
+	char _wbuf[1024];
+	char * rbuf;
+	char * wbuf;
+};
+
+// vim: set ts=4 sw=4:

@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/types.h>
 
 
 #include "runtest.h"
 #include "runtest.h"
-#include "cclass.h"
+#include "class.h"
 
 
 
 
 #define TEST_OK_CHAR		'.'
 #define TEST_OK_CHAR		'.'
@@ -37,15 +37,15 @@ const char results[3] = {
 };
 };
 
 
 int
 int
-isObjectNull(void * _object)
+isObjectNull(void * object)
 {
 {
-    const CCLASS * class = _object - sizeof(CCLASS);
+    class_ptr class = GET_CLASS(object);
 
 
-    if (! isObject(_object)) {
+    if (! IS_OBJECT(object)) {
         return 0;
         return 0;
     }
     }
 
 
-    return isMemNull(_object, (*class)->size);
+    return isMemNull(object, class->object_size);
 }
 }
 
 
 int
 int

 /**
 /**
  * \file
  * \file
  * runtest.h: assertions and other definitions for all my tests
  * runtest.h: assertions and other definitions for all my tests
+ *
+ * \author Georg Hopp <georg@steffers.org>
+ *
+ * \copyright
  * Copyright (C) 2011  Georg Hopp
  * Copyright (C) 2011  Georg Hopp
  *
  *
  * This program is free software: you can redistribute it and/or modify
  * This program is free software: you can redistribute it and/or modify
@@ -22,6 +26,7 @@
 #include <sys/types.h>
 #include <sys/types.h>
 #include <string.h>
 #include <string.h>
 
 
+#include "class.h"
 
 
 enum RESULT_TYPES {
 enum RESULT_TYPES {
     TEST_OK=0,
     TEST_OK=0,
@@ -90,7 +95,7 @@ enum RESULT_TYPES {
         return TEST_FAILED; }
         return TEST_FAILED; }
 
 
 #define ASSERT_OBJECT(val) \
 #define ASSERT_OBJECT(val) \
-    if (! isObject((val))) { \
+    if (! IS_OBJECT((val))) { \
         printf("%s[%d]: Assertion failed that %s IS an object\n", \
         printf("%s[%d]: Assertion failed that %s IS an object\n", \
                 __FILE__, __LINE__, #val); \
                 __FILE__, __LINE__, #val); \
         return TEST_FAILED; }
         return TEST_FAILED; }
@@ -108,7 +113,7 @@ enum RESULT_TYPES {
         return TEST_FAILED; }
         return TEST_FAILED; }
 
 
 #define ASSERT_INSTANCE_OF(class, val) \
 #define ASSERT_INSTANCE_OF(class, val) \
-    if (! instanceOf(class, val)) { \
+    if (! INSTANCE_OF(class, val)) { \
         printf("%s[%d]: Assertion failed that %s is instance of %s\n", \
         printf("%s[%d]: Assertion failed that %s is instance of %s\n", \
                 __FILE__, __LINE__, #val, #class); \
                 __FILE__, __LINE__, #val, #class); \
         return TEST_FAILED; }
         return TEST_FAILED; }

@@ -3,61 +3,44 @@
 #include <unistd.h>
 #include <unistd.h>
 #include <signal.h>
 #include <signal.h>
 #include <socket.h>
 #include <socket.h>
+#include <sys/types.h>
 
 
 #include "runtest.h"
 #include "runtest.h"
 #include "logger.h"
 #include "logger.h"
-#include "cclass.h"
+#include "class.h"
 #include "server.h"
 #include "server.h"
-#include "signalHandling.h"
+#include "utils/signalHandling.h"
+#include "mock/mock_logger.h"
+#include "mock/mock_worker.h"
 
 
 
 
 #define TEST_PORT	11212
 #define TEST_PORT	11212
 #define TEST_DATA	"test"
 #define TEST_DATA	"test"
 
 
 
 
-int  level  = -1;
-char msg[1024];
 char buffer[1025];
 char buffer[1025];
 
 
-static void
-read_hook(const char * _buffer, size_t size)
-{
-	memset(buffer, 0, 1025);
-
-	if (NULL != _buffer) {
-		strncpy(buffer, _buffer, 1024>size? size : 1024);
-	}
-
-	doShutdown = 1;
-}
-
-static void
-logfnct_mock(int _level, const char * _msg)
-{
-    level = _level;
-    strncpy(msg, _msg, 1023);
-}
-
 const char testname[] = "serverTest";
 const char testname[] = "serverTest";
-LOGGER logger = NULL;
-SERVER server = NULL;
+
+MockLogger logger = NULL;
+MockWorker worker = NULL;
+Server     server = NULL;
 
 
 static
 static
 int
 int
 __setUp()
 __setUp()
 {
 {
-	logger = new(LOGGER, NULL);
-	logger_add(logger, logfnct_mock);
+	logger = new(MockLogger, LOGGER_DEBUG);
+	worker = new(MockWorker);
 
 
-	server = new(SERVER, logger, TEST_PORT, SOMAXCONN);
+	server = new(Server, logger, worker, TEST_PORT, SOMAXCONN);
 
 
-	ASSERT_INSTANCE_OF(SERVER, server);
-	ASSERT_INSTANCE_OF(LOGGER, server->logger);
-	ASSERT_INSTANCE_OF(SOCK, server->sock);
+	ASSERT_INSTANCE_OF(Server, server);
+	ASSERT_INSTANCE_OF(MockLogger, server->logger);
+	ASSERT_INSTANCE_OF(MockWorker, server->worker);
+	ASSERT_INSTANCE_OF(Sock, server->sock);
 	ASSERT_EQUAL(TEST_PORT, server->sock->port);
 	ASSERT_EQUAL(TEST_PORT, server->sock->port);
 
 
-	server->read_hook = read_hook;
-
 	return TEST_OK;
 	return TEST_OK;
 }
 }
 int (* const setUp)() = __setUp;
 int (* const setUp)() = __setUp;
@@ -66,16 +49,19 @@ static
 int
 int
 __tearDown()
 __tearDown()
 {
 {
-    level = -1;
-
     if (NULL != server) {
     if (NULL != server) {
         ASSERT_OBJECT(server);
         ASSERT_OBJECT(server);
-        delete(&server);
+        delete(server);
+    }
+
+    if (NULL != worker) {
+        ASSERT_OBJECT(worker);
+        delete(worker);
     }
     }
 
 
     if (NULL != logger) {
     if (NULL != logger) {
         ASSERT_OBJECT(logger);
         ASSERT_OBJECT(logger);
-        delete(&logger);
+        delete(logger);
     }
     }
 
 
     return TEST_OK;
     return TEST_OK;
@@ -86,19 +72,23 @@ static
 int
 int
 testDummy()
 testDummy()
 {
 {
-	SOCK con;
-	pid_t pid;
+	Sock con;
+	pid_t pid, ppid;
+	char addr[16];
 
 
-	pid = fork();
+	ppid = getpid();
+	pid  = fork();
 
 
 	switch(pid) {
 	switch(pid) {
 		case 0:
 		case 0:
-			con = new(SOCK, logger, TEST_PORT);
+			con = new(Sock, logger, TEST_PORT);
 			sleep(1);
 			sleep(1);
-			sock_connect(con, "127.0.0.1");
+			socketConnect(con, "127.0.0.1", &addr);
 			write(con->handle, TEST_DATA, strlen(TEST_DATA)+1);
 			write(con->handle, TEST_DATA, strlen(TEST_DATA)+1);
-			delete(&con);
+			sleep(1);
+			delete(con);
 			__tearDown();
 			__tearDown();
+			kill(ppid, SIGINT);
 			exit(EXIT_SUCCESS);
 			exit(EXIT_SUCCESS);
 
 
 		case -1:
 		case -1:
@@ -106,10 +96,10 @@ testDummy()
 
 
 		default:
 		default:
 			init_signals();
 			init_signals();
-			server_run(server);
+			serverRun(server);
 	}
 	}
 
 
-	ASSERT_STRING_EQUAL(TEST_DATA, buffer);
+	ASSERT_STRING_EQUAL(TEST_DATA, worker->rbuf);
 
 
 	return TEST_OK;
 	return TEST_OK;
 }
 }

@@ -3,40 +3,30 @@
 #include <unistd.h>
 #include <unistd.h>
 
 
 #include "runtest.h"
 #include "runtest.h"
-#include "logger.h"
-#include "cclass.h"
+#include "class.h"
 #include "socket.h"
 #include "socket.h"
+#include "logger.h"
+#include "mock/mock_logger.h"
 
 
 
 
 #define TEST_PORT	11212
 #define TEST_PORT	11212
 
 
 
 
-int    level  = -1;
-char * msg    = NULL;
-
-static void
-logfnct_mock(int _level, const char * _msg)
-{
-    level = _level;
-    msg   = malloc(strlen(_msg) + 1);
-    strcpy(msg, _msg);
-}
-
 const char testname[] = "socketTest";
 const char testname[] = "socketTest";
-LOGGER logger = NULL;
-SOCK   sock   = NULL;
+
+MockLogger logger = NULL;
+Sock       sock   = NULL;
 
 
 static
 static
 int
 int
 __setUp()
 __setUp()
 {
 {
-	logger = new(LOGGER, NULL);
-	logger_add(logger, logfnct_mock);
+	logger = new(MockLogger, LOGGER_DEBUG);
 
 
-	sock = new(SOCK, logger, TEST_PORT);
+	sock = new(Sock, logger, TEST_PORT);
 
 
-	ASSERT_INSTANCE_OF(SOCK, sock);
-	ASSERT_INSTANCE_OF(LOGGER, sock->logger);
+	ASSERT_INSTANCE_OF(Sock, sock);
+	ASSERT_INSTANCE_OF(MockLogger, sock->log);
 	ASSERT_EQUAL(TEST_PORT, sock->port);
 	ASSERT_EQUAL(TEST_PORT, sock->port);
 	ASSERT_NOT_EQUAL(0, sock->handle);
 	ASSERT_NOT_EQUAL(0, sock->handle);
 
 
@@ -48,21 +38,14 @@ static
 int
 int
 __tearDown()
 __tearDown()
 {
 {
-    level = -1;
-
-    if (NULL != msg) {
-        free(msg);
-        msg = NULL;
-    }
-
     if (NULL != logger) {
     if (NULL != logger) {
         ASSERT_OBJECT(logger);
         ASSERT_OBJECT(logger);
-        delete(&logger);
+        delete(logger);
     }
     }
 
 
     if (NULL != sock) {
     if (NULL != sock) {
         ASSERT_OBJECT(sock);
         ASSERT_OBJECT(sock);
-        delete(&sock);
+        delete(sock);
     }
     }
 
 
     return TEST_OK;
     return TEST_OK;
@@ -73,29 +56,29 @@ static
 int
 int
 testListen()
 testListen()
 {
 {
-	sock_listen(sock, 10);
+	socketListen(sock, 10);
 
 
 	return TEST_OK;
 	return TEST_OK;
 }
 }
 
 
 static
 static
 int
 int
-testAccept()
+testAcceptConnect()
 {
 {
-	SOCK acc, con;
+	Sock acc, con;
 	char addr[16];
 	char addr[16];
 	pid_t pid;
 	pid_t pid;
 
 
-	sock_listen(sock, 10);
+	socketListen(sock, 10);
 
 
 	pid = fork();
 	pid = fork();
 
 
 	switch(pid) {
 	switch(pid) {
 		case 0:
 		case 0:
-			con = new(SOCK, logger, TEST_PORT);
+			con = new(Sock, logger, TEST_PORT);
 			sleep(1);
 			sleep(1);
-			sock_connect(con, "127.0.0.1");
-			delete(&con);
+			socketConnect(con, "127.0.0.1", &addr);
+			delete(con);
 			__tearDown();
 			__tearDown();
 			exit(EXIT_SUCCESS);
 			exit(EXIT_SUCCESS);
 
 
@@ -103,12 +86,12 @@ testAccept()
 			return TEST_FAILED;
 			return TEST_FAILED;
 
 
 		default:
 		default:
-			acc = sock_accept(sock, addr);
+			acc = socketAccept(sock, &addr);
 	}
 	}
 
 
     if (NULL != acc) {
     if (NULL != acc) {
         ASSERT_OBJECT(acc);
         ASSERT_OBJECT(acc);
-        delete(&acc);
+        delete(acc);
     }
     }
 
 
 	return TEST_OK;
 	return TEST_OK;
@@ -116,7 +99,7 @@ testAccept()
 
 
 const testfunc tests[] = {
 const testfunc tests[] = {
     testListen,
     testListen,
-	testAccept
+	testAcceptConnect
 };
 };
 const size_t count = FUNCS_COUNT(tests);
 const size_t count = FUNCS_COUNT(tests);