X-Git-Url: http://git.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=instance.c;h=70380afab97c66b7430197f7107cfaa40069707c;hp=41b94197f4fc80a2a3f1f94e57b3873087c43def;hb=d6d146f34dfaf47a34a8fd4343a5d33ec0f8c6ee;hpb=2c6b282d4b4a22e511e8cced48263fd0bc9cc6da

diff --git a/instance.c b/instance.c
index 41b9419..70380af 100644
--- a/instance.c
+++ b/instance.c
@@ -1,3 +1,6 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
 #include <unistd.h>
 
 #include "procd.h"
@@ -8,6 +11,7 @@ enum {
 	INSTANCE_ATTR_COMMAND,
 	INSTANCE_ATTR_ENV,
 	INSTANCE_ATTR_DATA,
+	INSTANCE_ATTR_NETDEV,
 	__INSTANCE_ATTR_MAX
 };
 
@@ -15,6 +19,12 @@ 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 },
+};
+
+struct instance_netdev {
+	struct blobmsg_list_node node;
+	int ifindex;
 };
 
 static void
@@ -30,7 +40,7 @@ instance_run(struct service_instance *in)
 		argc++;
 
 	blobmsg_list_for_each(&in->env, var)
-		putenv(blobmsg_data(var->data));
+		setenv(blobmsg_name(var->data), blobmsg_data(var->data), 1);
 
 	argv = alloca(sizeof(char *) * argc);
 	argc = 0;
@@ -64,6 +74,7 @@ instance_start(struct service_instance *in)
 		return;
 	}
 
+	DPRINTF("Started instance %s::%s\n", in->srv->name, in->name);
 	in->proc.pid = pid;
 	uloop_process_add(&in->proc);
 }
@@ -85,6 +96,7 @@ instance_exit(struct uloop_process *p, int ret)
 	struct service_instance *in;
 
 	in = container_of(p, struct service_instance, proc);
+	DPRINTF("Instance %s::%s exit with error code %d\n", in->srv->name, in->name, ret);
 	uloop_timeout_cancel(&in->timeout);
 	if (in->restart)
 		instance_start(in);
@@ -114,9 +126,29 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
 	if (!blobmsg_list_equal(&in->data, &in_new->data))
 		return true;
 
+	if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
+		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_config_parse(struct service_instance *in)
 {
@@ -147,13 +179,26 @@ instance_config_parse(struct service_instance *in)
 	if ((cur = tb[INSTANCE_ATTR_ENV])) {
 		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
 			return false;
-		blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur));
+
+		blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur), false);
 	}
 
 	if ((cur = tb[INSTANCE_ATTR_DATA])) {
 		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
 			return false;
-		blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur));
+
+		blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur), false);
+	}
+
+	if ((cur = tb[INSTANCE_ATTR_NETDEV])) {
+		struct blobmsg_list_node *ndev;
+
+		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
+			return false;
+
+		blobmsg_list_fill(&in->netdev, blobmsg_data(cur), blobmsg_data_len(cur), true);
+		blobmsg_list_for_each(&in->netdev, ndev)
+			instance_netdev_update(ndev);
 	}
 
 	return true;
@@ -164,6 +209,7 @@ instance_config_cleanup(struct service_instance *in)
 {
 	blobmsg_list_free(&in->env);
 	blobmsg_list_free(&in->data);
+	blobmsg_list_free(&in->netdev);
 }
 
 static void
@@ -172,8 +218,12 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
 	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);
 	in->command = in_src->command;
 	in->name = in_src->name;
+	in->node.avl.key = in_src->node.avl.key;
+	in->config = in_src->config;
+	in_src->config = NULL;
 }
 
 bool
@@ -181,7 +231,6 @@ instance_update(struct service_instance *in, struct service_instance *in_new)
 {
 	bool changed = instance_config_changed(in, in_new);
 
-	in->config = in_new->config;
 	if (!changed)
 		return false;
 
@@ -197,17 +246,21 @@ instance_free(struct service_instance *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 blob_attr *config)
+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;
 
+	blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
 	blobmsg_list_simple_init(&in->env);
 	blobmsg_list_simple_init(&in->data);
 	in->valid = instance_config_parse(in);