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

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 5d40ebe..2888914 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,29 +8,29 @@
 #include <sys/wait.h>
 
 #include <talloc/talloc.h>
+#include <list/list.h>
+#include <log/log.h>
 #include <pb-protocol/pb-protocol.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"
 
+#define UMOUNT_BIN "/bin/umount"
+
 struct device_handler {
 	struct discover_server *server;
 
-	struct device *devices;
-	int n_devices;
-};
+	struct device **devices;
+	unsigned int n_devices;
 
-struct discover_context {
-	char *device_path;
-	char *mount_path;
-	struct udev_event *event;
-	struct device *device;
-	char **links;
-	int n_links;
+	struct list contexts;
 };
 
 struct mount_map {
@@ -37,77 +38,86 @@ struct mount_map {
 	char *mount_point;
 };
 
+/**
+ * device_handler_add - Add a device to the handler device array.
+ */
 
-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",
-	},
-};
-
-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)
-
+static void device_handler_add(struct device_handler *handler,
+	struct device *device)
 {
-	*devices = &device;
-	return 1;
+	handler->n_devices++;
+	handler->devices = talloc_realloc(handler, handler->devices,
+		struct device *, handler->n_devices);
+	handler->devices[handler->n_devices - 1] = device;
 }
 
-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 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 device *, handler->n_devices);
+}
 
-	while (1) {
+/**
+ * device_handler_find - Find a handler device by id.
+ */
 
-		/* terminate the path at sep */
-		if (sep)
-			*sep = '\0';
+static struct device *device_handler_find(struct device_handler *handler,
+	const char *id)
+{
+	unsigned int i;
 
-		if (mkdir(str, mode) && errno != EEXIST) {
-			pb_log("mkdir(%s): %s\n", str, strerror(errno));
-			return -1;
-		}
+	assert(id);
 
-		if (!sep)
-			break;
+	for (i = 0; i < handler->n_devices; i++)
+		if (handler->devices[i]->id
+			&& streq(handler->devices[i]->id, id))
+			return handler->devices[i];
 
-		/* reset dir to the full path */
-		strcpy(str, dir);
-		sep = strchr(sep + 1, '/');
-	}
+	pb_log("%s: unknown device: %s\n", __func__, id);
+	return NULL;
+}
 
-	talloc_free(str);
+/**
+ * device_handler_get_device_count - Get the count of current handler devices.
+ */
 
-	return 0;
+int device_handler_get_device_count(const struct device_handler *handler)
+{
+	return handler->n_devices;
+}
+
+/**
+ * device_handler_get_device - Get a handler device by index.
+ */
+
+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 handler->devices[index];
 }
 
 static void setup_device_links(struct discover_context *ctx)
@@ -132,15 +142,15 @@ 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);
 
-		if (!mkdir_recursive(dir)) {
+		if (!pb_mkdir_recursive(dir)) {
 			unlink(path);
 			if (symlink(ctx->mount_path, path)) {
 				pb_log("symlink(%s,%s): %s\n",
@@ -162,31 +172,55 @@ static void setup_device_links(struct discover_context *ctx)
 	}
 }
 
+static void remove_device_links(struct discover_context *ctx)
+{
+	int i;
+
+	for (i = 0; i < ctx->n_links; i++)
+		unlink(ctx->links[i]);
+}
+
 static int mount_device(struct discover_context *ctx)
 {
 	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 (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(ctx->mount_path))
+		pb_log("couldn't create mount directory %s: %s\n",
+				ctx->mount_path, strerror(errno));
+
+	argv[0] = MOUNT_BIN;
+	argv[1] = ctx->device_path;
+	argv[2] = ctx->mount_path;
+	argv[3] = "-o";
+	argv[4] = "ro";
+	argv[5] = NULL;
+
+	if (pb_run_cmd(argv, 1))
+		argv[3] = NULL; /* try without ro */
+
+	if (pb_run_cmd(argv, 1))
+		goto out_rmdir;
+
+	setup_device_links(ctx);
+	return 0;
+
+out_rmdir:
+	pb_rmdir_recursive(mount_base(), ctx->mount_path);
+	return -1;
+}
+
+static int umount_device(struct discover_context *ctx)
+{
+	int status;
+	pid_t pid;
+
+	remove_device_links(ctx);
 
 	pid = fork();
 	if (pid == -1) {
@@ -195,8 +229,7 @@ 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(UMOUNT_BIN, UMOUNT_BIN, ctx->mount_path, NULL);
 		exit(EXIT_FAILURE);
 	}
 
@@ -209,25 +242,51 @@ 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(), ctx->mount_path);
+
 	return 0;
 }
 
-static int handle_add_event(struct device_handler *handler,
-		struct udev_event *event)
+static struct discover_context *find_context(struct device_handler *handler,
+		const char *id)
+{
+	struct discover_context *ctx;
+
+	list_for_each_entry(&handler->contexts, ctx, list) {
+		if (!strcmp(ctx->id, id))
+			return ctx;
+	}
+
+	return NULL;
+}
+
+static int destroy_context(void *arg)
+{
+	struct discover_context *ctx = arg;
+
+	list_remove(&ctx->list);
+	umount_device(ctx);
+
+	return 0;
+}
+
+static int handle_add_udev_event(struct device_handler *handler,
+		struct event *event)
 {
 	struct discover_context *ctx;
 	const char *devname;
 	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;
 
-	devname = udev_event_param(ctx->event, "DEVNAME");
+	ctx->id = talloc_strdup(ctx, event->device);
+
+	devname = event_get_param(ctx->event, "DEVNAME");
 	if (!devname) {
 		pb_log("no devname for %s?\n", event->device);
 		return 0;
@@ -237,34 +296,130 @@ static int handle_add_event(struct device_handler *handler,
 
 	rc = mount_device(ctx);
 	if (rc) {
-		pb_log("mount_device failed for %s\n", event->device);
 		talloc_free(ctx);
 		return 0;
 	}
 
+	list_add(&handler->contexts, &ctx->list);
+	talloc_set_destructor(ctx, destroy_context);
+
+	/* set up the top-level device */
+	ctx->device = talloc_zero(ctx, struct device);
+	ctx->device->id = talloc_strdup(ctx->device, ctx->id);
+	list_init(&ctx->device->boot_options);
+
+	/* run the parsers */
+	iterate_parsers(ctx);
+
+	/* add device to handler device array */
+	device_handler_add(handler, ctx->device);
+
+	discover_server_notify_add(handler->server, ctx->device);
+
+	return 0;
+}
+
+static int handle_remove_udev_event(struct device_handler *handler,
+		struct event *event)
+{
+	struct discover_context *ctx;
+
+	ctx = find_context(handler, event->device);
+	if (!ctx)
+		return 0;
+
+	discover_server_notify_remove(handler->server, ctx->device);
+
+	/* remove device from handler device array */
+	device_handler_remove(handler, ctx->device);
+
 	talloc_free(ctx);
 
 	return 0;
 }
 
-static int handle_remove_event(struct device_handler *handler,
-		struct udev_event *event)
+static int handle_add_user_event(struct device_handler *handler,
+		struct event *event)
 {
+	struct device *device;
+
+	assert(event->device);
+
+	device = talloc_zero(handler, struct device);
+
+	if (!device)
+		goto fail;
+
+	device->id = talloc_strdup(device, event->device);
+	list_init(&device->boot_options);
+
+	parse_user_event(device, event);
+
+	discover_server_notify_add(handler->server, device);
+
+	/* add device to handler device array */
+	device_handler_add(handler, device);
+
+	return 0;
+
+fail:
+	talloc_free(device);
+	return 0;
+}
+
+static int handle_remove_user_event(struct device_handler *handler,
+		struct event *event)
+{
+	struct device *device = device_handler_find(handler, event->device);
+
+	if (!device)
+		return 0;
+
+	discover_server_notify_remove(handler->server, device);
+
+	/* remove device from handler device array */
+	device_handler_remove(handler, device);
+
+	talloc_free(device);
 	return 0;
 }
 
 int device_handler_event(struct device_handler *handler,
-		struct udev_event *event)
+		struct event *event)
 {
-	int rc;
+	int rc = 0;
 
-	switch (event->action) {
-	case UDEV_ACTION_ADD:
-		rc = handle_add_event(handler, event);
+	switch (event->type) {
+	case EVENT_TYPE_UDEV:
+		switch (event->action) {
+		case EVENT_ACTION_ADD:
+			rc = handle_add_udev_event(handler, event);
+			break;
+		case EVENT_ACTION_REMOVE:
+			rc = handle_remove_udev_event(handler, event);
+			break;
+		default:
+			pb_log("%s unknown action: %d\n", __func__,
+				event->action);
+			break;
+		}
 		break;
-
-	case UDEV_ACTION_REMOVE:
-		rc = handle_remove_event(handler, event);
+	case EVENT_TYPE_USER:
+		switch (event->action) {
+		case EVENT_ACTION_ADD:
+			rc = handle_add_user_event(handler, event);
+			break;
+		case EVENT_ACTION_REMOVE:
+			rc = handle_remove_user_event(handler, event);
+			break;
+		default:
+			pb_log("%s unknown action: %d\n", __func__,
+				event->action);
+			break;
+		}
+		break;
+	default:
+		pb_log("%s unknown type: %d\n", __func__, event->type);
 		break;
 	}
 
@@ -278,15 +433,19 @@ struct device_handler *device_handler_init(struct discover_server *server)
 	handler = talloc(NULL, struct device_handler);
 	handler->devices = NULL;
 	handler->n_devices = 0;
+	handler->server = server;
+
+	list_init(&handler->contexts);
 
 	/* 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);
 }
-