Reorganize source directory

4 files changed, 0 insertions, 1336 deletions

diff --git a/service/instance.c b/service/instance.c
deleted file mode 100644
index 0949c0f..0000000
--- a/service/instance.c
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
- *
- * Based on "procd" by:
- * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
- * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * 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.
- */
-
-#define _GNU_SOURCE
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <libgen.h>
-#include <unistd.h>
-
-#include <libubox/md5.h>
-
-#include "../unitd.h"
-
-#include "service.h"
-#include "instance.h"
-
-
-enum {
-	INSTANCE_ATTR_COMMAND,
-	INSTANCE_ATTR_ENV,
-	INSTANCE_ATTR_DATA,
-	INSTANCE_ATTR_NETDEV,
-	INSTANCE_ATTR_FILE,
-	INSTANCE_ATTR_RESPAWN,
-	INSTANCE_ATTR_NICE,
-	INSTANCE_ATTR_LIMITS,
-	INSTANCE_ATTR_ERROR,
-	INSTANCE_ATTR_USER,
-	INSTANCE_ATTR_STDOUT,
-	INSTANCE_ATTR_STDERR,
-	__INSTANCE_ATTR_MAX
-};
-
-static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
-	[INSTANCE_ATTR_COMMAND] = { "command", BLOBMSG_TYPE_ARRAY },
-	[INSTANCE_ATTR_ENV] = { "env", BLOBMSG_TYPE_TABLE },
-	[INSTANCE_ATTR_DATA] = { "data", BLOBMSG_TYPE_TABLE },
-	[INSTANCE_ATTR_NETDEV] = { "netdev", BLOBMSG_TYPE_ARRAY },
-	[INSTANCE_ATTR_FILE] = { "file", BLOBMSG_TYPE_ARRAY },
-	[INSTANCE_ATTR_RESPAWN] = { "respawn", BLOBMSG_TYPE_ARRAY },
-	[INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
-	[INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
-	[INSTANCE_ATTR_ERROR] = { "error", BLOBMSG_TYPE_ARRAY },
-	[INSTANCE_ATTR_USER] = { "user", BLOBMSG_TYPE_STRING },
-	[INSTANCE_ATTR_STDOUT] = { "stdout", BLOBMSG_TYPE_BOOL },
-	[INSTANCE_ATTR_STDERR] = { "stderr", BLOBMSG_TYPE_BOOL },
-};
-
-struct instance_netdev {
-	struct blobmsg_list_node node;
-	int ifindex;
-};
-
-struct instance_file {
-	struct blobmsg_list_node node;
-	uint32_t md5[4];
-};
-
-struct rlimit_name {
-	const char *name;
-	int resource;
-};
-
-static const struct rlimit_name rlimit_names[] = {
-	{ "as", RLIMIT_AS },
-	{ "core", RLIMIT_CORE },
-	{ "cpu", RLIMIT_CPU },
-	{ "data", RLIMIT_DATA },
-	{ "fsize", RLIMIT_FSIZE },
-	{ "memlock", RLIMIT_MEMLOCK },
-	{ "msgqueue", RLIMIT_MSGQUEUE },
-	{ "nice", RLIMIT_NICE },
-	{ "nofile", RLIMIT_NOFILE },
-	{ "nproc", RLIMIT_NPROC },
-	{ "rss", RLIMIT_RSS },
-	{ "rtprio", RLIMIT_RTPRIO },
-	{ "sigpending", RLIMIT_SIGPENDING },
-	{ "stack", RLIMIT_STACK },
-	{ NULL, 0 }
-};
-
-static void closefd(int fd)
-{
-	if (fd > STDERR_FILENO)
-		close(fd);
-}
-
-static void
-instance_limits(const char *limit, const char *value)
-{
-	int i;
-	struct rlimit rlim;
-	unsigned long cur, max;
-
-	for (i = 0; rlimit_names[i].name != NULL; i++) {
-		if (strcmp(rlimit_names[i].name, limit))
-			continue;
-		if (!strcmp(value, "unlimited")) {
-			rlim.rlim_cur = RLIM_INFINITY;
-			rlim.rlim_max = RLIM_INFINITY;
-		} else {
-			if (getrlimit(rlimit_names[i].resource, &rlim))
-				return;
-
-			cur = rlim.rlim_cur;
-			max = rlim.rlim_max;
-
-			if (sscanf(value, "%lu %lu", &cur, &max) < 1)
-				return;
-
-			rlim.rlim_cur = cur;
-			rlim.rlim_max = max;
-		}
-
-		setrlimit(rlimit_names[i].resource, &rlim);
-		return;
-	}
-}
-
-static void
-instance_run(struct service_instance *in, int _stdout, int _stderr)
-{
-	struct blobmsg_list_node *var;
-	struct blob_attr *cur;
-	char **argv;
-	int argc = 1; /* NULL terminated */
-	int rem, _stdin;
-
-	if (in->nice)
-		setpriority(PRIO_PROCESS, 0, in->nice);
-
-	blobmsg_for_each_attr(cur, in->command, rem)
-		argc++;
-
-	blobmsg_list_for_each(&in->env, var)
-		setenv(blobmsg_name(var->data), blobmsg_data(var->data), 1);
-
-	blobmsg_list_for_each(&in->limits, var)
-		instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
-
-	argv = alloca(sizeof(char *) * argc);
-	argc = 0;
-
-	blobmsg_for_each_attr(cur, in->command, rem)
-		argv[argc++] = blobmsg_data(cur);
-
-	argv[argc] = NULL;
-
-	_stdin = open("/dev/null", O_RDONLY);
-
-	if (_stdout == -1)
-		_stdout = open("/dev/null", O_WRONLY);
-
-	if (_stderr == -1)
-		_stderr = open("/dev/null", O_WRONLY);
-
-	if (_stdin > -1) {
-		dup2(_stdin, STDIN_FILENO);
-		closefd(_stdin);
-	}
-	if (_stdout > -1) {
-		dup2(_stdout, STDOUT_FILENO);
-		closefd(_stdout);
-	}
-	if (_stderr > -1) {
-		dup2(_stderr, STDERR_FILENO);
-		closefd(_stderr);
-	}
-
-	if (in->gid && setgid(in->gid)) {
-		ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
-		exit(127);
-	}
-	if (in->uid && setuid(in->uid)) {
-		ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
-		exit(127);
-	}
-
-	execvp(argv[0], argv);
-	exit(127);
-}
-
-static void
-instance_free_stdio(struct service_instance *in)
-{
-	if (in->_stdout.fd.fd > -1) {
-		ustream_free(&in->_stdout.stream);
-		close(in->_stdout.fd.fd);
-		in->_stdout.fd.fd = -1;
-	}
-
-	if (in->_stderr.fd.fd > -1) {
-		ustream_free(&in->_stderr.stream);
-		close(in->_stderr.fd.fd);
-		in->_stderr.fd.fd = -1;
-	}
-}
-
-void
-instance_start(struct service_instance *in)
-{
-	int pid;
-	int opipe[2] = { -1, -1 };
-	int epipe[2] = { -1, -1 };
-
-	if (!avl_is_empty(&in->errors.avl)) {
-		LOG("Not starting instance %s::%s, an error was indicated\n", in->srv->name, in->name);
-		return;
-	}
-
-	if (in->proc.pending)
-		return;
-
-	instance_free_stdio(in);
-	if (in->_stdout.fd.fd > -2) {
-		if (pipe(opipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
-			opipe[0] = opipe[1] = -1;
-		}
-	}
-
-	if (in->_stderr.fd.fd > -2) {
-		if (pipe(epipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
-			epipe[0] = epipe[1] = -1;
-		}
-	}
-
-	in->restart = false;
-	in->halt = !in->respawn;
-
-	if (!in->valid)
-		return;
-
-	pid = fork();
-	if (pid < 0)
-		return;
-
-	if (!pid) {
-		uloop_done();
-		closefd(opipe[0]);
-		closefd(epipe[0]);
-		instance_run(in, opipe[1], epipe[1]);
-		return;
-	}
-
-	DEBUG(2, "Started instance %s::%s\n", in->srv->name, in->name);
-	in->proc.pid = pid;
-	clock_gettime(CLOCK_MONOTONIC, &in->start);
-	uloop_process_add(&in->proc);
-
-	if (opipe[0] > -1) {
-		ustream_fd_init(&in->_stdout, opipe[0]);
-		closefd(opipe[1]);
-	}
-
-	if (epipe[0] > -1) {
-		ustream_fd_init(&in->_stderr, epipe[0]);
-		closefd(epipe[1]);
-	}
-
-	service_event("instance.start", in->srv->name, in->name);
-}
-
-static void
-instance_stdio(struct ustream *s, int prio, struct service_instance *in)
-{
-	char *newline, *str, *arg0, ident[32];
-	int len;
-
-	arg0 = basename(blobmsg_data(blobmsg_data(in->command)));
-	snprintf(ident, sizeof(ident), "%s[%d]", arg0, in->proc.pid);
-	ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident);
-
-	do {
-		str = ustream_get_read_buf(s, NULL);
-		if (!str)
-			break;
-
-		newline = strchr(str, '\n');
-		if (!newline)
-			break;
-
-		*newline = 0;
-		ulog(prio, "%s\n", str);
-
-		len = newline + 1 - str;
-		ustream_consume(s, len);
-	} while (1);
-
-	ulog_open(ULOG_SYSLOG, LOG_DAEMON, "unitd");
-}
-
-static void
-instance_stdout(struct ustream *s, int bytes)
-{
-	instance_stdio(s, LOG_INFO,
-	               container_of(s, struct service_instance, _stdout.stream));
-}
-
-static void
-instance_stderr(struct ustream *s, int bytes)
-{
-	instance_stdio(s, LOG_ERR,
-	               container_of(s, struct service_instance, _stderr.stream));
-}
-
-static void
-instance_timeout(struct uloop_timeout *t)
-{
-	struct service_instance *in;
-
-	in = container_of(t, struct service_instance, timeout);
-
-	if (!in->halt && (in->restart || in->respawn))
-		instance_start(in);
-}
-
-static void
-instance_exit(struct uloop_process *p, int ret)
-{
-	struct service_instance *in;
-	struct timespec tp;
-	long runtime;
-
-	in = container_of(p, struct service_instance, proc);
-
-	clock_gettime(CLOCK_MONOTONIC, &tp);
-	runtime = tp.tv_sec - in->start.tv_sec;
-
-	DEBUG(2, "Instance %s::%s exit with error code %d after %ld seconds\n", in->srv->name, in->name, ret, runtime);
-
-	uloop_timeout_cancel(&in->timeout);
-	if (in->halt) {
-		/* no action */
-	} else if (in->restart) {
-		instance_start(in);
-	} else if (in->respawn) {
-		if (runtime < in->respawn_threshold)
-			in->respawn_count++;
-		else
-			in->respawn_count = 0;
-		if (in->respawn_count > in->respawn_retry && in->respawn_retry > 0 ) {
-			LOG("Instance %s::%s s in a crash loop %d crashes, %ld seconds since last crash\n",
-								in->srv->name, in->name, in->respawn_count, runtime);
-			in->restart = in->respawn = 0;
-			in->halt = 1;
-		} else {
-			uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
-		}
-	}
-	service_event("instance.stop", in->srv->name, in->name);
-}
-
-void
-instance_stop(struct service_instance *in)
-{
-	if (!in->proc.pending)
-		return;
-	in->halt = true;
-	in->restart = in->respawn = false;
-	kill(in->proc.pid, SIGTERM);
-}
-
-static void
-instance_restart(struct service_instance *in)
-{
-	if (!in->proc.pending)
-		return;
-	in->halt = false;
-	in->restart = true;
-	kill(in->proc.pid, SIGTERM);
-}
-
-static bool
-instance_config_changed(struct service_instance *in, struct service_instance *in_new)
-{
-	if (!in->valid)
-		return true;
-
-	if (!blob_attr_equal(in->command, in_new->command))
-		return true;
-
-	if (!blobmsg_list_equal(&in->env, &in_new->env))
-		return true;
-
-	if (!blobmsg_list_equal(&in->data, &in_new->data))
-		return true;
-
-	if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
-		return true;
-
-	if (!blobmsg_list_equal(&in->file, &in_new->file))
-		return true;
-
-	if (in->nice != in_new->nice)
-		return true;
-
-	if (in->uid != in_new->uid)
-		return true;
-
-	if (in->gid != in_new->gid)
-		return true;
-
-	if (!blobmsg_list_equal(&in->limits, &in_new->limits))
-		return true;
-
-	if (!blobmsg_list_equal(&in->errors, &in_new->errors))
-		return true;
-
-	return false;
-}
-
-static bool
-instance_netdev_cmp(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2)
-{
-	struct instance_netdev *n1 = container_of(l1, struct instance_netdev, node);
-	struct instance_netdev *n2 = container_of(l2, struct instance_netdev, node);
-
-	return n1->ifindex == n2->ifindex;
-}
-
-static void
-instance_netdev_update(struct blobmsg_list_node *l)
-{
-	struct instance_netdev *n = container_of(l, struct instance_netdev, node);
-
-	n->ifindex = if_nametoindex(n->node.avl.key);
-}
-
-static bool
-instance_file_cmp(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2)
-{
-	struct instance_file *f1 = container_of(l1, struct instance_file, node);
-	struct instance_file *f2 = container_of(l2, struct instance_file, node);
-
-	return !memcmp(f1->md5, f2->md5, sizeof(f1->md5));
-}
-
-static void
-instance_file_update(struct blobmsg_list_node *l)
-{
-	struct instance_file *f = container_of(l, struct instance_file, node);
-	md5_ctx_t md5;
-	char buf[256];
-	int len, fd;
-
-	memset(f->md5, 0, sizeof(f->md5));
-
-	fd = open(l->avl.key, O_RDONLY);
-	if (fd < 0)
-		return;
-
-	md5_begin(&md5);
-	do {
-		len = read(fd, buf, sizeof(buf));
-		if (len < 0) {
-			if (errno == EINTR)
-				continue;
-
-			break;
-		}
-		if (!len)
-			break;
-
-		md5_hash(buf, len, &md5);
-	} while(1);
-
-	md5_end(f->md5, &md5);
-	close(fd);
-}
-
-static void
-instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
-{
-	if (!cur)
-		return;
-
-	blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
-}
-
-static bool
-instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
-{
-	struct blobmsg_list_node *node;
-
-	if (!cur)
-		return true;
-
-	if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
-		return false;
-
-	blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), array);
-	if (cb) {
-		blobmsg_list_for_each(l, node)
-			cb(node);
-	}
-	return true;
-}
-
-static bool
-instance_config_parse(struct service_instance *in)
-{
-	struct blob_attr *tb[__INSTANCE_ATTR_MAX];
-	struct blob_attr *cur, *cur2;
-	int argc = 0;
-	int rem;
-
-	blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb,
-		blobmsg_data(in->config), blobmsg_data_len(in->config));
-
-	cur = tb[INSTANCE_ATTR_COMMAND];
-	if (!cur)
-		return false;
-
-	if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
-		return false;
-
-	blobmsg_for_each_attr(cur2, cur, rem) {
-		argc++;
-		break;
-	}
-	if (!argc)
-		return false;
-
-	in->command = cur;
-
-	if (tb[INSTANCE_ATTR_RESPAWN]) {
-		int i = 0;
-		uint32_t vals[3] = { 3600, 5, 5};
-
-		blobmsg_for_each_attr(cur2, tb[INSTANCE_ATTR_RESPAWN], rem) {
-			if ((i >= 3) && (blobmsg_type(cur2) == BLOBMSG_TYPE_STRING))
-				continue;
-			vals[i] = atoi(blobmsg_get_string(cur2));
-			i++;
-		}
-		in->respawn = true;
-		in->respawn_count = 0;
-		in->respawn_threshold = vals[0];
-		in->respawn_timeout = vals[1];
-		in->respawn_retry = vals[2];
-	}
-
-	if ((cur = tb[INSTANCE_ATTR_NICE])) {
-		in->nice = (int8_t) blobmsg_get_u32(cur);
-		if (in->nice < -20 || in->nice > 20)
-			return false;
-	}
-
-	if (tb[INSTANCE_ATTR_USER]) {
-		struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
-		if (p) {
-			in->uid = p->pw_uid;
-			in->gid = p->pw_gid;
-		}
-	}
-
-	if (tb[INSTANCE_ATTR_STDOUT] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDOUT]))
-		in->_stdout.fd.fd = -1;
-
-	if (tb[INSTANCE_ATTR_STDERR] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDERR]))
-		in->_stderr.fd.fd = -1;
-
-	instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
-
-	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
-		return false;
-
-	if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
-		return false;
-
-	if (!instance_fill_array(&in->file, tb[INSTANCE_ATTR_FILE], instance_file_update, true))
-		return false;
-
-	if (!instance_fill_array(&in->limits, tb[INSTANCE_ATTR_LIMITS], NULL, false))
-		return false;
-
-	if (!instance_fill_array(&in->errors, tb[INSTANCE_ATTR_ERROR], NULL, true))
-		return false;
-
-	return true;
-}
-
-static void
-instance_config_cleanup(struct service_instance *in)
-{
-	blobmsg_list_free(&in->env);
-	blobmsg_list_free(&in->data);
-	blobmsg_list_free(&in->netdev);
-	blobmsg_list_free(&in->file);
-	blobmsg_list_free(&in->limits);
-	blobmsg_list_free(&in->errors);
-}
-
-static void
-instance_config_move(struct service_instance *in, struct service_instance *in_src)
-{
-	instance_config_cleanup(in);
-	blobmsg_list_move(&in->env, &in_src->env);
-	blobmsg_list_move(&in->data, &in_src->data);
-	blobmsg_list_move(&in->netdev, &in_src->netdev);
-	blobmsg_list_move(&in->file, &in_src->file);
-	blobmsg_list_move(&in->limits, &in_src->limits);
-	blobmsg_list_move(&in->errors, &in_src->errors);
-	in->command = in_src->command;
-	in->name = in_src->name;
-	in->node.avl.key = in_src->node.avl.key;
-
-	free(in->config);
-	in->config = in_src->config;
-	in_src->config = NULL;
-}
-
-bool
-instance_update(struct service_instance *in, struct service_instance *in_new)
-{
-	bool changed = instance_config_changed(in, in_new);
-	bool running = in->proc.pending;
-
-	if (!changed && running)
-		return false;
-
-	if (!running) {
-		if (changed)
-			instance_config_move(in, in_new);
-		instance_start(in);
-	} else {
-		instance_restart(in);
-		instance_config_move(in, in_new);
-		/* restart happens in the child callback handler */
-	}
-	return true;
-}
-
-void
-instance_free(struct service_instance *in)
-{
-	instance_free_stdio(in);
-	uloop_process_delete(&in->proc);
-	uloop_timeout_cancel(&in->timeout);
-	instance_config_cleanup(in);
-	free(in->config);
-	free(in);
-}
-
-void
-instance_init(struct service_instance *in, struct service *s, struct blob_attr *config)
-{
-	config = blob_memdup(config);
-	in->srv = s;
-	in->name = blobmsg_name(config);
-	in->config = config;
-	in->timeout.cb = instance_timeout;
-	in->proc.cb = instance_exit;
-
-	in->_stdout.fd.fd = -2;
-	in->_stdout.stream.string_data = true;
-	in->_stdout.stream.notify_read = instance_stdout;
-
-	in->_stderr.fd.fd = -2;
-	in->_stderr.stream.string_data = true;
-	in->_stderr.stream.notify_read = instance_stderr;
-
-	blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
-	blobmsg_list_init(&in->file, struct instance_file, node, instance_file_cmp);
-	blobmsg_list_simple_init(&in->env);
-	blobmsg_list_simple_init(&in->data);
-	blobmsg_list_simple_init(&in->limits);
-	blobmsg_list_simple_init(&in->errors);
-	in->valid = instance_config_parse(in);
-}
-
-void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
-{
-	void *i;
-
-	if (!in->valid)
-		return;
-
-	i = blobmsg_open_table(b, in->name);
-	blobmsg_add_u8(b, "running", in->proc.pending);
-	if (in->proc.pending)
-		blobmsg_add_u32(b, "pid", in->proc.pid);
-	blobmsg_add_blob(b, in->command);
-
-	if (!avl_is_empty(&in->errors.avl)) {
-		struct blobmsg_list_node *var;
-		void *e = blobmsg_open_array(b, "errors");
-		blobmsg_list_for_each(&in->errors, var)
-			blobmsg_add_string(b, NULL, blobmsg_data(var->data));
-		blobmsg_close_table(b, e);
-	}
-
-	if (!avl_is_empty(&in->env.avl)) {
-		struct blobmsg_list_node *var;
-		void *e = blobmsg_open_table(b, "env");
-		blobmsg_list_for_each(&in->env, var)
-			blobmsg_add_string(b, blobmsg_name(var->data), blobmsg_data(var->data));
-		blobmsg_close_table(b, e);
-	}
-
-	if (!avl_is_empty(&in->data.avl)) {
-		struct blobmsg_list_node *var;
-		void *e = blobmsg_open_table(b, "data");
-		blobmsg_list_for_each(&in->data, var)
-			blobmsg_add_blob(b, var->data);
-		blobmsg_close_table(b, e);
-	}
-
-	if (!avl_is_empty(&in->limits.avl)) {
-		struct blobmsg_list_node *var;
-		void *e = blobmsg_open_table(b, "limits");
-		blobmsg_list_for_each(&in->limits, var)
-			blobmsg_add_string(b, blobmsg_name(var->data), blobmsg_data(var->data));
-		blobmsg_close_table(b, e);
-	}
-
-	if (in->respawn) {
-		void *r = blobmsg_open_table(b, "respawn");
-		blobmsg_add_u32(b, "threshold", in->respawn_threshold);
-		blobmsg_add_u32(b, "timeout", in->respawn_timeout);
-		blobmsg_add_u32(b, "retry", in->respawn_retry);
-		blobmsg_close_table(b, r);
-	}
-
-	blobmsg_close_table(b, i);
-}
diff --git a/service/instance.h b/service/instance.h
deleted file mode 100644
index 22f4ae5..0000000
--- a/service/instance.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
- *
- * Based on "procd" by:
- * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
- * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * 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.
- */
-
-#pragma once
-
-#include <libubox/vlist.h>
-#include <libubox/uloop.h>
-#include <libubox/ustream.h>
-#include "../utils/utils.h"
-
-#define RESPAWN_ERROR	(5 * 60)
-
-struct jail {
-	bool procfs;
-	bool sysfs;
-	bool ubus;
-	bool log;
-	char *name;
-	char *root;
-	struct blobmsg_list mount;
-	int argc;
-};
-
-struct service_instance {
-	struct vlist_node node;
-	struct service *srv;
-	const char *name;
-
-	int8_t nice;
-	bool valid;
-
-	uid_t uid;
-	gid_t gid;
-
-	bool halt;
-	bool restart;
-	bool respawn;
-	int respawn_count;
-	struct timespec start;
-
-	uint32_t respawn_timeout;
-	uint32_t respawn_threshold;
-	uint32_t respawn_retry;
-
-	struct blob_attr *config;
-	struct uloop_process proc;
-	struct uloop_timeout timeout;
-	struct ustream_fd _stdout;
-	struct ustream_fd _stderr;
-
-	struct blob_attr *command;
-	struct blobmsg_list env;
-	struct blobmsg_list data;
-	struct blobmsg_list netdev;
-	struct blobmsg_list file;
-	struct blobmsg_list limits;
-	struct blobmsg_list errors;
-};
-
-void instance_start(struct service_instance *in);
-void instance_stop(struct service_instance *in);
-bool instance_update(struct service_instance *in, struct service_instance *in_new);
-void instance_init(struct service_instance *in, struct service *s, struct blob_attr *config);
-void instance_free(struct service_instance *in);
-void instance_dump(struct blob_buf *b, struct service_instance *in, int debug);
diff --git a/service/service.c b/service/service.c
deleted file mode 100644
index a57d470..0000000
--- a/service/service.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
- *
- * Based on "procd" by:
- * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
- * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * 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.
- */
-
-#include <libubox/blobmsg_json.h>
-#include <libubox/avl-cmp.h>
-
-#include "../unitd.h"
-
-#include "service.h"
-#include "instance.h"
-
-struct avl_tree services;
-static struct blob_buf b;
-static struct ubus_context *ctx;
-
-static void
-service_instance_add(struct service *s, struct blob_attr *attr)
-{
-	struct service_instance *in;
-
-	if (blobmsg_type(attr) != BLOBMSG_TYPE_TABLE)
-		return;
-
-	in = calloc(1, sizeof(*in));
-	if (!in)
-		return;
-
-	instance_init(in, s, attr);
-	vlist_add(&s->instances, &in->node, (void *) in->name);
-}
-
-static void
-service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
-			struct vlist_node *node_old)
-{
-	struct service_instance *in_o = NULL, *in_n = NULL;
-
-	if (node_old)
-		in_o = container_of(node_old, struct service_instance, node);
-
-	if (node_new)
-		in_n = container_of(node_new, struct service_instance, node);
-
-	if (in_o && in_n) {
-		DEBUG(2, "Update instance %s::%s\n", in_o->srv->name, in_o->name);
-		instance_update(in_o, in_n);
-		instance_free(in_n);
-	} else if (in_o) {
-		DEBUG(2, "Free instance %s::%s\n", in_o->srv->name, in_o->name);
-		instance_stop(in_o);
-		instance_free(in_o);
-	} else if (in_n) {
-		DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
-		instance_start(in_n);
-	}
-	blob_buf_init(&b, 0);
-}
-
-static struct service *
-service_alloc(const char *name)
-{
-	struct service *s;
-	char *new_name;
-
-	s = calloc_a(sizeof(*s), &new_name, strlen(name) + 1);
-	strcpy(new_name, name);
-
-	vlist_init(&s->instances, avl_strcmp, service_instance_update);
-	s->instances.keep_old = true;
-	s->name = new_name;
-	s->avl.key = s->name;
-
-	return s;
-}
-
-enum {
-	SERVICE_SET_NAME,
-	SERVICE_SET_SCRIPT,
-	SERVICE_SET_INSTANCES,
-	__SERVICE_SET_MAX
-};
-
-static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
-	[SERVICE_SET_NAME] = { "name", BLOBMSG_TYPE_STRING },
-	[SERVICE_SET_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
-	[SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
-};
-
-static int
-service_update(struct service *s, struct blob_attr **tb, bool add)
-{
-	struct blob_attr *cur;
-	int rem;
-
-	if (tb[SERVICE_SET_INSTANCES]) {
-		if (!add)
-			vlist_update(&s->instances);
-		blobmsg_for_each_attr(cur, tb[SERVICE_SET_INSTANCES], rem) {
-			service_instance_add(s, cur);
-		}
-		if (!add)
-			vlist_flush(&s->instances);
-	}
-
-	return 0;
-}
-
-static void
-service_delete(struct service *s)
-{
-	service_event("service.stop", s->name, NULL);
-	vlist_flush_all(&s->instances);
-	avl_delete(&services, &s->avl);
-	free(s);
-}
-
-enum {
-	SERVICE_ATTR_NAME,
-	__SERVICE_ATTR_MAX,
-};
-
-static const struct blobmsg_policy service_attrs[__SERVICE_ATTR_MAX] = {
-	[SERVICE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
-};
-
-enum {
-	SERVICE_DEL_ATTR_NAME,
-	SERVICE_DEL_ATTR_INSTANCE,
-	__SERVICE_DEL_ATTR_MAX,
-};
-
-static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_ATTR_MAX] = {
-	[SERVICE_DEL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
-	[SERVICE_DEL_ATTR_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
-};
-
-enum {
-	SERVICE_LIST_ATTR_NAME,
-	SERVICE_LIST_ATTR_VERBOSE,
-	__SERVICE_LIST_ATTR_MAX,
-};
-
-static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = {
-	[SERVICE_LIST_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
-	[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL },
-};
-
-enum {
-	EVENT_TYPE,
-	EVENT_DATA,
-	__EVENT_MAX
-};
-
-static const struct blobmsg_policy event_policy[__EVENT_MAX] = {
-	[EVENT_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
-	[EVENT_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
-};
-
-enum {
-	DATA_NAME,
-	DATA_INSTANCE,
-	DATA_TYPE,
-	__DATA_MAX
-};
-
-static const struct blobmsg_policy get_data_policy[] = {
-	[DATA_NAME] = { "name", BLOBMSG_TYPE_STRING },
-	[DATA_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
-	[DATA_TYPE] = { "type", BLOBMSG_TYPE_STRING },
-};
-
-static int
-service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
-		   struct ubus_request_data *req, const char *method,
-		   struct blob_attr *msg)
-{
-	struct blob_attr *tb[__SERVICE_SET_MAX], *cur;
-	struct service *s = NULL;
-	const char *name;
-	bool add = !strcmp(method, "add");
-	int ret;
-
-	blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
-	cur = tb[SERVICE_ATTR_NAME];
-	if (!cur)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	name = blobmsg_data(cur);
-
-	s = avl_find_element(&services, name, s, avl);
-	if (s) {
-		DEBUG(2, "Update service %s\n", name);
-		return service_update(s, tb, add);
-	}
-
-	DEBUG(2, "Create service %s\n", name);
-	s = service_alloc(name);
-	if (!s)
-		return UBUS_STATUS_UNKNOWN_ERROR;
-
-	ret = service_update(s, tb, add);
-	if (ret)
-		return ret;
-
-	avl_insert(&services, &s->avl);
-
-	service_event("service.start", s->name, NULL);
-
-	return 0;
-}
-
-static void
-service_dump(struct service *s, bool verbose)
-{
-	struct service_instance *in;
-	void *c, *i;
-
-	c = blobmsg_open_table(&b, s->name);
-
-	if (!avl_is_empty(&s->instances.avl)) {
-		i = blobmsg_open_table(&b, "instances");
-		vlist_for_each_element(&s->instances, in, node)
-			instance_dump(&b, in, verbose);
-		blobmsg_close_table(&b, i);
-	}
-	blobmsg_close_table(&b, c);
-}
-
-static int
-service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
-		    struct ubus_request_data *req, const char *method,
-		    struct blob_attr *msg)
-{
-	struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX];
-	struct service *s;
-	const char *name = NULL;
-	bool verbose = false;
-
-	blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (tb[SERVICE_LIST_ATTR_VERBOSE])
-		verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
-	if (tb[SERVICE_LIST_ATTR_NAME])
-		name = blobmsg_get_string(tb[SERVICE_LIST_ATTR_NAME]);
-
-	blob_buf_init(&b, 0);
-	avl_for_each_element(&services, s, avl) {
-		if (name && strcmp(s->name, name) != 0)
-			continue;
-
-		service_dump(s, verbose);
-	}
-
-	ubus_send_reply(ctx, req, b.head);
-
-	return 0;
-}
-
-static int
-service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
-		    struct ubus_request_data *req, const char *method,
-		    struct blob_attr *msg)
-{
-	struct blob_attr *tb[__SERVICE_DEL_ATTR_MAX], *cur;
-	struct service *s;
-	struct service_instance *in;
-
-	blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
-
-	cur = tb[SERVICE_DEL_ATTR_NAME];
-	if (!cur)
-		return UBUS_STATUS_NOT_FOUND;
-
-	s = avl_find_element(&services, blobmsg_data(cur), s, avl);
-	if (!s)
-		return UBUS_STATUS_NOT_FOUND;
-
-	cur = tb[SERVICE_DEL_ATTR_INSTANCE];
-	if (!cur) {
-		service_delete(s);
-		return 0;
-	}
-
-	in = vlist_find(&s->instances, blobmsg_data(cur), in, node);
-	if (!in) {
-		ERROR("instance %s not found\n", (char *) blobmsg_data(cur));
-		return UBUS_STATUS_NOT_FOUND;
-	}
-
-	vlist_delete(&s->instances, &in->node);
-
-	return 0;
-}
-
-static int
-service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
-		      struct ubus_request_data *req, const char *method,
-		      struct blob_attr *msg)
-{
-	struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
-	struct service *s;
-
-	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
-
-	cur = tb[SERVICE_ATTR_NAME];
-	if (!cur)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	s = avl_find_element(&services, blobmsg_data(cur), s, avl);
-	if (!s)
-		return UBUS_STATUS_NOT_FOUND;
-
-	if (!strcmp(method, "update_start"))
-		vlist_update(&s->instances);
-	else
-		vlist_flush(&s->instances);
-
-	return 0;
-}
-
-static int
-service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
-		 struct ubus_request_data *req, const char *method,
-		 struct blob_attr *msg)
-{
-	struct service_instance *in;
-	struct service *s;
-	struct blob_attr *tb[__DATA_MAX];
-	const char *name = NULL;
-	const char *instance = NULL;
-	const char *type = NULL;
-
-	blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
-	if (tb[DATA_NAME])
-		name = blobmsg_data(tb[DATA_NAME]);
-	if (tb[DATA_INSTANCE])
-		instance = blobmsg_data(tb[DATA_INSTANCE]);
-	if (tb[DATA_TYPE])
-		type = blobmsg_data(tb[DATA_TYPE]);
-
-	blob_buf_init(&b, 0);
-	avl_for_each_element(&services, s, avl) {
-		void *cs = NULL;
-
-		if (name && strcmp(name, s->name))
-			continue;
-
-		vlist_for_each_element(&s->instances, in, node) {
-			struct blobmsg_list_node *var;
-			void *ci = NULL;
-
-			if (instance && strcmp(instance, in->name))
-				continue;
-
-			blobmsg_list_for_each(&in->data, var) {
-				if (type &&
-				    strcmp(blobmsg_name(var->data), type))
-					continue;
-
-				if (!cs)
-					cs = blobmsg_open_table(&b, s->name);
-				if (!ci)
-					ci = blobmsg_open_table(&b, in->name);
-
-				blobmsg_add_blob(&b, var->data);
-			}
-
-			if (ci)
-				blobmsg_close_table(&b, ci);
-		}
-
-		if (cs)
-			blobmsg_close_table(&b, cs);
-	}
-
-	ubus_send_reply(ctx, req, b.head);
-	return 0;
-}
-
-static struct ubus_method main_object_methods[] = {
-	UBUS_METHOD("set", service_handle_set, service_set_attrs),
-	UBUS_METHOD("add", service_handle_set, service_set_attrs),
-	UBUS_METHOD("list", service_handle_list, service_list_attrs),
-	UBUS_METHOD("delete", service_handle_delete, service_del_attrs),
-	UBUS_METHOD("update_start", service_handle_update, service_attrs),
-	UBUS_METHOD("update_complete", service_handle_update, service_attrs),
-	UBUS_METHOD("get_data", service_get_data, get_data_policy),
-};
-
-static struct ubus_object_type main_object_type =
-	UBUS_OBJECT_TYPE("service", main_object_methods);
-
-static struct ubus_object main_object = {
-	.name = "service",
-	.type = &main_object_type,
-	.methods = main_object_methods,
-	.n_methods = ARRAY_SIZE(main_object_methods),
-};
-
-int
-service_start_early(char *name, char *cmdline)
-{
-	void *instances, *instance, *command, *respawn;
-	char *t;
-
-	blob_buf_init(&b, 0);
-	blobmsg_add_string(&b, "name", name);
-	instances = blobmsg_open_table(&b, "instances");
-	instance = blobmsg_open_table(&b, "instance1");
-	command = blobmsg_open_array(&b, "command");
-	t = strtok(cmdline, " ");
-	while (t) {
-		blobmsg_add_string(&b, NULL, t);
-		t = strtok(NULL, " ");
-	}
-	blobmsg_close_array(&b, command);
-	respawn = blobmsg_open_array(&b, "respawn");
-	blobmsg_add_string(&b, NULL, "3600");
-	blobmsg_add_string(&b, NULL, "1");
-	blobmsg_add_string(&b, NULL, "0");
-	blobmsg_close_array(&b, respawn);
-	blobmsg_close_table(&b, instance);
-	blobmsg_close_table(&b, instances);
-
-	return service_handle_set(NULL, NULL, NULL, "add", b.head);
-}
-
-void service_event(const char *type, const char *service, const char *instance)
-{
-	if (!ctx)
-		return;
-
-	blob_buf_init(&b, 0);
-	blobmsg_add_string(&b, "service", service);
-	if (instance)
-		blobmsg_add_string(&b, "instance", instance);
-	ubus_notify(ctx, &main_object, type, b.head, -1);
-}
-
-void ubus_init_service(struct ubus_context *_ctx)
-{
-	ctx = _ctx;
-	ubus_add_object(ctx, &main_object);
-}
-
-void
-service_init(void)
-{
-	avl_init(&services, avl_strcmp, false, NULL);
-}
-
diff --git a/service/service.h b/service/service.h
deleted file mode 100644
index 2b6071c..0000000
--- a/service/service.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2015 Matthias Schiffer <mschiffer@universe-factory.net>
- *
- * Based on "procd" by:
- * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
- * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * 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.
- */
-
-#pragma once
-
-#include <libubox/avl.h>
-#include <libubox/vlist.h>
-#include <libubox/list.h>
-
-extern struct avl_tree services;
-
-struct vrule {
-	struct avl_node avl;
-	char *option;
-	char *rule;
-};
-
-struct service {
-	struct avl_node avl;
-	const char *name;
-
-	struct blob_attr *trigger;
-	struct vlist_tree instances;
-};
-
-int service_start_early(char *name, char *cmdline);
-void service_init(void);
-void service_event(const char *type, const char *service, const char *instance);