Index: uspace/srv/logger/main.c
===================================================================
--- uspace/srv/logger/main.c	(revision 80d8885598c0f6408d107f683d6e7f9bfefe2bf8)
+++ uspace/srv/logger/main.c	(revision f50a756d35797530a5bda5270a8221c73b59c8c8)
@@ -48,213 +48,14 @@
 #include "logger.h"
 
-static int handle_namespace_level_change(sysarg_t new_level)
-{
-	void *namespace_name;
-	int rc = async_data_write_accept(&namespace_name, true, 0, 0, 0, NULL);
-	if (rc != EOK) {
-		return rc;
-	}
-
-	logging_namespace_t *namespace = namespace_writer_attach((const char *) namespace_name);
-	free(namespace_name);
-	if (namespace == NULL)
-		return ENOENT;
-
-	rc = namespace_change_level(namespace, (log_level_t) new_level);
-	namespace_writer_detach(namespace);
-
-	return rc;
-}
-
-static int handle_context_level_change(sysarg_t new_level)
-{
-	void *namespace_name;
-	int rc = async_data_write_accept(&namespace_name, true, 0, 0, 0, NULL);
-	if (rc != EOK) {
-		return rc;
-	}
-
-	logging_namespace_t *namespace = namespace_writer_attach((const char *) namespace_name);
-	free(namespace_name);
-	if (namespace == NULL)
-		return ENOENT;
-
-	void *context_name;
-	rc = async_data_write_accept(&context_name, true, 0, 0, 0, NULL);
-	if (rc != EOK) {
-		namespace_writer_detach(namespace);
-		return rc;
-	}
-
-	rc = namespace_change_context_level(namespace, context_name, new_level);
-	free(context_name);
-	namespace_writer_detach(namespace);
-
-	return rc;
-}
-
-static void connection_handler_control(void)
-{
-	printf(NAME "/control: new client.\n");
-
-	while (true) {
-		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
-
-		if (!IPC_GET_IMETHOD(call))
-			break;
-
-		int rc;
-
-		switch (IPC_GET_IMETHOD(call)) {
-		case LOGGER_CTL_GET_DEFAULT_LEVEL:
-			async_answer_1(callid, EOK, get_default_logging_level());
-			break;
-		case LOGGER_CTL_SET_DEFAULT_LEVEL:
-			rc = set_default_logging_level(IPC_GET_ARG1(call));
-			async_answer_0(callid, rc);
-			break;
-		case LOGGER_CTL_SET_NAMESPACE_LEVEL:
-			rc = handle_namespace_level_change(IPC_GET_ARG1(call));
-			async_answer_0(callid, rc);
-			break;
-		case LOGGER_CTL_SET_CONTEXT_LEVEL:
-			rc = handle_context_level_change(IPC_GET_ARG1(call));
-			async_answer_0(callid, rc);
-			break;
-		default:
-			async_answer_0(callid, EINVAL);
-			break;
-		}
-	}
-
-	printf(NAME "/control: client terminated.\n");
-}
-
-static logging_namespace_t *find_namespace_and_attach_writer(void)
-{
-	ipc_call_t call;
-	ipc_callid_t callid = async_get_call(&call);
-
-	if (IPC_GET_IMETHOD(call) != LOGGER_REGISTER) {
-		async_answer_0(callid, EINVAL);
-		return NULL;
-	}
-
-	void *name;
-	int rc = async_data_write_accept(&name, true, 1, MAX_NAMESPACE_LENGTH, 0, NULL);
-	async_answer_0(callid, rc);
-
-	if (rc != EOK) {
-		return NULL;
-	}
-
-	logging_namespace_t *result = namespace_writer_attach((const char *) name);
-
-	free(name);
-
-	return result;
-}
-
-static int handle_receive_message(logging_namespace_t *namespace, sysarg_t context, int level)
-{
-	bool skip_message = !namespace_has_reader(namespace, context, level);
-	if (skip_message) {
-		/* Abort the actual message buffer transfer. */
-		ipc_callid_t callid;
-		size_t size;
-		int rc = ENAK;
-		if (!async_data_write_receive(&callid, &size))
-			rc = EINVAL;
-
-		async_answer_0(callid, rc);
-		return rc;
-	}
-
-	void *message;
-	int rc = async_data_write_accept(&message, true, 0, 0, 0, NULL);
-	if (rc != EOK) {
-		return rc;
-	}
-
-	namespace_add_message(namespace, message, context, level);
-
-	free(message);
-
-	return EOK;
-}
-
-static int handle_create_context(logging_namespace_t *namespace, sysarg_t *idx)
-{
-	void *name;
-	int rc = async_data_write_accept(&name, true, 0, 0, 0, NULL);
-	if (rc != EOK) {
-		return rc;
-	}
-
-	rc = namespace_create_context(namespace, name);
-
-	free(name);
-
-	if (rc < 0)
-		return rc;
-
-	*idx = (sysarg_t) rc;
-	return EOK;
-}
-
-static void connection_handler_sink(logging_namespace_t *namespace)
-{
-	printf(NAME "/sink: new client %s.\n", namespace_get_name(namespace));
-
-	while (true) {
-		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
-
-		if (!IPC_GET_IMETHOD(call))
-			break;
-
-		int rc;
-		sysarg_t arg = 0;
-
-		switch (IPC_GET_IMETHOD(call)) {
-		case LOGGER_CREATE_CONTEXT:
-			rc = handle_create_context(namespace, &arg);
-			async_answer_1(callid, rc, arg);
-			break;
-		case LOGGER_MESSAGE:
-			rc = handle_receive_message(namespace, IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-			async_answer_0(callid, rc);
-			break;
-		default:
-			async_answer_0(callid, EINVAL);
-			break;
-		}
-	}
-
-	printf(NAME "/sink: client %s terminated.\n", namespace_get_name(namespace));
-	namespace_writer_detach(namespace);
-}
-
 static void connection_handler(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
 	logger_interface_t iface = IPC_GET_ARG1(*icall);
 
-	logging_namespace_t *namespace = NULL;
-
 	switch (iface) {
 	case LOGGER_INTERFACE_CONTROL:
-		async_answer_0(iid, EOK);
-		connection_handler_control();
+		logger_connection_handler_control(iid);
 		break;
 	case LOGGER_INTERFACE_SINK:
-		/* First call has to be the registration. */
-		async_answer_0(iid, EOK);
-		namespace = find_namespace_and_attach_writer();
-		if (namespace == NULL) {
-			fprintf(stderr, NAME ": failed to register namespace.\n");
-			break;
-		}
-		connection_handler_sink(namespace);
+		logger_connection_handler_writer(iid);
 		break;
 	default:
