From: Steven Barth <steven@midlink.org>
Date: Thu, 17 Oct 2013 14:49:23 +0000 (+0200)
Subject: Add ubus function to create nested interfaces
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=266d92dd83bd5bfe520f3e2838794bf9bb827c07;p=project%2Fnetifd.git

Add ubus function to create nested interfaces
---

diff --git a/config.c b/config.c
index 682db54..f589a4b 100644
--- a/config.c
+++ b/config.c
@@ -75,7 +75,7 @@ config_parse_interface(struct uci_section *s, bool alias)
 	if (!iface)
 		return;
 
-	interface_init(iface, s->e.name, b.head);
+	interface_init(iface, s->e.name, b.head, false);
 
 	if (iface->proto_handler && iface->proto_handler->config_params)
 		uci_to_blob(&b, s, iface->proto_handler->config_params);
diff --git a/interface.c b/interface.c
index ddbdca9..49fc830 100644
--- a/interface.c
+++ b/interface.c
@@ -220,6 +220,9 @@ __interface_set_down(struct interface *iface, bool force)
 	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 	if (force)
 		interface_flush_state(iface);
+
+	if (iface->dynamic)
+		vlist_delete(&interfaces, &iface->node);
 }
 
 static void
@@ -530,7 +533,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 
 void
 interface_init(struct interface *iface, const char *name,
-	       struct blob_attr *config)
+	       struct blob_attr *config, bool dynamic)
 {
 	struct blob_attr *tb[IFACE_ATTR_MAX];
 	struct blob_attr *cur;
@@ -600,6 +603,10 @@ interface_init(struct interface *iface, const char *name,
 	}
 
 	iface->config_autostart = iface->autostart;
+	iface->dynamic = dynamic;
+
+	if (iface->dynamic)
+		iface->node.version = -1; // Don't delete on reload
 }
 
 static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
diff --git a/interface.h b/interface.h
index 0a947b4..e4d92aa 100644
--- a/interface.h
+++ b/interface.h
@@ -93,6 +93,7 @@ struct interface {
 	bool autostart;
 	bool config_autostart;
 	bool device_config;
+	bool dynamic;
 
 	time_t start_time;
 	enum interface_state state;
@@ -143,7 +144,7 @@ extern struct vlist_tree interfaces;
 extern const struct uci_blob_param_list interface_attr_list;
 
 void interface_init(struct interface *iface, const char *name,
-		    struct blob_attr *config);
+		    struct blob_attr *config, bool dynamic);
 
 void interface_add(struct interface *iface, struct blob_attr *config);
 bool interface_add_alias(struct interface *iface, struct blob_attr *config);
diff --git a/ubus.c b/ubus.c
index a4c5b09..d245541 100644
--- a/ubus.c
+++ b/ubus.c
@@ -108,11 +108,69 @@ netifd_get_proto_handlers(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
+
+enum {
+	DI_NAME,
+	__DI_MAX
+};
+
+static const struct blobmsg_policy dynamic_policy[__DI_MAX] = {
+	[DI_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
+		      struct ubus_request_data *req, const char *method,
+		      struct blob_attr *msg)
+{
+	struct blob_attr *tb[__DI_MAX];
+	struct interface *iface;
+	struct blob_attr *config;
+	struct device *dev;
+
+	blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
+
+	if (!tb[DI_NAME])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	const char *name = blobmsg_get_string(tb[DI_NAME]);
+
+	iface = calloc(1, sizeof(*iface));
+	if (!iface)
+		return UBUS_STATUS_UNKNOWN_ERROR;
+
+	interface_init(iface, name, msg, true);
+	iface->device_config = true;
+
+	config = blob_memdup(msg);
+	if (!config)
+		goto error;
+
+	interface_add(iface, config);
+
+	// need to look up the interface name again, in case of config update,
+	iface = vlist_find(&interfaces, name, iface, node);
+	if (!iface)
+		return UBUS_STATUS_UNKNOWN_ERROR;
+
+	dev = iface->main_dev.dev;
+	if (!dev || !dev->default_config)
+		return UBUS_STATUS_UNKNOWN_ERROR;
+
+	device_set_config(dev, dev->type, msg);
+	return UBUS_STATUS_OK;
+
+error:
+	free(iface);
+	return UBUS_STATUS_UNKNOWN_ERROR;
+}
+
 static struct ubus_method main_object_methods[] = {
 	{ .name = "restart", .handler = netifd_handle_restart },
 	{ .name = "reload", .handler = netifd_handle_reload },
 	UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
 	{ .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
+	UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
 };
 
 static struct ubus_object_type main_object_type =