X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=08e3d74651e7e1426ed3c8e6c8032955917379d1;hp=5d40ebe99642711e6f17d9f4b2d113e94f7bfc4c;hb=158b5a1ec8b4156da1d335a4f940919578928790;hpb=5eb7f7bcd3431cd8f634b02b71bd78f6162c2af3

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 5d40ebe..08e3d74 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,5 @@
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -7,111 +8,130 @@
 #include <sys/wait.h>
 
 #include <talloc/talloc.h>
-#include <pb-protocol/pb-protocol.h>
+#include <list/list.h>
+#include <log/log.h>
+#include <types/types.h>
+#include <system/system.h>
 
 #include "device-handler.h"
+#include "discover-server.h"
+#include "event.h"
+#include "parser.h"
 #include "udev.h"
-#include "log.h"
 #include "paths.h"
-
-#define MOUNT_BIN "/bin/mount"
+#include "boot.h"
 
 struct device_handler {
-	struct discover_server *server;
-
-	struct device *devices;
-	int n_devices;
-};
+	struct discover_server	*server;
+	int			dry_run;
 
-struct discover_context {
-	char *device_path;
-	char *mount_path;
-	struct udev_event *event;
-	struct device *device;
-	char **links;
-	int n_links;
+	struct discover_device	**devices;
+	unsigned int		n_devices;
 };
 
-struct mount_map {
-	char *device_path;
-	char *mount_point;
-};
+/**
+ * context_commit - Commit a temporary discovery context to the handler,
+ * and notify the clients about any new options / devices
+ */
+static void context_commit(struct device_handler *handler,
+		struct discover_context *ctx)
+{
+	struct discover_device *dev = ctx->device;
+	unsigned int i, existing_device;
+	struct boot_option *opt, *tmp;
+
+	/* do we already have this device? */
+	for (i = 0; i < handler->n_devices; i++) {
+		if (ctx->device == handler->devices[i]) {
+			existing_device = 1;
+			break;
+		}
+	}
 
+	/* if not already present, add the device to the handler's array */
+	if (!existing_device) {
+		handler->n_devices++;
+		handler->devices = talloc_realloc(handler, handler->devices,
+			struct discover_device *, handler->n_devices);
+		handler->devices[handler->n_devices - 1] = dev;
+		talloc_steal(handler, dev);
 
-static struct boot_option options[] = {
-	{
-		.id = "1.1",
-		.name = "meep one",
-		.description = "meep description one",
-		.icon_file = "meep.one.png",
-		.boot_args = "root=/dev/sda1",
-	},
-};
+		discover_server_notify_device_add(handler->server, dev->device);
+	}
 
-static struct device device = {
-	.id = "1",
-	.name = "meep",
-	.description = "meep description",
-	.icon_file = "meep.png",
-	.n_options = 1,
-	.options = options,
-};
 
-int device_handler_get_current_devices(struct device_handler *handler,
-		struct device **devices)
+	/* move boot options from the context to the device */
+	list_for_each_entry_safe(&ctx->boot_options, opt, tmp, list) {
+		list_remove(&opt->list);
+		list_add(&dev->device->boot_options, &opt->list);
+		dev->device->n_options++;
+		discover_server_notify_boot_option_add(handler->server, opt);
+	}
+}
 
+void discover_context_add_boot_option(struct discover_context *ctx,
+		struct boot_option *boot_option)
 {
-	*devices = &device;
-	return 1;
+	list_add(&ctx->boot_options, &boot_option->list);
+	talloc_steal(ctx, boot_option);
 }
 
-static int mkdir_recursive(const char *dir)
+/**
+ * device_handler_remove - Remove a device from the handler device array.
+ */
+
+static void device_handler_remove(struct device_handler *handler,
+	struct discover_device *device)
 {
-	struct stat statbuf;
-	char *str, *sep;
-	int mode = 0755;
+	unsigned int i;
 
-	if (!*dir)
-		return 0;
+	for (i = 0; i < handler->n_devices; i++)
+		if (handler->devices[i] == device)
+			break;
 
-	if (!stat(dir, &statbuf)) {
-		if (!S_ISDIR(statbuf.st_mode)) {
-			pb_log("%s: %s exists, but isn't a directory\n",
-					__func__, dir);
-			return -1;
-		}
-		return 0;
+	if (i == handler->n_devices) {
+		assert(0 && "unknown device");
+		return;
 	}
 
-	str = talloc_strdup(NULL, dir);
-	sep = strchr(*str == '/' ? str + 1 : str, '/');
+	handler->n_devices--;
+	memmove(&handler->devices[i], &handler->devices[i + 1],
+		(handler->n_devices - i) * sizeof(handler->devices[0]));
+	handler->devices = talloc_realloc(handler, handler->devices,
+		struct discover_device *, handler->n_devices);
 
-	while (1) {
+	discover_server_notify_device_remove(handler->server, device->device);
 
-		/* terminate the path at sep */
-		if (sep)
-			*sep = '\0';
+	talloc_free(device);
+}
 
-		if (mkdir(str, mode) && errno != EEXIST) {
-			pb_log("mkdir(%s): %s\n", str, strerror(errno));
-			return -1;
-		}
+/**
+ * device_handler_get_device_count - Get the count of current handler devices.
+ */
 
-		if (!sep)
-			break;
+int device_handler_get_device_count(const struct device_handler *handler)
+{
+	return handler->n_devices;
+}
 
-		/* reset dir to the full path */
-		strcpy(str, dir);
-		sep = strchr(sep + 1, '/');
-	}
+/**
+ * device_handler_get_device - Get a handler device by index.
+ */
 
-	talloc_free(str);
+const struct device *device_handler_get_device(
+	const struct device_handler *handler, unsigned int index)
+{
+	if (index >= handler->n_devices) {
+		assert(0 && "bad index");
+		return NULL;
+	}
 
-	return 0;
+	return handler->devices[index]->device;
 }
 
 static void setup_device_links(struct discover_context *ctx)
 {
+	struct discover_device *dev = ctx->device;
 	struct link {
 		char *env, *dir;
 	} *link, links[] = {
@@ -132,27 +152,27 @@ static void setup_device_links(struct discover_context *ctx)
 		char *enc, *dir, *path;
 		const char *value;
 
-		value = udev_event_param(ctx->event, link->env);
-		if (!value)
+		value = event_get_param(ctx->event, link->env);
+		if (!value || !*value)
 			continue;
 
 		enc = encode_label(ctx, value);
 		dir = join_paths(ctx, mount_base(), link->dir);
-		path = join_paths(ctx, dir, value);
+		path = join_paths(dev, dir, value);
 
-		if (!mkdir_recursive(dir)) {
+		if (!pb_mkdir_recursive(dir)) {
 			unlink(path);
-			if (symlink(ctx->mount_path, path)) {
+			if (symlink(dev->mount_path, path)) {
 				pb_log("symlink(%s,%s): %s\n",
-						ctx->mount_path, path,
+						dev->mount_path, path,
 						strerror(errno));
 				talloc_free(path);
 			} else {
-				int i = ctx->n_links++;
-				ctx->links = talloc_realloc(ctx,
-						ctx->links, char *,
-						ctx->n_links);
-				ctx->links[i] = path;
+				int i = dev->n_links++;
+				dev->links = talloc_realloc(dev,
+						dev->links, char *,
+						dev->n_links);
+				dev->links[i] = path;
 			}
 
 		}
@@ -162,32 +182,64 @@ static void setup_device_links(struct discover_context *ctx)
 	}
 }
 
+static void remove_device_links(struct discover_device *dev)
+{
+	int i;
+
+	for (i = 0; i < dev->n_links; i++)
+		unlink(dev->links[i]);
+}
+
 static int mount_device(struct discover_context *ctx)
 {
+	struct discover_device *dev = ctx->device;
 	const char *mountpoint;
-	struct stat statbuf;
-	int status;
-	pid_t pid;
+	const char *argv[6];
 
-	if (!ctx->mount_path) {
-		mountpoint = mountpoint_for_device(ctx->device_path);
-		ctx->mount_path = talloc_strdup(ctx, mountpoint);
+	if (!dev->mount_path) {
+		mountpoint = mountpoint_for_device(dev->device_path);
+		dev->mount_path = talloc_strdup(dev, mountpoint);
 	}
 
-	if (stat(ctx->mount_path, &statbuf)) {
-		if (mkdir(ctx->mount_path, 0755)) {
-			pb_log("couldn't create mount directory %s: %s\n",
-					ctx->mount_path, strerror(errno));
-			return -1;
-		}
-	} else {
-		if (!S_ISDIR(statbuf.st_mode)) {
-			pb_log("mountpoint %s exists, but isn't a directory\n",
-					ctx->mount_path);
-			return -1;
-		}
+	if (pb_mkdir_recursive(dev->mount_path))
+		pb_log("couldn't create mount directory %s: %s\n",
+				dev->mount_path, strerror(errno));
+
+	argv[0] = pb_system_apps.mount;
+	argv[1] = dev->device_path;
+	argv[2] = dev->mount_path;
+	argv[3] = "-o";
+	argv[4] = "ro";
+	argv[5] = NULL;
+
+	if (pb_run_cmd(argv, 1, 0)) {
+
+		/* Retry mount without ro option. */
+
+		argv[0] = pb_system_apps.mount;
+		argv[1] = dev->device_path;
+		argv[2] = dev->mount_path;
+		argv[3] = NULL;
+
+		if (pb_run_cmd(argv, 1, 0))
+			goto out_rmdir;
 	}
 
+	setup_device_links(ctx);
+	return 0;
+
+out_rmdir:
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+	return -1;
+}
+
+static int umount_device(struct discover_device *dev)
+{
+	int status;
+	pid_t pid;
+
+	remove_device_links(dev);
+
 	pid = fork();
 	if (pid == -1) {
 		pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
@@ -195,8 +247,8 @@ static int mount_device(struct discover_context *ctx)
 	}
 
 	if (pid == 0) {
-		execl(MOUNT_BIN, MOUNT_BIN, ctx->device_path, ctx->mount_path,
-				"-o", "ro", NULL);
+		execl(pb_system_apps.umount, pb_system_apps.umount,
+						dev->mount_path, NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -209,84 +261,223 @@ static int mount_device(struct discover_context *ctx)
 	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
 		return -1;
 
-	setup_device_links(ctx);
+	pb_rmdir_recursive(mount_base(), dev->mount_path);
+
 	return 0;
 }
 
-static int handle_add_event(struct device_handler *handler,
-		struct udev_event *event)
+static struct discover_device *find_device(struct device_handler *handler,
+		const char *id)
 {
-	struct discover_context *ctx;
+	struct discover_device *dev;
+	unsigned int i;
+
+	for (i = 0; i < handler->n_devices; i++) {
+		dev = handler->devices[i];
+		if (!strcmp(dev->device->id, id))
+			return dev;
+	}
+
+	return NULL;
+}
+
+static int destroy_device(void *arg)
+{
+	struct discover_device *dev = arg;
+
+	umount_device(dev);
+
+	return 0;
+}
+
+static struct discover_device *discover_device_create(
+		struct device_handler *handler,
+		struct discover_context *ctx,
+		struct event *event)
+{
+	struct discover_device *dev;
 	const char *devname;
+
+	dev = find_device(handler, event->device);
+	if (dev)
+		return dev;
+
+	dev = talloc_zero(ctx, struct discover_device);
+	dev->device = talloc_zero(dev, struct device);
+	list_init(&dev->device->boot_options);
+
+	devname = event_get_param(ctx->event, "DEVNAME");
+	if (devname)
+		dev->device_path = talloc_strdup(dev, devname);
+
+	dev->device->id = talloc_strdup(dev, event->device);
+
+	talloc_set_destructor(dev, destroy_device);
+
+	return dev;
+}
+
+static int handle_add_udev_event(struct device_handler *handler,
+		struct event *event)
+{
+	struct discover_context *ctx;
+	struct discover_device *dev;
 	int rc;
 
 	/* create our context */
-	ctx = talloc(NULL, struct discover_context);
+	ctx = talloc(handler, struct discover_context);
 	ctx->event = event;
-	ctx->mount_path = NULL;
-	ctx->links = NULL;
-	ctx->n_links = 0;
+	list_init(&ctx->boot_options);
 
-	devname = udev_event_param(ctx->event, "DEVNAME");
-	if (!devname) {
-		pb_log("no devname for %s?\n", event->device);
-		return 0;
-	}
+	/* create our top-level device */
+	dev = discover_device_create(handler, ctx, event);
 
-	ctx->device_path = talloc_strdup(ctx, devname);
+	ctx->device = dev;
 
 	rc = mount_device(ctx);
 	if (rc) {
-		pb_log("mount_device failed for %s\n", event->device);
 		talloc_free(ctx);
 		return 0;
 	}
 
+	/* run the parsers. This will populate the ctx's boot_option list. */
+	iterate_parsers(ctx);
+
+	/* add discovered stuff to the handler */
+	context_commit(handler, ctx);
+
 	talloc_free(ctx);
 
 	return 0;
 }
 
-static int handle_remove_event(struct device_handler *handler,
-		struct udev_event *event)
+static int handle_remove_udev_event(struct device_handler *handler,
+		struct event *event)
 {
+	struct discover_device *dev;
+
+	dev = find_device(handler, event->device);
+	if (!dev)
+		return 0;
+
+	/* remove device from handler device array */
+	device_handler_remove(handler, dev);
+
 	return 0;
 }
 
-int device_handler_event(struct device_handler *handler,
-		struct udev_event *event)
+static int handle_add_user_event(struct device_handler *handler,
+		struct event *event)
 {
+	struct discover_context *ctx;
+	struct discover_device *dev;
 	int rc;
 
-	switch (event->action) {
-	case UDEV_ACTION_ADD:
-		rc = handle_add_event(handler, event);
-		break;
+	assert(event->device);
 
-	case UDEV_ACTION_REMOVE:
-		rc = handle_remove_event(handler, event);
-		break;
-	}
+	ctx = talloc(handler, struct discover_context);
+	ctx->event = event;
+	list_init(&ctx->boot_options);
+
+	dev = discover_device_create(handler, ctx, event);
+	ctx->device = dev;
+
+	rc = parse_user_event(ctx, event);
+
+	if (!rc)
+		context_commit(handler, ctx);
 
 	return rc;
 }
 
-struct device_handler *device_handler_init(struct discover_server *server)
+static int handle_remove_user_event(struct device_handler *handler,
+		struct event *event)
+{
+	struct discover_device *dev = find_device(handler, event->device);
+
+	if (!dev)
+		return 0;
+
+	/* remove device from handler device array */
+	device_handler_remove(handler, dev);
+
+	return 0;
+}
+
+typedef int (*event_handler)(struct device_handler *, struct event *);
+
+static event_handler handlers[EVENT_TYPE_MAX][EVENT_ACTION_MAX] = {
+	[EVENT_TYPE_UDEV] = {
+		[EVENT_ACTION_ADD]	= handle_add_udev_event,
+		[EVENT_ACTION_REMOVE]	= handle_remove_udev_event,
+	},
+	[EVENT_TYPE_USER] = {
+		[EVENT_ACTION_ADD]	= handle_add_user_event,
+		[EVENT_ACTION_REMOVE]	= handle_remove_user_event,
+	}
+};
+
+int device_handler_event(struct device_handler *handler,
+		struct event *event)
+{
+	if (event->type >= EVENT_TYPE_MAX ||
+			event->action >= EVENT_ACTION_MAX ||
+			!handlers[event->type][event->action]) {
+		pb_log("%s unknown type/action: %d/%d\n", __func__,
+				event->type, event->action);
+		return 0;
+	}
+
+	return handlers[event->type][event->action](handler, event);
+}
+
+struct device_handler *device_handler_init(struct discover_server *server,
+		int dry_run)
 {
 	struct device_handler *handler;
 
 	handler = talloc(NULL, struct device_handler);
 	handler->devices = NULL;
 	handler->n_devices = 0;
+	handler->server = server;
+	handler->dry_run = dry_run;
 
 	/* set up our mount point base */
-	mkdir_recursive(mount_base());
+	pb_mkdir_recursive(mount_base());
+
+	parser_init();
 
 	return handler;
 }
 
-void device_handler_destroy(struct device_handler *devices)
+void device_handler_destroy(struct device_handler *handler)
 {
-	talloc_free(devices);
+	talloc_free(handler);
 }
 
+static struct boot_option *find_boot_option_by_id(
+		struct device_handler *handler, const char *id)
+{
+	unsigned int i;
+
+	for (i = 0; i < handler->n_devices; i++) {
+		struct discover_device *dev = handler->devices[i];
+		struct boot_option *opt;
+
+		list_for_each_entry(&dev->device->boot_options, opt, list)
+			if (!strcmp(opt->id, id))
+				return opt;
+	}
+
+	return NULL;
+}
+
+void device_handler_boot(struct device_handler *handler,
+		struct boot_command *cmd)
+{
+	struct boot_option *opt;
+
+	opt = find_boot_option_by_id(handler, cmd->option_id);
+
+	boot(handler, opt, cmd, handler->dry_run);
+}